Merge shopify changes onto v0.53.0 #1709
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Because of the weird^H^H^H^H^Hinteresting structure of the contrib repo, we have an overwhelming amount of dependabot noise for this. Especially since we're behind upstream. We could turn this off entirely, I suppose. Or - we can modify the Makefile and just make this noise monthly rather than weekly. This commit is the result of modifying the `Makefile` to do monthly updates instead of weekly, as well as the result of running `make gendependabot`.
* wip cache metric from spanmetrics * testing * testing * WIP: collecting metrics * metric name updated * Update exporter/prometheusexporter/prometheus.go Co-authored-by: tanner-bruce <b.r.uce.tanner@gmail.com> * Update processor/spanmetricsprocessor/processor.go Co-authored-by: tanner-bruce <b.r.uce.tanner@gmail.com> * wip error metrics * span metrics monitoring : refactored internal metrics counters * span metrics monitoring : added metricKey error * Update processor/spanmetricsprocessor/processor.go Co-authored-by: tanner-bruce <b.r.uce.tanner@gmail.com> * Update processor/spanmetricsprocessor/processor.go Co-authored-by: tanner-bruce <b.r.uce.tanner@gmail.com> * moved metric one loop up * unique metrics count * removed actice timeseries counter * Update processor/spanmetricsprocessor/processor.go Co-authored-by: tanner-bruce <b.r.uce.tanner@gmail.com> Co-authored-by: tanner-bruce <b.r.uce.tanner@gmail.com>
- Adds go.mod replace directives for the specific revision of prometheus/client_golang that we need (until they release a version with our exemplar changes). - Fixes a few missed deprecations re: pdata, etc. - Fixes some linting complaints
ahayworth
force-pushed
the
ahayworth/merge-shopify-changes-v0.53.0
branch
from
985b99f to
f0611ea
Compare
tanner-bruce
approved these changes
Jun 23, 2022
This was referenced Sep 30, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is the set of changes necessary to update us to otel-contrib-col
v0.53.0, and is the logical pre-requisite for merging our corresponding collector PR: https://github.com/Shopify/opentelemetry-collector-shopify/pull/823This might not look like the thousands of commits you'd expect, and you'd be right! This time we're taking a different approach, and the PR is based on the upstream
v0.53.0tag (represented by the branchahayworth/otel-contrib-col-v0.53.0in this repo). It is the minimal diff to reapply our changes on top of upstreamv0.53.0.To merge this, we should first force-push
maintov0.53.0, and then reset the base branch of this PR tomainvia the handy little widget in the GitHub UI.The changes here are more or less directly cherry-picked from
main, with only the minimal edits needed to address the usual slate of deprecations introduced by the upstream collector project. Each commit should be able to be reviewed independently as desired.Technically, the latest contrib release is
v0.54.0, but that just showed up a few hours ago. We'll let others discover what horrendous bugs it may or may not contain. As far as we're concerned, here's some of the major changes fromv0.47.0that might be relevant to us: