Skip to content

Fix spi file relocation clean #15523

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
Arunodoy18 wants to merge 3 commits into from
Closed

Fix spi file relocation clean #15523

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63cf3ef
Fix SPI service file relocation during javaagent shading
Arunodoy18 Dec 2, 2025
3fc604d
Add messagingReceiveInstrumentationEnabled configuration to Kafka aut…
Arunodoy18 Dec 3, 2025
2acc0a6
Fix RocketMQ context propagation for batch messages in version 5.3.4+
Arunodoy18 Dec 4, 2025
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
7 changes: 7 additions & 0 deletions conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,11 @@ tasks.withType<ShadowJar>().configureEach {

// this is for instrumentation on java.util.logging (since java.util.logging itself is shaded above)
relocate("application.java.util.logging", "java.util.logging")

// Rename SPI service files to match relocated class names
eachFile {
Copy link
Contributor

@laurit laurit Dec 4, 2025

Choose a reason for hiding this comment

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

Dis some AI com up with this? If so I'd suggest you to give up on #15513

if (path.startsWith("META-INF/services/io.opentelemetry.instrumentation")) {
path = path.replace("io.opentelemetry.instrumentation", "io.opentelemetry.javaagent.shaded.instrumentation")
}
}
}
7 changes: 7 additions & 0 deletions gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@ tasks.withType<ShadowJar>().configureEach {

// this is for instrumentation on java.util.logging (since java.util.logging itself is shaded above)
relocate("application.java.util.logging", "java.util.logging")

// Rename SPI service files to match relocated class names
eachFile {
if (path.startsWith("META-INF/services/io.opentelemetry.instrumentation")) {
path = path.replace("io.opentelemetry.instrumentation", "io.opentelemetry.javaagent.shaded.instrumentation")
}
}
}

val compileMuzzle by tasks.registering {
Expand Down
7 changes: 4 additions & 3 deletions ...g/autoconfigure/internal/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,12 @@ DefaultKafkaProducerFactoryCustomizer otelKafkaProducerFactoryCustomizer(
static SpringKafkaTelemetry getTelemetry(
ObjectProvider<OpenTelemetry> openTelemetryProvider,
ObjectProvider<InstrumentationConfig> configProvider) {
InstrumentationConfig config = configProvider.getObject();
return SpringKafkaTelemetry.builder(openTelemetryProvider.getObject())
.setCaptureExperimentalSpanAttributes(
configProvider
.getObject()
.getBoolean("otel.instrumentation.kafka.experimental-span-attributes", false))
config.getBoolean("otel.instrumentation.kafka.experimental-span-attributes", false))
.setMessagingReceiveInstrumentationEnabled(
config.getBoolean("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", false))
.build();
}

Expand Down
1 change: 1 addition & 0 deletions ....opentelemetry.instrumentation.api.incubator.semconv.http.HttpClientUrlTemplateCustomizer
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
io.opentelemetry.javaagent.tooling.instrumentation.http.RegexUrlTemplateCustomizer
Loading