diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/TracingRequestHandler.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/TracingRequestHandler.java index 872c7303507a..90873df6cb69 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/TracingRequestHandler.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/TracingRequestHandler.java @@ -38,7 +38,7 @@ public class TracingRequestHandler extends RequestHandler2 { .setCaptureExperimentalSpanAttributes( AgentInstrumentationConfig.get() .getBoolean("otel.instrumentation.aws-sdk.experimental-span-attributes", false)) - .setMessagingReceiveInstrumentationEnabled( + .setMessagingReceiveTelemetryEnabled( ExperimentalConfig.get().messagingReceiveInstrumentationEnabled()) .setCapturedHeaders(ExperimentalConfig.get().getMessagingHeaders()) .build() diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/autoconfigure/TracingRequestHandler.java b/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/autoconfigure/TracingRequestHandler.java index 2d92c041c0be..a68b240b1b0d 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/autoconfigure/TracingRequestHandler.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/autoconfigure/TracingRequestHandler.java @@ -25,7 +25,7 @@ public class TracingRequestHandler extends RequestHandler2 { .setCaptureExperimentalSpanAttributes( ConfigPropertiesUtil.getBoolean( "otel.instrumentation.aws-sdk.experimental-span-attributes", false)) - .setMessagingReceiveInstrumentationEnabled( + .setMessagingReceiveTelemetryEnabled( ConfigPropertiesUtil.getBoolean( "otel.instrumentation.messaging.experimental.receive-telemetry.enabled", false)) .setCapturedHeaders( diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkTelemetryBuilder.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkTelemetryBuilder.java index 91c26d59df75..6785aea26934 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkTelemetryBuilder.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkTelemetryBuilder.java @@ -20,7 +20,7 @@ public class AwsSdkTelemetryBuilder { private List capturedHeaders = emptyList(); private boolean captureExperimentalSpanAttributes; - private boolean messagingReceiveInstrumentationEnabled; + private boolean messagingReceiveTelemetryEnabled; AwsSdkTelemetryBuilder(OpenTelemetry openTelemetry) { this.openTelemetry = openTelemetry; @@ -54,11 +54,26 @@ public AwsSdkTelemetryBuilder setCaptureExperimentalSpanAttributes( * *

Note that this will cause the consumer side to start a new trace, with only a span link * connecting it to the producer trace. + * + * @deprecated Use {@link #setMessagingReceiveTelemetryEnabled(boolean)} instead. */ + @Deprecated @CanIgnoreReturnValue public AwsSdkTelemetryBuilder setMessagingReceiveInstrumentationEnabled( boolean messagingReceiveInstrumentationEnabled) { - this.messagingReceiveInstrumentationEnabled = messagingReceiveInstrumentationEnabled; + return setMessagingReceiveTelemetryEnabled(messagingReceiveInstrumentationEnabled); + } + + /** + * Set whether to capture the consumer message receive telemetry in messaging instrumentation. + * + *

Note that this will cause the consumer side to start a new trace, with only a span link + * connecting it to the producer trace. + */ + @CanIgnoreReturnValue + public AwsSdkTelemetryBuilder setMessagingReceiveTelemetryEnabled( + boolean messagingReceiveTelemetryEnabled) { + this.messagingReceiveTelemetryEnabled = messagingReceiveTelemetryEnabled; return this; } @@ -70,6 +85,6 @@ public AwsSdkTelemetry build() { openTelemetry, capturedHeaders, captureExperimentalSpanAttributes, - messagingReceiveInstrumentationEnabled); + messagingReceiveTelemetryEnabled); } } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsTracingTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsTracingTest.java index 41c47c9fc507..71b2906bf764 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsTracingTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsTracingTest.java @@ -27,7 +27,7 @@ public AmazonSQSAsyncClientBuilder configureClient(AmazonSQSAsyncClientBuilder c return client.withRequestHandlers( AwsSdkTelemetry.builder(testing().getOpenTelemetry()) .setCaptureExperimentalSpanAttributes(true) - .setMessagingReceiveInstrumentationEnabled(true) + .setMessagingReceiveTelemetryEnabled(true) .setCapturedHeaders(singletonList("Test-Message-Header")) .build() .newRequestHandler()); diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkSingletons.java b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkSingletons.java index f84cd5590e99..7f377f766c7f 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkSingletons.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkSingletons.java @@ -27,7 +27,7 @@ protected List getCapturedHeaders() { } @Override - protected boolean messagingReceiveInstrumentationEnabled() { + protected boolean messagingReceiveTelemetryEnabled() { return ExperimentalConfig.get().messagingReceiveInstrumentationEnabled(); } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/autoconfigure/AwsSdkSingletons.java b/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/autoconfigure/AwsSdkSingletons.java index 089757bea505..c11d4dfc658a 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/autoconfigure/AwsSdkSingletons.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/autoconfigure/AwsSdkSingletons.java @@ -29,7 +29,7 @@ protected List getCapturedHeaders() { } @Override - protected boolean messagingReceiveInstrumentationEnabled() { + protected boolean messagingReceiveTelemetryEnabled() { return ConfigPropertiesUtil.getBoolean( "otel.instrumentation.messaging.experimental.receive-telemetry.enabled", false); } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetryBuilder.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetryBuilder.java index 176d0a894a39..2ce48b5c2fce 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetryBuilder.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetryBuilder.java @@ -23,7 +23,7 @@ public final class AwsSdkTelemetryBuilder { private boolean useMessagingPropagator; private boolean recordIndividualHttpError; private boolean useXrayPropagator = true; - private boolean messagingReceiveInstrumentationEnabled; + private boolean messagingReceiveTelemetryEnabled; private boolean genaiCaptureMessageContent; AwsSdkTelemetryBuilder(OpenTelemetry openTelemetry) { @@ -108,11 +108,26 @@ AwsSdkTelemetryBuilder setUseXrayPropagator(boolean useMessagingPropagator) { * *

Note that this will cause the consumer side to start a new trace, with only a span link * connecting it to the producer trace. + * + * @deprecated Use {@link #setMessagingReceiveTelemetryEnabled(boolean)} instead. */ + @Deprecated @CanIgnoreReturnValue public AwsSdkTelemetryBuilder setMessagingReceiveInstrumentationEnabled( boolean messagingReceiveInstrumentationEnabled) { - this.messagingReceiveInstrumentationEnabled = messagingReceiveInstrumentationEnabled; + return setMessagingReceiveTelemetryEnabled(messagingReceiveInstrumentationEnabled); + } + + /** + * Set whether to capture the consumer message receive telemetry in messaging instrumentation. + * + *

Note that this will cause the consumer side to start a new trace, with only a span link + * connecting it to the producer trace. + */ + @CanIgnoreReturnValue + public AwsSdkTelemetryBuilder setMessagingReceiveTelemetryEnabled( + boolean messagingReceiveTelemetryEnabled) { + this.messagingReceiveTelemetryEnabled = messagingReceiveTelemetryEnabled; return this; } @@ -139,7 +154,7 @@ public AwsSdkTelemetry build() { useMessagingPropagator, useXrayPropagator, recordIndividualHttpError, - messagingReceiveInstrumentationEnabled, + messagingReceiveTelemetryEnabled, genaiCaptureMessageContent); } } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AbstractAwsSdkTelemetryFactory.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AbstractAwsSdkTelemetryFactory.java index 574c8e214ef9..490c5038519a 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AbstractAwsSdkTelemetryFactory.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AbstractAwsSdkTelemetryFactory.java @@ -20,7 +20,7 @@ private boolean captureExperimentalSpanAttributes() { return getBoolean("otel.instrumentation.aws-sdk.experimental-span-attributes", false); } - protected abstract boolean messagingReceiveInstrumentationEnabled(); + protected abstract boolean messagingReceiveTelemetryEnabled(); private boolean useMessagingPropagator() { return getBoolean( @@ -42,7 +42,7 @@ public AwsSdkTelemetry telemetry() { return AwsSdkTelemetry.builder(GlobalOpenTelemetry.get()) .setCapturedHeaders(getCapturedHeaders()) .setCaptureExperimentalSpanAttributes(captureExperimentalSpanAttributes()) - .setMessagingReceiveInstrumentationEnabled(messagingReceiveInstrumentationEnabled()) + .setMessagingReceiveTelemetryEnabled(messagingReceiveTelemetryEnabled()) .setUseConfiguredPropagatorForMessaging(useMessagingPropagator()) .setRecordIndividualHttpError(recordIndividualHttpError()) .setGenaiCaptureMessageContent(genaiCaptureMessageContent()) diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/Aws2SqsTracingTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/Aws2SqsTracingTest.java index 540ef500de26..03f1c7ff8fb2 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/Aws2SqsTracingTest.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/Aws2SqsTracingTest.java @@ -32,7 +32,7 @@ void setup() { AwsSdkTelemetryBuilder telemetryBuilder = AwsSdkTelemetry.builder(getTesting().getOpenTelemetry()) .setCaptureExperimentalSpanAttributes(true) - .setMessagingReceiveInstrumentationEnabled(true) + .setMessagingReceiveTelemetryEnabled(true) .setCapturedHeaders(singletonList("Test-Message-Header")); configure(telemetryBuilder); diff --git a/instrumentation/jms/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/JmsSingletons.java b/instrumentation/jms/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/JmsSingletons.java index d68de50afb9c..07de968e5168 100644 --- a/instrumentation/jms/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/JmsSingletons.java +++ b/instrumentation/jms/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/JmsSingletons.java @@ -22,7 +22,7 @@ public final class JmsSingletons { JmsInstrumenterFactory factory = new JmsInstrumenterFactory(GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME) .setCapturedHeaders(ExperimentalConfig.get().getMessagingHeaders()) - .setMessagingReceiveInstrumentationEnabled( + .setMessagingReceiveTelemetryEnabled( ExperimentalConfig.get().messagingReceiveInstrumentationEnabled()); PRODUCER_INSTRUMENTER = factory.createProducerInstrumenter(); diff --git a/instrumentation/jms/jms-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/JmsSingletons.java b/instrumentation/jms/jms-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/JmsSingletons.java index d5595e75899f..96d31799126e 100644 --- a/instrumentation/jms/jms-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/JmsSingletons.java +++ b/instrumentation/jms/jms-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/JmsSingletons.java @@ -22,7 +22,7 @@ public final class JmsSingletons { JmsInstrumenterFactory factory = new JmsInstrumenterFactory(GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME) .setCapturedHeaders(ExperimentalConfig.get().getMessagingHeaders()) - .setMessagingReceiveInstrumentationEnabled( + .setMessagingReceiveTelemetryEnabled( ExperimentalConfig.get().messagingReceiveInstrumentationEnabled()); PRODUCER_INSTRUMENTER = factory.createProducerInstrumenter(); diff --git a/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumenterFactory.java b/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumenterFactory.java index 31b80691c75d..ce7da41aaa40 100644 --- a/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumenterFactory.java +++ b/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumenterFactory.java @@ -40,12 +40,22 @@ public JmsInstrumenterFactory setCapturedHeaders(Collection capturedHead } @CanIgnoreReturnValue - public JmsInstrumenterFactory setMessagingReceiveInstrumentationEnabled( + public JmsInstrumenterFactory setMessagingReceiveTelemetryEnabled( boolean messagingReceiveInstrumentationEnabled) { this.messagingReceiveInstrumentationEnabled = messagingReceiveInstrumentationEnabled; return this; } + /** + * @deprecated Use {@link #setMessagingReceiveTelemetryEnabled(boolean)} instead. + */ + @CanIgnoreReturnValue + @Deprecated + public JmsInstrumenterFactory setMessagingReceiveInstrumentationEnabled( + boolean messagingReceiveInstrumentationEnabled) { + return setMessagingReceiveTelemetryEnabled(messagingReceiveInstrumentationEnabled); + } + public Instrumenter createProducerInstrumenter() { JmsMessageAttributesGetter getter = JmsMessageAttributesGetter.INSTANCE; MessageOperation operation = MessageOperation.PUBLISH; diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/KafkaSingletons.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/KafkaSingletons.java index fa181e8dbb24..9b7bb025fe03 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/KafkaSingletons.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/v0_11/KafkaSingletons.java @@ -33,7 +33,7 @@ public final class KafkaSingletons { .setCaptureExperimentalSpanAttributes( AgentInstrumentationConfig.get() .getBoolean("otel.instrumentation.kafka.experimental-span-attributes", false)) - .setMessagingReceiveInstrumentationEnabled( + .setMessagingReceiveTelemetryEnabled( ExperimentalConfig.get().messagingReceiveInstrumentationEnabled()); PRODUCER_INSTRUMENTER = instrumenterFactory.createProducerInstrumenter(); CONSUMER_RECEIVE_INSTRUMENTER = instrumenterFactory.createConsumerReceiveInstrumenter(); diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetryBuilder.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetryBuilder.java index cbdced373484..20f6f251ae32 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetryBuilder.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetryBuilder.java @@ -114,7 +114,7 @@ public KafkaTelemetry build() { new KafkaInstrumenterFactory(openTelemetry, INSTRUMENTATION_NAME) .setCapturedHeaders(capturedHeaders) .setCaptureExperimentalSpanAttributes(captureExperimentalSpanAttributes) - .setMessagingReceiveInstrumentationEnabled(messagingReceiveInstrumentationEnabled); + .setMessagingReceiveTelemetryEnabled(messagingReceiveInstrumentationEnabled); return new KafkaTelemetry( openTelemetry, diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common-0.11/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaInstrumenterFactory.java b/instrumentation/kafka/kafka-clients/kafka-clients-common-0.11/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaInstrumenterFactory.java index 989c2bd3ffe6..01c594cc2116 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common-0.11/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaInstrumenterFactory.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common-0.11/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaInstrumenterFactory.java @@ -63,12 +63,22 @@ public KafkaInstrumenterFactory setCaptureExperimentalSpanAttributes( } @CanIgnoreReturnValue - public KafkaInstrumenterFactory setMessagingReceiveInstrumentationEnabled( + public KafkaInstrumenterFactory setMessagingReceiveTelemetryEnabled( boolean messagingReceiveInstrumentationEnabled) { this.messagingReceiveInstrumentationEnabled = messagingReceiveInstrumentationEnabled; return this; } + /** + * @deprecated Use {@link #setMessagingReceiveTelemetryEnabled(boolean)} instead. + */ + @CanIgnoreReturnValue + @Deprecated + public KafkaInstrumenterFactory setMessagingReceiveInstrumentationEnabled( + boolean messagingReceiveInstrumentationEnabled) { + return setMessagingReceiveTelemetryEnabled(messagingReceiveInstrumentationEnabled); + } + public Instrumenter createProducerInstrumenter() { return createProducerInstrumenter(Collections.emptyList()); } diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSingletons.java b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSingletons.java index b39a610a3a6d..fd2b956d58d8 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSingletons.java +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSingletons.java @@ -22,7 +22,7 @@ public final class KafkaStreamsSingletons { .setCaptureExperimentalSpanAttributes( AgentInstrumentationConfig.get() .getBoolean("otel.instrumentation.kafka.experimental-span-attributes", false)) - .setMessagingReceiveInstrumentationEnabled( + .setMessagingReceiveTelemetryEnabled( ExperimentalConfig.get().messagingReceiveInstrumentationEnabled()) .createConsumerProcessInstrumenter(); diff --git a/instrumentation/reactor/reactor-kafka-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/ReactorKafkaSingletons.java b/instrumentation/reactor/reactor-kafka-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/ReactorKafkaSingletons.java index e965f84a05d5..1c43e4ae3c9e 100644 --- a/instrumentation/reactor/reactor-kafka-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/ReactorKafkaSingletons.java +++ b/instrumentation/reactor/reactor-kafka-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/ReactorKafkaSingletons.java @@ -22,7 +22,7 @@ final class ReactorKafkaSingletons { .setCaptureExperimentalSpanAttributes( AgentInstrumentationConfig.get() .getBoolean("otel.instrumentation.kafka.experimental-span-attributes", false)) - .setMessagingReceiveInstrumentationEnabled( + .setMessagingReceiveTelemetryEnabled( ExperimentalConfig.get().messagingReceiveInstrumentationEnabled()) .createConsumerProcessInstrumenter(); diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java index f1204f314cf4..b0eb5c35d9f1 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java @@ -41,7 +41,7 @@ static SpringKafkaTelemetry getTelemetry( return SpringKafkaTelemetry.builder(openTelemetryProvider.getObject()) .setCaptureExperimentalSpanAttributes( config.getBoolean("otel.instrumentation.kafka.experimental-span-attributes", false)) - .setMessagingReceiveInstrumentationEnabled( + .setMessagingReceiveTelemetryEnabled( config.getBoolean( "otel.instrumentation.messaging.experimental.receive-telemetry.enabled", false)) .setCapturedHeaders( diff --git a/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v2_0/SpringJmsSingletons.java b/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v2_0/SpringJmsSingletons.java index 034e3cdedac7..d20124e23eb2 100644 --- a/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v2_0/SpringJmsSingletons.java +++ b/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v2_0/SpringJmsSingletons.java @@ -23,7 +23,7 @@ public final class SpringJmsSingletons { JmsInstrumenterFactory factory = new JmsInstrumenterFactory(GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME) .setCapturedHeaders(ExperimentalConfig.get().getMessagingHeaders()) - .setMessagingReceiveInstrumentationEnabled(RECEIVE_TELEMETRY_ENABLED); + .setMessagingReceiveTelemetryEnabled(RECEIVE_TELEMETRY_ENABLED); LISTENER_INSTRUMENTER = factory.createConsumerProcessInstrumenter(true); RECEIVE_INSTRUMENTER = factory.createConsumerReceiveInstrumenter(); diff --git a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsSingletons.java b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsSingletons.java index 38360f67e3a6..bc1985ce5b4e 100644 --- a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsSingletons.java +++ b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsSingletons.java @@ -23,7 +23,7 @@ public final class SpringJmsSingletons { JmsInstrumenterFactory factory = new JmsInstrumenterFactory(GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME) .setCapturedHeaders(ExperimentalConfig.get().getMessagingHeaders()) - .setMessagingReceiveInstrumentationEnabled(RECEIVE_TELEMETRY_ENABLED); + .setMessagingReceiveTelemetryEnabled(RECEIVE_TELEMETRY_ENABLED); LISTENER_INSTRUMENTER = factory.createConsumerProcessInstrumenter(true); RECEIVE_INSTRUMENTER = factory.createConsumerReceiveInstrumenter(); diff --git a/instrumentation/spring/spring-kafka-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaSingletons.java b/instrumentation/spring/spring-kafka-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaSingletons.java index 1fd566dd5659..d70e32ff8f54 100644 --- a/instrumentation/spring/spring-kafka-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaSingletons.java +++ b/instrumentation/spring/spring-kafka-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaSingletons.java @@ -23,7 +23,7 @@ public final class SpringKafkaSingletons { .setCaptureExperimentalSpanAttributes( AgentInstrumentationConfig.get() .getBoolean("otel.instrumentation.kafka.experimental-span-attributes", false)) - .setMessagingReceiveInstrumentationEnabled( + .setMessagingReceiveTelemetryEnabled( ExperimentalConfig.get().messagingReceiveInstrumentationEnabled()) .build(); private static final Instrumenter BATCH_PROCESS_INSTRUMENTER; @@ -35,7 +35,7 @@ public final class SpringKafkaSingletons { .setCaptureExperimentalSpanAttributes( AgentInstrumentationConfig.get() .getBoolean("otel.instrumentation.kafka.experimental-span-attributes", false)) - .setMessagingReceiveInstrumentationEnabled( + .setMessagingReceiveTelemetryEnabled( ExperimentalConfig.get().messagingReceiveInstrumentationEnabled()) .setErrorCauseExtractor(SpringKafkaErrorCauseExtractor.INSTANCE); BATCH_PROCESS_INSTRUMENTER = factory.createBatchProcessInstrumenter(); diff --git a/instrumentation/spring/spring-kafka-2.7/library/src/main/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/SpringKafkaTelemetryBuilder.java b/instrumentation/spring/spring-kafka-2.7/library/src/main/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/SpringKafkaTelemetryBuilder.java index e782e8ceed30..8f21375025e9 100644 --- a/instrumentation/spring/spring-kafka-2.7/library/src/main/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/SpringKafkaTelemetryBuilder.java +++ b/instrumentation/spring/spring-kafka-2.7/library/src/main/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/SpringKafkaTelemetryBuilder.java @@ -49,12 +49,22 @@ public SpringKafkaTelemetryBuilder setCaptureExperimentalSpanAttributes( * connecting it to the producer trace. */ @CanIgnoreReturnValue - public SpringKafkaTelemetryBuilder setMessagingReceiveInstrumentationEnabled( + public SpringKafkaTelemetryBuilder setMessagingReceiveTelemetryEnabled( boolean messagingReceiveInstrumentationEnabled) { this.messagingReceiveInstrumentationEnabled = messagingReceiveInstrumentationEnabled; return this; } + /** + * @deprecated Use {@link #setMessagingReceiveTelemetryEnabled(boolean)} instead. + */ + @CanIgnoreReturnValue + @Deprecated + public SpringKafkaTelemetryBuilder setMessagingReceiveInstrumentationEnabled( + boolean messagingReceiveInstrumentationEnabled) { + return setMessagingReceiveTelemetryEnabled(messagingReceiveInstrumentationEnabled); + } + /** * Returns a new {@link SpringKafkaTelemetry} with the settings of this {@link * SpringKafkaTelemetryBuilder}. @@ -64,7 +74,7 @@ public SpringKafkaTelemetry build() { new KafkaInstrumenterFactory(openTelemetry, INSTRUMENTATION_NAME) .setCapturedHeaders(capturedHeaders) .setCaptureExperimentalSpanAttributes(captureExperimentalSpanAttributes) - .setMessagingReceiveInstrumentationEnabled(messagingReceiveInstrumentationEnabled) + .setMessagingReceiveTelemetryEnabled(messagingReceiveInstrumentationEnabled) .setErrorCauseExtractor(SpringKafkaErrorCauseExtractor.INSTANCE); return new SpringKafkaTelemetry( diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/VertxKafkaSingletons.java b/instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/VertxKafkaSingletons.java index 44947e2723d7..6f10cdae2263 100644 --- a/instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/VertxKafkaSingletons.java +++ b/instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/VertxKafkaSingletons.java @@ -27,7 +27,7 @@ public final class VertxKafkaSingletons { .setCaptureExperimentalSpanAttributes( AgentInstrumentationConfig.get() .getBoolean("otel.instrumentation.kafka.experimental-span-attributes", false)) - .setMessagingReceiveInstrumentationEnabled( + .setMessagingReceiveTelemetryEnabled( ExperimentalConfig.get().messagingReceiveInstrumentationEnabled()); BATCH_PROCESS_INSTRUMENTER = factory.createBatchProcessInstrumenter(); PROCESS_INSTRUMENTER = factory.createConsumerProcessInstrumenter();