Skip to content

Commit e0b2279

Browse files
committed
make agent tracer available for spring starter
1 parent bc5943f commit e0b2279

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

sdk-autoconfigure-support/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ dependencies {
1010

1111
compileOnly("com.google.code.findbugs:annotations")
1212
testCompileOnly("com.google.code.findbugs:annotations")
13+
testImplementation(project(":testing-common"))
1314
}

sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/tracer/AgentTracerProviderConfigurer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ public void customize(AutoConfigurationCustomizer autoConfigurationCustomizer) {
3030
@CanIgnoreReturnValue
3131
private static SdkTracerProviderBuilder configure(
3232
SdkTracerProviderBuilder sdkTracerProviderBuilder, ConfigProperties config) {
33-
if (!config.getBoolean(AgentInstaller.JAVAAGENT_ENABLED_CONFIG, true)) {
33+
// Spring starter uses "otel.sdk.disabled" to disable the SDK, but this check is enabled
34+
// by default - so it shouldn't impact the Spring starter.
35+
if (!config.getBoolean("otel.javaagent.enabled", true)) {
3436
return sdkTracerProviderBuilder;
3537
}
3638

javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessorTest.groovy renamed to sdk-autoconfigure-support/src/test/java/io/opentelemetry/instrumentation/tracer/AddThreadDetailsSpanProcessorTest.groovy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.tooling
6+
package io.opentelemetry.instrumentation.tracer
77

88
import io.opentelemetry.context.Context
9-
import io.opentelemetry.instrumentation.tracer.AddThreadDetailsSpanProcessor
109
import io.opentelemetry.sdk.trace.ReadWriteSpan
1110
import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes
1211
import spock.lang.Specification

0 commit comments

Comments
 (0)