Skip to content

Commit 27acb27

Browse files
committed
update property
1 parent e2d94e2 commit 27acb27

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/thread/ThreadDetailsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
1616
* any time.
1717
*/
18-
@ConditionalOnEnabledInstrumentation(module = "thread-details")
18+
@ConditionalOnEnabledInstrumentation(module = "common.thread-details", enabledByDefault = false)
1919
@Configuration
2020
@SuppressWarnings("OtelPrivateConstructorForUtilityClass")
2121
public class ThreadDetailsAutoConfiguration {

smoke-tests-otel-starter/spring-boot-2/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
// The headers are simply set here to make sure that headers can be parsed
1919
"otel.exporter.otlp.headers.c=3",
2020
"otel.instrumentation.runtime-telemetry.emit-experimental-telemetry=true",
21+
"otel.instrumentation.common.thread_details.enabled=true",
2122
})
2223
class OtelSpringStarterSmokeTest extends AbstractOtelSpringStarterSmokeTest {}

smoke-tests-otel-starter/spring-boot-3/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"otel.exporter.otlp.headers.c=3",
2222
"otel.instrumentation.runtime-telemetry.emit-experimental-telemetry=true",
2323
"otel.instrumentation.runtime-telemetry-java17.enable-all=true",
24+
"otel.instrumentation.common.thread_details.enabled=true",
2425
})
2526
class OtelSpringStarterSmokeTest extends AbstractOtelSpringStarterSmokeTest {
2627

smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractKafkaSpringStarterSmokeTest.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
import io.opentelemetry.api.common.AttributeKey;
1313
import io.opentelemetry.api.trace.SpanKind;
1414
import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
15-
import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes;
1615
import org.apache.kafka.clients.admin.NewTopic;
1716
import org.apache.kafka.clients.consumer.ConsumerRecord;
18-
import org.assertj.core.api.AbstractCharSequenceAssert;
1917
import org.assertj.core.api.AbstractLongAssert;
2018
import org.assertj.core.api.AbstractStringAssert;
2119
import org.junit.jupiter.api.Test;
@@ -77,13 +75,7 @@ void shouldInstrumentProducerAndConsumer() {
7775
MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET,
7876
AbstractLongAssert::isNotNegative),
7977
equalTo(
80-
MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"),
81-
satisfies(
82-
ThreadIncubatingAttributes.THREAD_ID,
83-
AbstractLongAssert::isNotZero),
84-
satisfies(
85-
ThreadIncubatingAttributes.THREAD_NAME,
86-
AbstractCharSequenceAssert::isNotBlank)),
78+
MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10")),
8779
span ->
8880
span.hasName("testTopic process")
8981
.hasKind(SpanKind.CONSUMER)

0 commit comments

Comments
 (0)