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

Upgrade Agent to Collector 0.87 #5529

Merged
merged 7 commits into from
Oct 24, 2023
Merged

Upgrade Agent to Collector 0.87 #5529

merged 7 commits into from
Oct 24, 2023

Conversation

ptodev
Copy link
Contributor

@ptodev ptodev commented Oct 18, 2023

PR Description

There is a vulnerability reported for the go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp package. To clear the vulnerability, we need to upgrade to at least v0.86.0 of Collector. I decided to upgrade to v0.87.0 so that we can also resolve #5271.

Which issue(s) this PR fixes

Fixes #5271
Fixes #5467

Notes to the Reviewer

I went through the OTel release notes and I believe I changed all the things which need changing on the Agent side.

I also smoke tested tracing functionality locally with a simple static config and a simple flow config.

Unfortunately, the logging exporter has been deprecated. We need to label it as deprecated too, I'd prefer to do this in a separate PR which will both label it as deprecated and introduce its alternative at the same time - the new debug exporter.

The load balancing exporter now has experimental support for metrics. Its support for traces and logs is currently in beta, which is more stable. I'd like to use new labels so that I can put three different labels on that processor for the 3 different types of signals. If you are approving this PR for the 0.87 Otel upgrade, please also take a look at the website PR.

PR Checklist

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

@ptodev ptodev requested review from a team and clayton-cornell as code owners October 18, 2023 19:19
@ptodev ptodev force-pushed the ptodev/update_otel_0.87 branch from 9741f5f to 5e517ac Compare October 19, 2023 10:21
@ptodev ptodev requested a review from spartan0x117 October 19, 2023 15:40
Copy link
Contributor

@spartan0x117 spartan0x117 left a comment

Choose a reason for hiding this comment

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

🥇 LGTM!

component/otelcol/receiver/kafka/kafka.go Show resolved Hide resolved
@spartan0x117
Copy link
Contributor

Apologies, this PR from earlier is what introduced the merge conflicts (only a few dependencies were updated so the conflicts look large but I don't think should be too much).

Comment on lines +555 to +557
[traces protobuf]: https://github.com/open-telemetry/opentelemetry-proto/blob/v1.0.0/opentelemetry/proto/trace/v1/trace.proto
[metrics protobuf]: https://github.com/open-telemetry/opentelemetry-proto/blob/v1.0.0/opentelemetry/proto/metrics/v1/metrics.proto
[logs protobuf]: https://github.com/open-telemetry/opentelemetry-proto/blob/v1.0.0/opentelemetry/proto/logs/v1/logs.proto
Copy link
Member

Choose a reason for hiding this comment

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

Oh, didn't know the signals protos has hit v1.0, nice!

Copy link
Member

@tpaschalis tpaschalis left a comment

Choose a reason for hiding this comment

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

LGTM, thanks! As an outsider, this upgrade felt safer and easier to me, hopefully that was the case indeed.

@ptodev ptodev force-pushed the ptodev/update_otel_0.87 branch from 4999ac5 to b8c543b Compare October 24, 2023 17:00
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.

No additional doc suggestions

@clayton-cornell clayton-cornell added the type/docs Docs Squad label across all Grafana Labs repos label Oct 24, 2023
@ptodev ptodev force-pushed the ptodev/update_otel_0.87 branch from edfc17e to 478ff39 Compare October 24, 2023 18:54
@ptodev ptodev merged commit b307c02 into main Oct 24, 2023
7 checks passed
@ptodev ptodev deleted the ptodev/update_otel_0.87 branch October 24, 2023 19:08
tpaschalis pushed a commit to tpaschalis/agent that referenced this pull request Oct 25, 2023
* Upgrade Agent to Collector 0.87

* Parametrize the OTel version in docs.

* Document another batch processor metric

* Don't accept routing keys for metrics.

* Add tests for otelcol.receiver.kafka

---------

Co-authored-by: Mischa Thompson <[email protected]>
(cherry picked from commit b307c02)
tpaschalis added a commit that referenced this pull request Oct 26, 2023
* go get google.golang.org/[email protected] (#5511)

(cherry picked from commit 1d11d37)

* Upgrade Agent to Collector 0.87 (#5529)

* Upgrade Agent to Collector 0.87

* Parametrize the OTel version in docs.

* Document another batch processor metric

* Don't accept routing keys for metrics.

* Add tests for otelcol.receiver.kafka

---------

Co-authored-by: Mischa Thompson <[email protected]>
(cherry picked from commit b307c02)

* prometheus.remote_write: fix missing series ref mapping for native histogram (#5517)

Signed-off-by: György Krajcsovits <[email protected]>
Co-authored-by: Paschalis Tsilias <[email protected]>
(cherry picked from commit 5794224)

* pkg/metrics/wal: drop out-of-order exemplars (#5580)

Signed-off-by: Paschalis Tsilias <[email protected]>
(cherry picked from commit cd9d185)

* remote.vault: respect value of `namespace` argument (#5582)

Unfortunately, this setting can't be easily tested because Vault
namespaces are an enterprise-only feature.

Co-authored-by: Paschalis Tsilias <[email protected]>
(cherry picked from commit c0a52bc)

* reorganize prometheus converter code and limit surface area of dependencies between converters (#5406)

Signed-off-by: erikbaranowski <[email protected]>
(cherry picked from commit 5d39145)

* Clearer converter diagnostics (#5505)

* Update a bunch of converter messages and use standardized functions where possible for validation.

* default promtail log level from static converter so warnings don't show

* update migration doc output to match current behaviour

* refactor validation helper functions

Signed-off-by: erikbaranowski <[email protected]>

---------

Signed-off-by: erikbaranowski <[email protected]>
(cherry picked from commit 06c6792)

* wire up the agent integration for the static converter (#5545)

* wire up the agent integration for the static converter

Signed-off-by: erikbaranowski <[email protected]>

---------

Signed-off-by: erikbaranowski <[email protected]>
(cherry picked from commit f4e6ac4)

* converters: Default with localhost in static targets when none provided (#5546)

* promtail: Default with localhost in static targets in converter

* Add tests and changelog

* prettify

* feedback

(cherry picked from commit 8850660)

---------

Co-authored-by: Mischa Thompson <[email protected]>
Co-authored-by: Paulin Todev <[email protected]>
Co-authored-by: George Krajcsovits <[email protected]>
Co-authored-by: Robert Fratto <[email protected]>
Co-authored-by: Erik Baranowski <[email protected]>
Co-authored-by: Piotr <[email protected]>
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Feb 21, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. type/docs Docs Squad label across all Grafana Labs repos
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade OpenTelemetry Collector to at least v0.87.0 spanmetrics grow indefinitely
4 participants