Activate messaging v1.43 in v3 preview

Author: trask

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 ### 🚫 Deprecations
 
+- Deprecate `MessageOperation` in favor of `MessagingOperationType`.
+  ([#19276](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/19276))
+
 - Deprecate `DeclarativeConfigPropertiesBridgeBuilder`. Read declarative component configuration
   through `DeclarativeConfigProperties` directly. To expose `ConfigProperties` through the
   declarative configuration API, use `ConfigPropertiesBackedConfigProvider`.

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessageOperation.java

@@ -5,7 +5,12 @@
 
 package io.opentelemetry.instrumentation.api.incubator.semconv.messaging;
 
-/** Represents an operation that may be used in a messaging system. */
+/**
+ * Represents an operation that may be used in a messaging system.
+ *
+ * @deprecated Use {@link MessagingOperationType}. Will be removed in 3.0.
+ */
+@Deprecated // to be removed in 3.0
 public enum MessageOperation {
   PUBLISH(MessagingOperationType.SEND),
   RECEIVE(MessagingOperationType.RECEIVE),

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractor.java

@@ -73,7 +73,11 @@ public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> createF
     return builderForOperationType(getter, operationType).build();
   }
 
-  /** Creates the messaging attributes extractor for the given operation. */
+  /**
+   * @deprecated Use {@link #createForOperationType(MessagingAttributesGetter,
+   *     MessagingOperationType)}. Will be removed in 3.0.
+   */
+  @Deprecated // to be removed in 3.0
   public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> create(
       MessagingAttributesGetter<REQUEST, RESPONSE> getter, @Nullable MessageOperation operation) {
     return createForOperationType(getter, operation == null ? null : operation.type());
@@ -90,7 +94,11 @@ MessagingAttributesExtractorBuilder<REQUEST, RESPONSE> builderForOperationType(
     return new MessagingAttributesExtractorBuilder<>(getter, operationType);
   }
 
-  /** Returns a new messaging attributes extractor builder for the given operation. */
+  /**
+   * @deprecated Use {@link #builderForOperationType(MessagingAttributesGetter,
+   *     MessagingOperationType)}. Will be removed in 3.0.
+   */
+  @Deprecated // to be removed in 3.0
   public static <REQUEST, RESPONSE> MessagingAttributesExtractorBuilder<REQUEST, RESPONSE> builder(
       MessagingAttributesGetter<REQUEST, RESPONSE> getter, @Nullable MessageOperation operation) {
     return builderForOperationType(getter, operation == null ? null : operation.type());

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingSpanKindExtractor.java

@@ -59,7 +59,10 @@ public static <REQUEST> SpanKindExtractor<REQUEST> create(
     return request -> result;
   }
 
-  /** Returns a span kind extractor for the given operation. */
+  /**
+   * @deprecated Use {@link #create(MessagingOperationType)}. Will be removed in 3.0.
+   */
+  @Deprecated // to be removed in 3.0
   public static <REQUEST> SpanKindExtractor<REQUEST> create(MessageOperation operation) {
     return create(operation.type());
   }

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingSpanNameExtractor.java

@@ -25,7 +25,11 @@ public static <REQUEST> SpanNameExtractor<REQUEST> create(
     return builder(getter, operationType).build();
   }
 
-  /** Returns a messaging span name extractor for the given operation. */
+  /**
+   * @deprecated Use {@link #create(MessagingAttributesGetter, MessagingOperationType)}. Will be
+   *     removed in 3.0.
+   */
+  @Deprecated // to be removed in 3.0
   public static <REQUEST> SpanNameExtractor<REQUEST> create(
       MessagingAttributesGetter<REQUEST, ?> getter, MessageOperation operation) {
     return create(getter, operation.type());
@@ -40,7 +44,11 @@ public static <REQUEST> MessagingSpanNameExtractorBuilder<REQUEST> builder(
     return new MessagingSpanNameExtractorBuilder<>(getter, operationType);
   }
 
-  /** Returns a messaging span name extractor builder for the given operation. */
+  /**
+   * @deprecated Use {@link #builder(MessagingAttributesGetter, MessagingOperationType)}. Will be
+   *     removed in 3.0.
+   */
+  @Deprecated // to be removed in 3.0
   public static <REQUEST> MessagingSpanNameExtractorBuilder<REQUEST> builder(
       MessagingAttributesGetter<REQUEST, ?> getter, MessageOperation operation) {
     return builder(getter, operation.type());

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorTest.java

@@ -248,6 +248,7 @@ void shouldExtractErrorTypeFromResponse() {
     assertThat(attributes.build()).isEqualTo(expected);
   }
 
+  @SuppressWarnings("OtelDeprecatedApiUsage")
   @Test
   void shouldExtractNoAttributesIfNoneAreAvailable() {
     // given

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/SemconvSelectionResolver.java

@@ -89,12 +89,12 @@ SemconvMode rpc() {
   }
 
   SemconvMode messaging() {
-    return resolveSemconvSelection(
+    SemconvDomain.Builder domain =
         SemconvDomain.builder("messaging")
-            .defaultMode(SemconvMode.V0_STABLE)
             .otherSupportedModes(
-                SemconvMode.V1_EXPERIMENTAL, SemconvMode.V1_EXPERIMENTAL.withDualEmit())
-            .build());
+                SemconvMode.V1_EXPERIMENTAL, SemconvMode.V1_EXPERIMENTAL.withDualEmit());
+    domain.defaultMode(v3Preview ? SemconvMode.V1_EXPERIMENTAL : SemconvMode.V0_STABLE);
+    return resolveSemconvSelection(domain.build());
   }
 
   SemconvMode servicePeer() {

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/SemconvStabilityTest.java

@@ -356,7 +356,7 @@ void v3PreviewIgnoresStableOptInForPreviewDomains() {
 
     assertThat(rpc).isEqualTo(SemconvMode.V0_STABLE);
     assertThat(servicePeer).isEqualTo(SemconvMode.V0_STABLE);
-    assertThat(messaging).isEqualTo(SemconvMode.V0_STABLE);
+    assertThat(messaging).isEqualTo(SemconvMode.V1_EXPERIMENTAL);
   }
 
   @ParameterizedTest
@@ -420,23 +420,23 @@ private static List<Arguments> messagingSelectionModes() {
             preview("messaging/dup"),
             SemconvMode.V1_EXPERIMENTAL.withDualEmit()),
         argumentSet(
-            "v3 activation remains staged",
+            "v3 activates messaging preview",
             true,
             noStableOptIn(),
             noPreview(),
-            SemconvMode.V0_STABLE),
+            SemconvMode.V1_EXPERIMENTAL),
         argumentSet(
             "v3 ignores legacy opt-in property",
             true,
             stableOptIn("messaging"),
             noPreview(),
-            SemconvMode.V0_STABLE),
+            SemconvMode.V1_EXPERIMENTAL),
         argumentSet(
             "v3 ignores legacy opt-in dual emit",
             true,
             stableOptIn("messaging/dup"),
             noPreview(),
-            SemconvMode.V0_STABLE),
+            SemconvMode.V1_EXPERIMENTAL),
         argumentSet(
             "v3 with explicit preview",
             true,