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.

Sign up for GitHub

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

Jump to bottom

WIP: update otel deps to v0.99.0 #711

Merged
merged 1 commit into from
May 2, 2024
Merged

WIP: update otel deps to v0.99.0 #711

merged 1 commit into from
May 2, 2024

Conversation

rlankfo
Copy link
Member

@rlankfo rlankfo commented Apr 29, 2024

PR Description

Upgrade OpenTelemetry Collector dependencies to v0.99.0.

Which issue(s) this PR fixes

#631

Notes to the Reviewer

TODO:

  • fix build failures
  • testing
  • update docs for the following components:
otelcol.auth.oauth2
otelcol.connector.servicegraph
otelcol.connector.spanmetrics
otelcol.exporter.loadbalancing

PR Checklist

  • CHANGELOG.md updated
  • Documentation added
  • Tests updated
  • Config converters updated

@rlankfo rlankfo requested a review from ptodev April 29, 2024 22:33
@wildum wildum mentioned this pull request Apr 30, 2024
Open
ptodev
ptodev reviewed Apr 30, 2024
View reviewed changes
Copy link
Contributor

@ptodev ptodev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! Looks good to me so far. We need to add a note in changelog.md though. I could write such a note for you, if you'd like? If you have already started writing a changelog note, or if you'd like to do it yourself, please feel free to push it yourself ;)

@ptodev ptodev mentioned this pull request Apr 30, 2024
Merged
4 tasks
@rlankfo
Copy link
Member Author

rlankfo commented Apr 30, 2024 •
edited

Thank you! Looks good to me so far. We need to add a note in changelog.md though. I could write such a note for you, if you'd like? If you have already started writing a changelog note, or if you'd like to do it yourself, please feel free to push it yourself ;)

sure that'd be great if you want to push a changelog entry to this branch

@polyrain polyrain mentioned this pull request May 2, 2024
Draft
4 tasks
@rlankfo @ptodev
update otel deps to v0.99.0
4fef741 
Signed-off-by: Robbie Lankford <robert.lankford@grafana.com>
rfratto
rfratto approved these changes May 2, 2024
View reviewed changes
Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, few clarifying questions before merging though, and some action items post-merge.

I didn't check whether we missed any new settings introduced since the last upgrade; I put more attention on the code changes because it's easy to bring over new settings that we might have missed.

internal/component/otelcol/exporter/loadbalancing/loadbalancing.go Show resolved Hide resolved
internal/component/otelcol/receiver/prometheus/internal/staleness_end_to_end_test.go
Comment on lines +6 to +14
//TODO: Uncomment this test later. For now it's commented out because it depends on this package:
// "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver"
// ... which causes compilation issues with the Agent due to the fact that in Prometheus
// textparse.MetricType changed to model.MetricType:
// https://github.com/prometheus/prometheus/blob/12e317786b7ac864117f4be1a88a1aa29e5dcf9e/scrape/target.go#L89
//
// See:
// https://github.com/prometheus/prometheus/commit/8065bef172e8d88e22399504b175a8c9115e9da3
// https://github.com/prometheus/prometheus/commit/c83e1fc5748be3bd35bf0a31eb53690b412846a4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we create an issue to track this?

internal/converter/internal/staticconvert/testdata/traces_multi.yaml Show resolved Hide resolved
internal/static/traces/config.go Show resolved Hide resolved
internal/static/traces/spanmetricsprocessor/config.go Show resolved Hide resolved
@clayton-cornell clayton-cornell added the type/docs Docs Squad label across all Grafana Labs repos label May 2, 2024
clayton-cornell
clayton-cornell approved these changes May 2, 2024
View reviewed changes
Copy link
Contributor

@clayton-cornell clayton-cornell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doc changes are fine

@ptodev ptodev merged commit 2538ff8 into main May 2, 2024
14 checks passed
@ptodev ptodev deleted the rlankfo/otel-v0.99.0 branch May 2, 2024 18:11
polyrain pushed a commit to polyrain/alloy that referenced this pull request May 2, 2024
@rlankfo @polyrain
update otel deps to v0.99.0 (grafana#711)
2635bf8 
Signed-off-by: Robbie Lankford <robert.lankford@grafana.com>
This was referenced May 3, 2024
Merged
Merged
@rfratto rfratto added the backport-to-agent PR should be backported to the agent repo. label May 3, 2024
@rfratto rfratto mentioned this pull request May 6, 2024
Closed
@rfratto rfratto mentioned this pull request May 22, 2024
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ptodev ptodev ptodev left review comments

@rfratto rfratto rfratto approved these changes

@clayton-cornell clayton-cornell clayton-cornell approved these changes

Assignees
No one assigned
Labels
backport-to-agent PR should be backported to the agent repo. frozen-due-to-age type/docs Docs Squad label across all Grafana Labs repos
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@rlankfo @rfratto @ptodev @clayton-cornell