Skip to content

Commit 64136e9

Browse files
zeitlingerzeitlinger
committed
fix
1 parent aaea68d commit 64136e9

File tree

3 files changed

+14
-19
lines changed

3 files changed

+14
-19
lines changed

‎declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigProperties.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ public final class ConfigPropertiesBackedDeclarativeConfigProperties
9595
SPECIAL_MAPPINGS.put("java.jmx.enabled", "otel.jmx.enabled");
9696
SPECIAL_MAPPINGS.put("java.jmx.config", "otel.jmx.config");
9797
SPECIAL_MAPPINGS.put("java.jmx.target.system", "otel.jmx.target.system");
98-
SPECIAL_MAPPINGS.put("java.common.thread_details.enabled", "otel.javaagent.add-thread-details");
9998
}
10099

101100
private final ConfigProperties configProperties;
@@ -133,6 +132,16 @@ public String getString(String name) {
133132
@Nullable
134133
@Override
135134
public Boolean getBoolean(String name) {
135+
String fullPath = pathWithName(name);
136+
if (fullPath.equals("java.common.thread_details.enabled")) {
137+
Boolean value = configProperties.getBoolean("otel.javaagent.add-thread-details");
138+
if (value != null) {
139+
return value;
140+
}
141+
// Default to true in system properties if not set
142+
return true;
143+
}
144+
136145
return configProperties.getBoolean(resolvePropertyKey(name));
137146
}
138147

‎instrumentation/kafka/kafka-connect-2.6/testing/src/test/java/io/opentelemetry/instrumentation/kafkaconnect/v2_6/MongoKafkaConnectSinkTaskTest.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77

88
import static io.opentelemetry.api.trace.SpanKind.CONSUMER;
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
10-
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
1110
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT;
1211
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
1312
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
1413
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
1514
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingOperationTypeIncubatingValues.PROCESS;
1615
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA;
17-
import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_ID;
18-
import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_NAME;
1916
import static io.restassured.RestAssured.given;
2017
import static java.lang.String.format;
2118
import static org.awaitility.Awaitility.await;
@@ -155,9 +152,7 @@ void testSingleMessage() throws Exception {
155152
equalTo(MESSAGING_BATCH_MESSAGE_COUNT, 1),
156153
equalTo(MESSAGING_DESTINATION_NAME, testTopicName),
157154
equalTo(MESSAGING_OPERATION, PROCESS),
158-
equalTo(MESSAGING_SYSTEM, KAFKA),
159-
satisfies(THREAD_ID, val -> val.isNotZero()),
160-
satisfies(THREAD_NAME, val -> val.isNotBlank())),
155+
equalTo(MESSAGING_SYSTEM, KAFKA)),
161156
span ->
162157
span.hasName("update " + DB_NAME + "." + COLLECTION_NAME)
163158
.hasKind(SpanKind.CLIENT)
@@ -266,9 +261,7 @@ void testMultiTopic() throws Exception {
266261
.hasAttributesSatisfyingExactly(
267262
equalTo(MESSAGING_BATCH_MESSAGE_COUNT, 3),
268263
equalTo(MESSAGING_OPERATION, PROCESS),
269-
equalTo(MESSAGING_SYSTEM, KAFKA),
270-
satisfies(THREAD_ID, val -> val.isNotZero()),
271-
satisfies(THREAD_NAME, val -> val.isNotBlank())),
264+
equalTo(MESSAGING_SYSTEM, KAFKA)),
272265
span ->
273266
span.hasName("update " + DB_NAME + "." + COLLECTION_NAME)
274267
.hasKind(SpanKind.CLIENT)

‎instrumentation/kafka/kafka-connect-2.6/testing/src/test/java/io/opentelemetry/instrumentation/kafkaconnect/v2_6/PostgresKafkaConnectSinkTaskTest.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77

88
import static io.opentelemetry.api.trace.SpanKind.CONSUMER;
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
10-
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
1110
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT;
1211
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
1312
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
1413
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
1514
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingOperationTypeIncubatingValues.PROCESS;
1615
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingSystemIncubatingValues.KAFKA;
17-
import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_ID;
18-
import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_NAME;
1916
import static io.restassured.RestAssured.given;
2017
import static java.lang.String.format;
2118
import static org.awaitility.Awaitility.await;
@@ -175,9 +172,7 @@ void testSingleMessage() throws Exception {
175172
equalTo(MESSAGING_BATCH_MESSAGE_COUNT, 1),
176173
equalTo(MESSAGING_DESTINATION_NAME, testTopicName),
177174
equalTo(MESSAGING_OPERATION, PROCESS),
178-
equalTo(MESSAGING_SYSTEM, KAFKA),
179-
satisfies(THREAD_ID, val -> val.isNotZero()),
180-
satisfies(THREAD_NAME, val -> val.isNotBlank())),
175+
equalTo(MESSAGING_SYSTEM, KAFKA)),
181176
selectAssertion,
182177
selectAssertion,
183178
selectAssertion,
@@ -302,9 +297,7 @@ void testMultiTopic() throws Exception {
302297
.hasAttributesSatisfyingExactly(
303298
equalTo(MESSAGING_BATCH_MESSAGE_COUNT, 3),
304299
equalTo(MESSAGING_OPERATION, PROCESS),
305-
equalTo(MESSAGING_SYSTEM, KAFKA),
306-
satisfies(THREAD_ID, val -> val.isNotZero()),
307-
satisfies(THREAD_NAME, val -> val.isNotBlank())),
300+
equalTo(MESSAGING_SYSTEM, KAFKA)),
308301
selectAssertion,
309302
selectAssertion,
310303
selectAssertion,

0 commit comments

Comments
 (0)