Skip to content

Commit 27d3a14

Browse files
committed
Reintroduce the old io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingSpanNameExtractor.create and mark it deprecated to give consumers time to migrate
1 parent 802882a commit 27d3a14

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,21 @@
1212

1313
public final class MessagingSpanNameExtractor<REQUEST> implements SpanNameExtractor<REQUEST> {
1414

15+
/**
16+
* Returns a {@link SpanNameExtractor} that constructs the span name according to <a
17+
* href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/messaging/messaging-spans.md#span-name">
18+
* messaging semantic conventions</a>: {@code <operation name> <destination name>}.
19+
*
20+
* @see MessagingAttributesGetter#getDestination(Object) used to extract {@code <destination
21+
* name>}.
22+
* @see MessageOperation used to extract {@code <operation name>}.
23+
*/
24+
@Deprecated
25+
public static <REQUEST> SpanNameExtractor<REQUEST> create(
26+
MessagingAttributesGetter<REQUEST, ?> getter, MessageOperation operation) {
27+
return new MessagingSpanNameExtractor<>(getter, operation, null);
28+
}
29+
1530
/**
1631
* Returns a {@link SpanNameExtractor} that constructs the span name according to <a
1732
* href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/messaging/messaging-spans.md#span-name">
@@ -37,7 +52,7 @@ public static <REQUEST> SpanNameExtractor<REQUEST> create(
3752
private MessagingSpanNameExtractor(
3853
MessagingAttributesGetter<REQUEST, ?> getter,
3954
MessageOperation operation,
40-
ServerAttributesGetter<REQUEST> serverAttributesGetter) {
55+
@Nullable ServerAttributesGetter<REQUEST> serverAttributesGetter) {
4156
this.getter = getter;
4257
this.serverAttributesGetter = serverAttributesGetter;
4358
this.operation = operation;
@@ -76,7 +91,8 @@ private String getDestination(REQUEST request) {
7691
} else if (getter.getDestination(request) != null) {
7792
destination = getter.getDestination(request);
7893
} else {
79-
if (serverAttributesGetter.getServerAddress(request) != null
94+
if (serverAttributesGetter != null
95+
&& serverAttributesGetter.getServerAddress(request) != null
8096
&& serverAttributesGetter.getServerPort(request) != null) {
8197
destination =
8298
serverAttributesGetter.getServerAddress(request)

0 commit comments

Comments
 (0)