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

Upgrade OTel instrumentation BOM to 2.7.0-alpha #828

Merged
merged 1 commit into from
Sep 5, 2024
Merged

Upgrade OTel instrumentation BOM to 2.7.0-alpha #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ aopalliance="1.0"
zipkinAws="1.2.5"
logback = "1.5.7"
wavefrontSdk="3.4.3"
otelInstrumentationBomAlpha="1.33.6-alpha" # Brings in io.opentelemetry:opentelemetry-bom:1.41.0
otelInstrumentationBomAlpha="2.7.0-alpha" # Brings in io.opentelemetry:opentelemetry-bom:1.41.0
Copy link
Member

Choose a reason for hiding this comment

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

I guess we'll have to manually update this comment each time or dependabot PRs will make it untrue. That's a bit unfortunate, but it's good to have a reminder this version is indirectly determining the version of OTel SDK dependencies.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, because of the issue described here: #823

I put the comment there for this exact purpose: it reminds us to manually check the version that the new patch upgrade brings in and make sure we are conscious about it.

This also means that upgrading this with dependabot is a bit more work than doing it 100% manually. :)

I'm ok removing the comment to make things simpler but we need to be extra careful not merging OTel dependency upgrades in (not that the comment prevents this).

Copy link
Member

Choose a reason for hiding this comment

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

I'm for leaving the comment. I'm just not confident we won't at some point miss it when a dependabot upgrade PR comes. We'll have to think how to work into the release process checking the version of OTel that gets resolved or something.

log4j = "2.23.1"
wavefrontReporter="1.7.16"
slf4j = "1.7.36"
Expand Down
2 changes: 1 addition & 1 deletion micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
api 'io.opentelemetry:opentelemetry-sdk-common'
api 'io.opentelemetry:opentelemetry-sdk-trace'
api 'io.opentelemetry:opentelemetry-sdk'
api 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv'
api 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator'
api 'io.opentelemetry:opentelemetry-extension-trace-propagators'
optionalApi 'io.opentelemetry:opentelemetry-opentracing-shim'

Expand Down
2 changes: 1 addition & 1 deletion micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
optionalImplementation 'io.opentelemetry:opentelemetry-sdk'
optionalImplementation 'io.opentelemetry:opentelemetry-sdk-trace'
optionalImplementation 'io.opentelemetry:opentelemetry-extension-trace-propagators'
optionalImplementation 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv'
optionalImplementation 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator'

// Wavefront
implementation libs.wavefrontReporter
Expand Down
2 changes: 1 addition & 1 deletion micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
api 'io.opentelemetry:opentelemetry-exporter-zipkin'
api 'io.opentelemetry:opentelemetry-sdk-trace'
api 'io.opentelemetry:opentelemetry-extension-trace-propagators'
api 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv'
api 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator'

// Zipkin
api 'io.zipkin.zipkin2:zipkin'
Expand Down