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

Port Shopify patches to v0.56 #2506

Merged
merged 10 commits into from
Aug 4, 2022
Merged

Port Shopify patches to v0.56 #2506

merged 10 commits into from
Aug 4, 2022

Conversation

sveiss
Copy link

@sveiss sveiss commented Aug 2, 2022

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).

tanner-bruce and others added 8 commits August 2, 2022 14:25
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 sveiss self-assigned this Aug 2, 2022
@sveiss sveiss force-pushed the sveiss/port-patches-to-0.56 branch from 1edab23 to 540d725 Compare August 2, 2022 16:49
@sveiss sveiss force-pushed the sveiss/port-patches-to-0.56 branch from 540d725 to 008f5c6 Compare August 2, 2022 17:00
@sveiss sveiss marked this pull request as ready for review August 2, 2022 18:00
@sveiss sveiss requested review from a team and removed request for a team August 2, 2022 18:02
@sveiss sveiss changed the base branch from sveiss/port-target-0.56 to main August 4, 2022 14:42
@sveiss sveiss merged commit 445277b into main Aug 4, 2022
@sveiss sveiss deleted the sveiss/port-patches-to-0.56 branch August 4, 2022 14:42
This was referenced Sep 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants