forked from open-telemetry/opentelemetry-collector-contrib
-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Port Shopify patches to v0.56 #2506
Merged
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 <[email protected]> * Update processor/spanmetricsprocessor/processor.go Co-authored-by: tanner-bruce <[email protected]> * 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 <[email protected]> * Update processor/spanmetricsprocessor/processor.go Co-authored-by: tanner-bruce <[email protected]> * moved metric one loop up * unique metrics count * removed actice timeseries counter * Update processor/spanmetricsprocessor/processor.go Co-authored-by: tanner-bruce <[email protected]> Co-authored-by: tanner-bruce <[email protected]>
- 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
sveiss
force-pushed
the
sveiss/port-patches-to-0.56
branch
from
August 2, 2022 16:49
1edab23
to
540d725
Compare
sveiss
force-pushed
the
sveiss/port-patches-to-0.56
branch
from
August 2, 2022 17:00
540d725
to
008f5c6
Compare
gravelg
approved these changes
Aug 4, 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 is a rebase of @ahayworth's #1709 to v0.56.0, porting our local patches up to the latest released version of -contrib.
As with the previous port, to merge this we need to first force-push main to v0.56.0, and then reset the base branch of this PR to main via the handy little widget in the GitHub UI (it's currently pointing to a temporary branch pointing to the v0.53.0 tag).