Skip to content

Preserve Azure SDK tracing in OpenTelemetry 2.30 update #4842

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

Closed
Suraj Rajan (skrcode) wants to merge 1 commit into from
+16 −0
Closed

Preserve Azure SDK tracing in OpenTelemetry 2.30 update #4842

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
16 changes: 16 additions & 0 deletions agent/agent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ val upstreamAgent: Configuration by configurations.creating {
isCanBeResolved = true
isCanBeConsumed = false
}
// OpenTelemetry 2.30 makes its Azure Core 1.36/1.53 modules require the application's
// OpenTelemetry context classes. Keep the last modules that also support Azure applications
// without a direct OpenTelemetry API dependency.
val upstreamAzureAgent: Configuration by configurations.creating {
isCanBeResolved = true
isCanBeConsumed = false
}

val otelInstrumentationVersion: String by project
val otelInstrumentationAlphaVersion: String by project
Expand All @@ -46,6 +53,9 @@ dependencies {
javaagentLibs(project(":agent:agent-tooling"))

upstreamAgent("io.opentelemetry.javaagent:opentelemetry-javaagent:$otelInstrumentationVersion")
upstreamAzureAgent("io.opentelemetry.javaagent:opentelemetry-javaagent") {
version { strictly("2.28.1") }
}

licenseReportDependencies(project(":agent:agent-tooling"))
}
Expand Down Expand Up @@ -118,6 +128,8 @@ tasks {

exclude("inst/io/prometheus/**")
exclude("inst/zipkin/**")
exclude("inst/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/**")
exclude("inst/io/opentelemetry/javaagent/instrumentation/azurecore/v1_53/**")

dependsOn(isolateJavaagentLibs)
from(isolateJavaagentLibs.get().outputs)
Expand Down Expand Up @@ -145,6 +157,10 @@ tasks {
dependsOn(shadowJarWithDuplicates)

from(zipTree(shadowJarWithDuplicates.get().archiveFile))
from(zipTree(upstreamAzureAgent.singleFile)) {
include("inst/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/**")
include("inst/io/opentelemetry/javaagent/instrumentation/azurecore/v1_53/**")
}

duplicatesStrategy = DuplicatesStrategy.EXCLUDE

Expand Down