Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove deprecated messaging.url attribute from messaging getter #8008

Merged
merged 2 commits into from
Mar 9, 2023
Merged

Remove deprecated messaging.url attribute from messaging getter #8008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b96dc2
Remove deprecated messaging.url attribute from messaging getter
Mar 8, 2023
e639d8e
remove url from pulsar getter
Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...pentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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,
Expand Down
10 changes: 9 additions & 1 deletion ...o/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 1 addition & 8 deletions ...elemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

@SuppressWarnings("deprecation") // operationName
class MessagingAttributesExtractorTest {

@ParameterizedTest
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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");
Expand Down
6 changes: 0 additions & 6 deletions ...etry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarMessagingAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 0 additions & 6 deletions .../main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 0 additions & 6 deletions ...n/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 0 additions & 6 deletions ...n/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 0 additions & 6 deletions ...in/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 0 additions & 6 deletions ...va/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 0 additions & 6 deletions ...a/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 0 additions & 6 deletions ...va/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 0 additions & 6 deletions ...io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerAttributeGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 0 additions & 6 deletions ...io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerAttributeGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 0 additions & 7 deletions ...javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 0 additions & 6 deletions ...javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 0 additions & 7 deletions ...emetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 0 additions & 6 deletions ...pentelemetry/instrumentation/spring/integration/v4_1/SpringMessagingAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 0 additions & 6 deletions ...try/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMessageAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down