Remove deprecated messaging.url attribute from messaging getter (#8008)

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

@@ -64,7 +64,6 @@ public static <REQUEST, RESPONSE> MessagingAttributesExtractorBuilder<REQUEST, R
     this.capturedHeaders = lowercase(capturedHeaders);
   }
 
-  @SuppressWarnings("deprecation") // operationName
   @Override
   public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
     internalSet(attributes, SemanticAttributes.MESSAGING_SYSTEM, getter.getSystem(request));
@@ -87,10 +86,9 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST
         attributes,
         SemanticAttributes.NET_APP_PROTOCOL_VERSION,
         getter.getProtocolVersion(request));
-    internalSet(attributes, SemanticAttributes.MESSAGING_URL, getter.getUrl(request));
     internalSet(
         attributes,
-        SemanticAttributes.MESSAGING_CONVERSATION_ID,
+        SemanticAttributes.MESSAGING_MESSAGE_CONVERSATION_ID,
         getter.getConversationId(request));
     internalSet(
         attributes,

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesGetter.java

@@ -36,8 +36,16 @@ public interface MessagingAttributesGetter<REQUEST, RESPONSE> {
   @Nullable
   String getProtocolVersion(REQUEST request);
 
+  /**
+   * Returns the application protocol used.
+   *
+   * @deprecated The {@code messaging.url} attribute was removed without replacement.
+   */
+  @Deprecated
   @Nullable
-  String getUrl(REQUEST request);
+  default String getUrl(REQUEST request) {
+    return null;
+  }
 
   @Nullable
   String getConversationId(REQUEST request);

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

@@ -26,7 +26,6 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-@SuppressWarnings("deprecation") // operationName
 class MessagingAttributesExtractorTest {
 
   @ParameterizedTest
@@ -73,8 +72,7 @@ void shouldExtractAllAvailableAttributes(
     }
     expectedEntries.add(entry(SemanticAttributes.NET_APP_PROTOCOL_NAME, "AMQP"));
     expectedEntries.add(entry(SemanticAttributes.NET_APP_PROTOCOL_VERSION, "1.0.0"));
-    expectedEntries.add(entry(SemanticAttributes.MESSAGING_URL, "http://broker/topic"));
-    expectedEntries.add(entry(SemanticAttributes.MESSAGING_CONVERSATION_ID, "42"));
+    expectedEntries.add(entry(SemanticAttributes.MESSAGING_MESSAGE_CONVERSATION_ID, "42"));
     expectedEntries.add(entry(SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES, 100L));
     expectedEntries.add(
         entry(SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES, 10L));
@@ -149,11 +147,6 @@ public String getProtocolVersion(Map<String, String> request) {
       return request.get("protocolVersion");
     }
 
-    @Override
-    public String getUrl(Map<String, String> request) {
-      return request.get("url");
-    }
-
     @Override
     public String getConversationId(Map<String, String> request) {
       return request.get("conversationId");

instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarMessagingAttributesGetter.java

@@ -47,12 +47,6 @@ public String getProtocolVersion(Message<?> message) {
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getUrl(Message<?> message) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getConversationId(Message<?> message) {

instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageAttributesGetter.java

@@ -52,12 +52,6 @@ public String getProtocolVersion(MessageWithDestination messageWithDestination)
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getUrl(MessageWithDestination messageWithDestination) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getConversationId(MessageWithDestination messageWithDestination) {

instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesGetter.java

@@ -48,12 +48,6 @@ public String getProtocolVersion(KafkaProcessRequest request) {
     return null;
   }
 
-  @Override
-  @Nullable
-  public String getUrl(KafkaProcessRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getConversationId(KafkaProcessRequest request) {

instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesGetter.java

@@ -54,12 +54,6 @@ public String getProtocolVersion(KafkaProducerRequest request) {
     return null;
   }
 
-  @Override
-  @Nullable
-  public String getUrl(KafkaProducerRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getConversationId(KafkaProducerRequest request) {

instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesGetter.java

@@ -56,12 +56,6 @@ public String getProtocolVersion(KafkaReceiveRequest request) {
     return null;
   }
 
-  @Override
-  @Nullable
-  public String getUrl(KafkaReceiveRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getConversationId(KafkaReceiveRequest request) {

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelAttributesGetter.java

@@ -47,12 +47,6 @@ public String getProtocolVersion(ChannelAndMethod channelAndMethod) {
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getUrl(ChannelAndMethod channelAndMethod) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getConversationId(ChannelAndMethod channelAndMethod) {

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryAttributesGetter.java

@@ -55,12 +55,6 @@ public String getProtocolVersion(DeliveryRequest request) {
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getUrl(DeliveryRequest request) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getConversationId(DeliveryRequest request) {

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveAttributesGetter.java

@@ -57,12 +57,6 @@ public String getProtocolVersion(ReceiveRequest request) {
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getUrl(ReceiveRequest request) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getConversationId(ReceiveRequest request) {

instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerAttributeGetter.java

@@ -47,12 +47,6 @@ public String getProtocolVersion(MessageExt request) {
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getUrl(MessageExt request) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getConversationId(MessageExt request) {

instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerAttributeGetter.java

@@ -52,12 +52,6 @@ public String getProtocolVersion(SendMessageContext sendMessageContext) {
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getUrl(SendMessageContext sendMessageContext) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getConversationId(SendMessageContext sendMessageContext) {

instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeGetter.java

@@ -52,19 +52,12 @@ public String getProtocolVersion(MessageView messageView) {
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getUrl(MessageView messageView) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getConversationId(MessageView messageView) {
     return null;
   }
 
-  @Nullable
   @Override
   public Long getMessagePayloadSize(MessageView messageView) {
     return (long) messageView.getBody().remaining();

instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeGetter.java

@@ -51,12 +51,6 @@ public String getProtocolVersion(ReceiveMessageRequest request) {
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getUrl(ReceiveMessageRequest request) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getConversationId(ReceiveMessageRequest request) {

instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeGetter.java

@@ -52,19 +52,12 @@ public String getProtocolVersion(PublishingMessageImpl message) {
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getUrl(PublishingMessageImpl message) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getConversationId(PublishingMessageImpl message) {
     return null;
   }
 
-  @Nullable
   @Override
   public Long getMessagePayloadSize(PublishingMessageImpl message) {
     return (long) message.getBody().remaining();

instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringMessagingAttributesGetter.java

@@ -50,12 +50,6 @@ public String getProtocolVersion(MessageWithChannel messageWithChannel) {
     return null;
   }
 
-  @Override
-  @Nullable
-  public String getUrl(MessageWithChannel messageWithChannel) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getConversationId(MessageWithChannel messageWithChannel) {

instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMessageAttributesGetter.java

@@ -47,12 +47,6 @@ public String getProtocolVersion(Message message) {
     return null;
   }
 
-  @Override
-  @Nullable
-  public String getUrl(Message message) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getConversationId(Message message) {