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

[*/datadog] Bump opentelemetry-mapping-go to v0.13.0 #30680

Merged
merged 5 commits into from
Jan 19, 2024

Conversation

mx-psi
Copy link
Member

@mx-psi mx-psi commented Jan 19, 2024

Description:

  • Bump opentelemetry-mapping-go to v0.13.0
  • Amend gohai to adapt to new types
  • Add changelog note

rg v0.11.0 --glob '*.mod' -l | xargs sd '(github.com/DataDog/opentelemetry-mapping-go/.*) v0.11.0' '$1 v0.13.0'
make gotidy
@@ -4,15 +4,15 @@ go 1.20

require (
github.com/DataDog/agent-payload/v5 v5.0.102
github.com/DataDog/datadog-agent/pkg/proto v0.50.2
github.com/DataDog/datadog-agent/pkg/proto v0.52.0-devel
github.com/DataDog/datadog-agent/pkg/trace v0.50.2
Copy link
Member

Choose a reason for hiding this comment

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

nit: do you want to upgrade this one to v0.52.0-devel too?

Copy link
Member Author

Choose a reason for hiding this comment

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

I didn't explicitly bump the other one, it was just because of https://github.com/DataDog/opentelemetry-mapping-go/blob/81d9650bebbbcff44cec39ac97fd9c46420c32bc/pkg/otlp/metrics/go.mod#L6

But it makes sense to bump the rest as well, let me do that

Copy link
Member Author

Choose a reason for hiding this comment

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

Done in 6b4be71

Copy link
Member

Choose a reason for hiding this comment

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

Looks like this surfaced some problem: https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/7585607691/job/20662004468?pr=30680#step:9:166

I'm not sure whether we want to resolve that in this PR or revert the dep upgrade, WDYT?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll revert the bump and open a separate PR for this

Copy link
Member

Choose a reason for hiding this comment

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

SGTM

@mx-psi mx-psi changed the title [*/datadog] Bump opentelemetry-mapping-go to v0.13.0 [*/datadog] Bump opentelemetry-mapping-go to v0.13.0 and datadog-agent to v0.52.0-devel Jan 19, 2024
@mx-psi mx-psi changed the title [*/datadog] Bump opentelemetry-mapping-go to v0.13.0 and datadog-agent to v0.52.0-devel [*/datadog] Bump opentelemetry-mapping-go to v0.13.0 Jan 19, 2024
@songy23 songy23 added the dependencies Pull requests that update a dependency file label Jan 19, 2024
@codeboten codeboten merged commit bd1d706 into open-telemetry:main Jan 19, 2024
94 checks passed
@github-actions github-actions bot added this to the next release milestone Jan 19, 2024
cparkins pushed a commit to AmadeusITGroup/opentelemetry-collector-contrib that referenced this pull request Feb 1, 2024
…30680)


- Bump opentelemetry-mapping-go to v0.13.0
- Amend gohai to adapt to new types
- Add changelog note
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cmd/configschema configschema command cmd/otelcontribcol otelcontribcol command connector/datadog dependencies Pull requests that update a dependency file exporter/datadog Datadog components internal/datadog processor/datadog testbed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants