Skip to content

Commit

Permalink
Removes OTel Java Instrumentation dependency
Browse files Browse the repository at this point in the history
- references otel bom
- depends on otel semconv alpha
  • Loading branch information
marcingrzejszczak committed Feb 24, 2025
1 parent 72c3b92 commit 68fb861
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def MICROMETER_PLATFORM_VERSIONS = [
def PLATFORM_VERSIONS = [
libs.zipkinReporterBom,
libs.braveBom,
libs.otelInstrumentationBomAlpha,
libs.otelBom,
libs.reactorBom,
libs.junitBom
]
Expand Down
6 changes: 4 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ aopalliance="1.0"
zipkinAws="1.3.0"
logback = "1.5.16"
wavefrontSdk="3.4.3"
otelInstrumentationBomAlpha="2.13.1-alpha" # Automatic patch version updates are disabled since patch version bumps in this BOM can cause minor version bumps in other OTel dependencies
otelBom="1.47.0"
otelSemconvAlpha="1.30.0-alpha"
log4j = "2.24.3"
wavefrontReporter="1.7.16"
slf4j = "1.7.36"
Expand Down Expand Up @@ -51,7 +52,8 @@ micrometerContextPropagation = { module = "io.micrometer:context-propagation", v
micrometerBom = { module = "io.micrometer:micrometer-bom", version.ref = "micrometer" }
mockitoCore = { module = "org.mockito:mockito-core", version.ref = "mockito" }
mockitoJunit = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
otelInstrumentationBomAlpha = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha", version.ref = "otelInstrumentationBomAlpha" }
otelBom = { module = "io.opentelemetry:opentelemetry-bom", version.ref = "otelBom" }
otelSemconvAlpha = { module = "io.opentelemetry.semconv:opentelemetry-semconv-incubating", version.ref = "otelSemconvAlpha" }
reactorBom = { module = "io.projectreactor:reactor-bom", version.ref = "reactorBom" }
slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
springCore = { module = "org.springframework:spring-core", version.ref = "spring" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ dependencies {
api 'io.micrometer:micrometer-observation'

api 'io.opentelemetry:opentelemetry-api'
api 'io.opentelemetry.semconv:opentelemetry-semconv-incubating' // brings in io.opentelemetry.semconv:opentelemetry-semconv
api libs.otelSemconvAlpha
api 'io.opentelemetry:opentelemetry-sdk-common'
api 'io.opentelemetry:opentelemetry-sdk-trace'
api 'io.opentelemetry:opentelemetry-sdk'
api 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator'
api 'io.opentelemetry:opentelemetry-extension-trace-propagators'
optionalApi 'io.opentelemetry:opentelemetry-opentracing-shim'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ 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-incubator'

// Wavefront
implementation libs.wavefrontReporter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ 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-incubator'
api 'io.opentelemetry:opentelemetry-sdk-testing'

// Zipkin
Expand Down

0 comments on commit 68fb861

Please sign in to comment.