diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractor.java index 178e22964415..a3b3100bee9c 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractor.java @@ -81,11 +81,6 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST SemanticAttributes.MESSAGING_DESTINATION_NAME, getter.getDestination(request)); } - internalSet(attributes, SemanticAttributes.NET_APP_PROTOCOL_NAME, getter.getProtocol(request)); - internalSet( - attributes, - SemanticAttributes.NET_APP_PROTOCOL_VERSION, - getter.getProtocolVersion(request)); internalSet( attributes, SemanticAttributes.MESSAGING_MESSAGE_CONVERSATION_ID, diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesGetter.java index 24753237e61d..e868121602b1 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesGetter.java @@ -7,6 +7,7 @@ import static java.util.Collections.emptyList; +import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import java.util.List; import javax.annotation.Nullable; @@ -30,11 +31,27 @@ public interface MessagingAttributesGetter { boolean isTemporaryDestination(REQUEST request); + /** + * Returns the application protocol used. + * + * @deprecated Use {@link NetClientAttributesGetter#getProtocolName(Object, Object)} instead. + */ + @Deprecated @Nullable - String getProtocol(REQUEST request); + default String getProtocol(REQUEST request) { + return null; + } + /** + * Returns the version of the application protocol used. + * + * @deprecated Use {@link NetClientAttributesGetter#getProtocolVersion(Object, Object)} instead. + */ + @Deprecated @Nullable - String getProtocolVersion(REQUEST request); + default String getProtocolVersion(REQUEST request) { + return null; + } /** * Returns the application protocol used. diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java index 4541bd82a43d..33489715a68c 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java @@ -20,6 +20,28 @@ public interface NetClientAttributesGetter { @Nullable String getTransport(REQUEST request, @Nullable RESPONSE response); + // TODO: make required after the 1.24 release + /** + * Returns the application protocol used. + * + *

Examples: `amqp`, `http`, `mqtt`. + */ + @Nullable + default String getProtocolName(REQUEST request, @Nullable RESPONSE response) { + return null; + } + + // TODO: make required after the 1.24 release + /** + * Returns the version of the application protocol used. + * + *

Examples: `3.1.1`. + */ + @Nullable + default String getProtocolVersion(REQUEST request, @Nullable RESPONSE response) { + return null; + } + @Nullable String getPeerName(REQUEST request); diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesGetter.java index 7f41fa30279c..3e34e48ac30d 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesGetter.java @@ -20,6 +20,26 @@ public interface NetServerAttributesGetter { @Nullable String getTransport(REQUEST request); + /** + * Returns the application protocol used. + * + *

Examples: `amqp`, `http`, `mqtt`. + */ + @Nullable + default String getProtocolName(REQUEST request) { + return null; + } + + /** + * Returns the version of the application protocol used. + * + *

Examples: `3.1.1`. + */ + @Nullable + default String getProtocolVersion(REQUEST request) { + return null; + } + @Nullable String getHostName(REQUEST request); diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetClientAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetClientAttributesExtractor.java index 93b9b5b3c55c..1c0b4823e4f5 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetClientAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetClientAttributesExtractor.java @@ -49,6 +49,14 @@ public void onEnd(AttributesBuilder attributes, REQUEST request, @Nullable RESPO internalSet( attributes, SemanticAttributes.NET_TRANSPORT, getter.getTransport(request, response)); + internalSet( + attributes, + SemanticAttributes.NET_APP_PROTOCOL_NAME, + getter.getProtocolName(request, response)); + internalSet( + attributes, + SemanticAttributes.NET_APP_PROTOCOL_VERSION, + getter.getProtocolVersion(request, response)); String peerName = extractPeerName(request); diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetServerAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetServerAttributesExtractor.java index 3ebb60a3aefe..39dd6999f79f 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetServerAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/InternalNetServerAttributesExtractor.java @@ -32,7 +32,14 @@ public InternalNetServerAttributesExtractor( } public void onStart(AttributesBuilder attributes, REQUEST request) { + internalSet(attributes, SemanticAttributes.NET_TRANSPORT, getter.getTransport(request)); + internalSet( + attributes, SemanticAttributes.NET_APP_PROTOCOL_NAME, getter.getProtocolName(request)); + internalSet( + attributes, + SemanticAttributes.NET_APP_PROTOCOL_VERSION, + getter.getProtocolVersion(request)); boolean setSockFamily = false; diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java index 153bfa2bad2f..70b8094e9c24 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java @@ -43,8 +43,6 @@ void shouldExtractAllAvailableAttributes( if (temporary) { request.put("temporaryDestination", "y"); } - request.put("protocol", "AMQP"); - request.put("protocolVersion", "1.0.0"); request.put("url", "http://broker/topic"); request.put("conversationId", "42"); request.put("payloadSize", "100"); @@ -70,8 +68,6 @@ void shouldExtractAllAvailableAttributes( if (temporary) { expectedEntries.add(entry(SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY, true)); } - 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_MESSAGE_CONVERSATION_ID, "42")); expectedEntries.add(entry(SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES, 100L)); expectedEntries.add( @@ -137,16 +133,6 @@ public boolean isTemporaryDestination(Map request) { return request.containsKey("temporaryDestination"); } - @Override - public String getProtocol(Map request) { - return request.get("protocol"); - } - - @Override - public String getProtocolVersion(Map request) { - return request.get("protocolVersion"); - } - @Override public String getConversationId(Map request) { return request.get("conversationId"); diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java index 9d6ac3cbfca9..a745bf711060 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.util.HashMap; import java.util.Map; +import javax.annotation.Nullable; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -30,6 +31,20 @@ public String getTransport(Map request, Map resp return response.get("transport"); } + @Nullable + @Override + public String getProtocolName( + Map request, @Nullable Map response) { + return request.get("protocolName"); + } + + @Nullable + @Override + public String getProtocolVersion( + Map request, @Nullable Map response) { + return request.get("protocolVersion"); + } + @Override public String getPeerName(Map request) { return request.get("peerName"); @@ -71,6 +86,8 @@ void normal() { // given Map map = new HashMap<>(); map.put("transport", IP_TCP); + map.put("protocolName", "http"); + map.put("protocolVersion", "1.1"); map.put("peerName", "opentelemetry.io"); map.put("peerPort", "42"); map.put("sockFamily", "inet6"); @@ -96,6 +113,8 @@ void normal() { assertThat(endAttributes.build()) .containsOnly( entry(SemanticAttributes.NET_TRANSPORT, IP_TCP), + entry(SemanticAttributes.NET_APP_PROTOCOL_NAME, "http"), + entry(SemanticAttributes.NET_APP_PROTOCOL_VERSION, "1.1"), entry(SemanticAttributes.NET_SOCK_FAMILY, "inet6"), entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"), entry(SemanticAttributes.NET_SOCK_PEER_NAME, "proxy.opentelemetry.io"), diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java index 339275746d3b..a74c53f83cdf 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java @@ -31,6 +31,18 @@ public String getTransport(Map request) { return request.get("transport"); } + @Nullable + @Override + public String getProtocolName(Map request) { + return request.get("protocolName"); + } + + @Nullable + @Override + public String getProtocolVersion(Map request) { + return request.get("protocolVersion"); + } + @Nullable @Override public String getHostName(Map request) { @@ -83,6 +95,8 @@ void normal() { // given Map map = new HashMap<>(); map.put("transport", IP_TCP); + map.put("protocolName", "http"); + map.put("protocolVersion", "1.1"); map.put("hostName", "opentelemetry.io"); map.put("hostPort", "80"); map.put("sockFamily", "inet6"); @@ -104,6 +118,8 @@ void normal() { assertThat(startAttributes.build()) .containsOnly( entry(SemanticAttributes.NET_TRANSPORT, IP_TCP), + entry(SemanticAttributes.NET_APP_PROTOCOL_NAME, "http"), + entry(SemanticAttributes.NET_APP_PROTOCOL_VERSION, "1.1"), entry(SemanticAttributes.NET_HOST_NAME, "opentelemetry.io"), entry(SemanticAttributes.NET_HOST_PORT, 80L), entry(SemanticAttributes.NET_SOCK_FAMILY, "inet6"), diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarMessagingAttributesGetter.java b/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarMessagingAttributesGetter.java index f72ffc26b496..e0b483fddaad 100644 --- a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarMessagingAttributesGetter.java +++ b/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarMessagingAttributesGetter.java @@ -35,18 +35,6 @@ public boolean isTemporaryDestination(Message message) { return false; } - @Nullable - @Override - public String getProtocol(Message message) { - return null; - } - - @Nullable - @Override - public String getProtocolVersion(Message message) { - return null; - } - @Nullable @Override public String getConversationId(Message message) { diff --git a/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageAttributesGetter.java b/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageAttributesGetter.java index c38b1e6130a4..96310c187f56 100644 --- a/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageAttributesGetter.java +++ b/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageAttributesGetter.java @@ -40,18 +40,6 @@ public boolean isTemporaryDestination(MessageWithDestination messageWithDestinat return messageWithDestination.isTemporaryDestination(); } - @Nullable - @Override - public String getProtocol(MessageWithDestination messageWithDestination) { - return null; - } - - @Nullable - @Override - public String getProtocolVersion(MessageWithDestination messageWithDestination) { - return null; - } - @Nullable @Override public String getConversationId(MessageWithDestination messageWithDestination) { diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesGetter.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesGetter.java index 01b3f5742c8e..ab796dec0697 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesGetter.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesGetter.java @@ -36,18 +36,6 @@ public boolean isTemporaryDestination(KafkaProcessRequest request) { return false; } - @Override - @Nullable - public String getProtocol(KafkaProcessRequest request) { - return null; - } - - @Override - @Nullable - public String getProtocolVersion(KafkaProcessRequest request) { - return null; - } - @Override @Nullable public String getConversationId(KafkaProcessRequest request) { diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesGetter.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesGetter.java index 2bd885d895b4..1c33870ddf70 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesGetter.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesGetter.java @@ -42,18 +42,6 @@ public boolean isTemporaryDestination(KafkaProducerRequest request) { return false; } - @Override - @Nullable - public String getProtocol(KafkaProducerRequest request) { - return null; - } - - @Override - @Nullable - public String getProtocolVersion(KafkaProducerRequest request) { - return null; - } - @Override @Nullable public String getConversationId(KafkaProducerRequest request) { diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesGetter.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesGetter.java index 3c64da2cdb58..cbc858647981 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesGetter.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesGetter.java @@ -44,18 +44,6 @@ public boolean isTemporaryDestination(KafkaReceiveRequest request) { return false; } - @Override - @Nullable - public String getProtocol(KafkaReceiveRequest request) { - return null; - } - - @Override - @Nullable - public String getProtocolVersion(KafkaReceiveRequest request) { - return null; - } - @Override @Nullable public String getConversationId(KafkaReceiveRequest request) { diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelAttributesGetter.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelAttributesGetter.java index 9d7b5734641f..3549511f5161 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelAttributesGetter.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelAttributesGetter.java @@ -35,18 +35,6 @@ public boolean isTemporaryDestination(ChannelAndMethod channelAndMethod) { return false; } - @Nullable - @Override - public String getProtocol(ChannelAndMethod channelAndMethod) { - return null; - } - - @Nullable - @Override - public String getProtocolVersion(ChannelAndMethod channelAndMethod) { - return null; - } - @Nullable @Override public String getConversationId(ChannelAndMethod channelAndMethod) { diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryAttributesGetter.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryAttributesGetter.java index 571aacc1edbe..98e570d31da7 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryAttributesGetter.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryAttributesGetter.java @@ -43,18 +43,6 @@ public boolean isTemporaryDestination(DeliveryRequest request) { return false; } - @Nullable - @Override - public String getProtocol(DeliveryRequest request) { - return null; - } - - @Nullable - @Override - public String getProtocolVersion(DeliveryRequest request) { - return null; - } - @Nullable @Override public String getConversationId(DeliveryRequest request) { diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveAttributesGetter.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveAttributesGetter.java index b9fc648f9e6c..315e0e4144b2 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveAttributesGetter.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveAttributesGetter.java @@ -45,18 +45,6 @@ public boolean isTemporaryDestination(ReceiveRequest request) { return false; } - @Nullable - @Override - public String getProtocol(ReceiveRequest request) { - return null; - } - - @Nullable - @Override - public String getProtocolVersion(ReceiveRequest request) { - return null; - } - @Nullable @Override public String getConversationId(ReceiveRequest request) { diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerAttributeGetter.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerAttributeGetter.java index 7a1fa15dd25a..6f5ef1fa7ebc 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerAttributeGetter.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerAttributeGetter.java @@ -35,18 +35,6 @@ public boolean isTemporaryDestination(MessageExt request) { return false; } - @Nullable - @Override - public String getProtocol(MessageExt request) { - return null; - } - - @Nullable - @Override - public String getProtocolVersion(MessageExt request) { - return null; - } - @Nullable @Override public String getConversationId(MessageExt request) { diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerAttributeGetter.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerAttributeGetter.java index 844265c33809..d13c9e480b3f 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerAttributeGetter.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerAttributeGetter.java @@ -40,18 +40,6 @@ public boolean isTemporaryDestination(SendMessageContext sendMessageContext) { return false; } - @Nullable - @Override - public String getProtocol(SendMessageContext sendMessageContext) { - return null; - } - - @Nullable - @Override - public String getProtocolVersion(SendMessageContext sendMessageContext) { - return null; - } - @Nullable @Override public String getConversationId(SendMessageContext sendMessageContext) { diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeGetter.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeGetter.java index dbc0618015fb..b4285b46ccba 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeGetter.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeGetter.java @@ -40,18 +40,6 @@ public boolean isTemporaryDestination(MessageView messageView) { return false; } - @Nullable - @Override - public String getProtocol(MessageView messageView) { - return null; - } - - @Nullable - @Override - public String getProtocolVersion(MessageView messageView) { - return null; - } - @Nullable @Override public String getConversationId(MessageView messageView) { diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeGetter.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeGetter.java index 267686eb931d..2cc150609d95 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeGetter.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeGetter.java @@ -39,18 +39,6 @@ public boolean isTemporaryDestination(ReceiveMessageRequest request) { return false; } - @Nullable - @Override - public String getProtocol(ReceiveMessageRequest request) { - return null; - } - - @Nullable - @Override - public String getProtocolVersion(ReceiveMessageRequest request) { - return null; - } - @Nullable @Override public String getConversationId(ReceiveMessageRequest request) { diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeGetter.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeGetter.java index f84df0a33c46..ba4a5fac65a9 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeGetter.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeGetter.java @@ -40,18 +40,6 @@ public boolean isTemporaryDestination(PublishingMessageImpl message) { return false; } - @Nullable - @Override - public String getProtocol(PublishingMessageImpl message) { - return null; - } - - @Nullable - @Override - public String getProtocolVersion(PublishingMessageImpl message) { - return null; - } - @Nullable @Override public String getConversationId(PublishingMessageImpl message) { diff --git a/instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringMessagingAttributesGetter.java b/instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringMessagingAttributesGetter.java index 845271b43089..d3223c126d93 100644 --- a/instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringMessagingAttributesGetter.java +++ b/instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringMessagingAttributesGetter.java @@ -38,18 +38,6 @@ public boolean isTemporaryDestination(MessageWithChannel messageWithChannel) { return false; } - @Override - @Nullable - public String getProtocol(MessageWithChannel messageWithChannel) { - return null; - } - - @Override - @Nullable - public String getProtocolVersion(MessageWithChannel messageWithChannel) { - return null; - } - @Override @Nullable public String getConversationId(MessageWithChannel messageWithChannel) { diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMessageAttributesGetter.java b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMessageAttributesGetter.java index a9c7941836c7..ca19d71979b0 100644 --- a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMessageAttributesGetter.java +++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMessageAttributesGetter.java @@ -35,18 +35,6 @@ public boolean isTemporaryDestination(Message message) { return false; } - @Override - @Nullable - public String getProtocol(Message message) { - return null; - } - - @Override - @Nullable - public String getProtocolVersion(Message message) { - return null; - } - @Override @Nullable public String getConversationId(Message message) {