Skip to content
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

otel col contrib v0.61.0 #2521

Merged
merged 6 commits into from
Sep 30, 2022

Conversation

arun-shopify
Copy link

In this branch all our changes have been cherry-picked and merged into the v0.61.0.

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).
#1709
#2506

tanner-bruce and others added 5 commits September 30, 2022 11:56
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>
@arun-shopify arun-shopify changed the title Arun shopify/otel col contrib v0.61.0 otel col contrib v0.61.0 Sep 30, 2022
@arun-shopify arun-shopify force-pushed the arun-shopify/otel-col-contrib-v0.61.0 branch from 19f9f1c to f087721 Compare September 30, 2022 18:47
@arun-shopify arun-shopify force-pushed the arun-shopify/otel-col-contrib-v0.61.0 branch from f087721 to fcd3ea9 Compare September 30, 2022 19:00
@arun-shopify arun-shopify merged commit 0e568b2 into main-0.61.0 Sep 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants