Skip to content

Commit 44f55f2

Browse files
cboscbos
committed
Remove MessagingNetworkAttributesGetter and MessagingNetworkAttributesExtractor as NetworkAttributesGetter and ServerAttributesGetter can be used by the implementations
1 parent c3d09aa commit 44f55f2

File tree

29 files changed

+49
-279
lines changed

29 files changed

+49
-279
lines changed

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

Lines changed: 0 additions & 60 deletions
This file was deleted.

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

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkInstrumenterFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter() {
115115

116116
return createInstrumenter(
117117
openTelemetry,
118-
MessagingSpanNameExtractor.create(getter, operation, getter),
118+
MessagingSpanNameExtractor.create(getter, operation),
119119
SpanKindExtractor.alwaysConsumer(),
120120
toSqsRequestExtractors(attributesExtractors()),
121121
singletonList(messagingAttributeExtractor),
@@ -132,7 +132,7 @@ Instrumenter<SqsProcessRequest, Response<?>> consumerProcessInstrumenter() {
132132
Instrumenter.<SqsProcessRequest, Response<?>>builder(
133133
openTelemetry,
134134
INSTRUMENTATION_NAME,
135-
MessagingSpanNameExtractor.create(getter, operation, getter))
135+
MessagingSpanNameExtractor.create(getter, operation))
136136
.addAttributesExtractors(toSqsRequestExtractors(attributesExtractors()))
137137
.addAttributesExtractor(messagingAttributeExtractor);
138138

@@ -186,7 +186,7 @@ Instrumenter<Request<?>, Response<?>> producerInstrumenter() {
186186

187187
return createInstrumenter(
188188
openTelemetry,
189-
MessagingSpanNameExtractor.create(getter, operation, getter),
189+
MessagingSpanNameExtractor.create(getter, operation),
190190
SpanKindExtractor.alwaysProducer(),
191191
attributesExtractors(),
192192
singletonList(messagingAttributeExtractor),

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsAttributesGetter.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,11 @@
88
import com.amazonaws.Request;
99
import com.amazonaws.Response;
1010
import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingAttributesGetter;
11-
import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingNetworkAttributesGetter;
1211
import java.util.Collections;
1312
import java.util.List;
1413
import javax.annotation.Nullable;
1514

16-
enum SqsAttributesGetter
17-
implements
18-
MessagingAttributesGetter<Request<?>, Response<?>>,
19-
MessagingNetworkAttributesGetter<Request<?>, Response<?>> {
15+
enum SqsAttributesGetter implements MessagingAttributesGetter<Request<?>, Response<?>> {
2016
INSTANCE;
2117

2218
// copied from MessagingIncubatingAttributes.MessagingSystemIncubatingValues

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsProcessRequestAttributesGetter.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77

88
import com.amazonaws.Response;
99
import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingAttributesGetter;
10-
import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingNetworkAttributesGetter;
1110
import java.util.Collections;
1211
import java.util.List;
1312
import javax.annotation.Nullable;
1413

1514
enum SqsProcessRequestAttributesGetter
16-
implements
17-
MessagingAttributesGetter<SqsProcessRequest, Response<?>>,
18-
MessagingNetworkAttributesGetter<SqsProcessRequest, Response<?>> {
15+
implements MessagingAttributesGetter<SqsProcessRequest, Response<?>> {
1916
INSTANCE;
2017

2118
// copied from MessagingIncubatingAttributes.MessagingSystemIncubatingValues

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsReceiveRequestAttributesGetter.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@
77

88
import com.amazonaws.Response;
99
import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingAttributesGetter;
10-
import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingNetworkAttributesGetter;
1110
import java.util.List;
1211
import java.util.stream.Collectors;
1312
import java.util.stream.StreamSupport;
1413
import javax.annotation.Nullable;
1514

1615
enum SqsReceiveRequestAttributesGetter
17-
implements
18-
MessagingAttributesGetter<SqsReceiveRequest, Response<?>>,
19-
MessagingNetworkAttributesGetter<SqsReceiveRequest, Response<?>> {
16+
implements MessagingAttributesGetter<SqsReceiveRequest, Response<?>> {
2017
INSTANCE;
2118

2219
// copied from MessagingIncubatingAttributes.MessagingSystemIncubatingValues

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AwsSdkInstrumenterFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public Instrumenter<SqsReceiveRequest, Response> consumerReceiveInstrumenter() {
138138

139139
return createInstrumenter(
140140
openTelemetry,
141-
MessagingSpanNameExtractor.create(getter, operation, getter),
141+
MessagingSpanNameExtractor.create(getter, operation),
142142
SpanKindExtractor.alwaysConsumer(),
143143
toSqsRequestExtractors(consumerAttributesExtractors()),
144144
singletonList(messagingAttributeExtractor),
@@ -153,7 +153,7 @@ public Instrumenter<SqsProcessRequest, Response> consumerProcessInstrumenter() {
153153
Instrumenter.<SqsProcessRequest, Response>builder(
154154
openTelemetry,
155155
INSTRUMENTATION_NAME,
156-
MessagingSpanNameExtractor.create(getter, operation, getter))
156+
MessagingSpanNameExtractor.create(getter, operation))
157157
.addAttributesExtractors(toSqsRequestExtractors(consumerAttributesExtractors()))
158158
.addAttributesExtractor(messagingAttributesExtractor(getter, operation));
159159

@@ -207,7 +207,7 @@ public Instrumenter<ExecutionAttributes, Response> producerInstrumenter() {
207207

208208
return createInstrumenter(
209209
openTelemetry,
210-
MessagingSpanNameExtractor.create(getter, operation, getter),
210+
MessagingSpanNameExtractor.create(getter, operation),
211211
SpanKindExtractor.alwaysProducer(),
212212
attributesExtractors(),
213213
singletonList(messagingAttributeExtractor),

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/SqsAttributesGetter.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,14 @@
66
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingAttributesGetter;
9-
import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingNetworkAttributesGetter;
109
import java.util.Collections;
1110
import java.util.List;
1211
import javax.annotation.Nullable;
1312
import software.amazon.awssdk.core.SdkRequest;
1413
import software.amazon.awssdk.core.SdkResponse;
1514
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
1615

17-
enum SqsAttributesGetter
18-
implements
19-
MessagingAttributesGetter<ExecutionAttributes, Response>,
20-
MessagingNetworkAttributesGetter<ExecutionAttributes, Response> {
16+
enum SqsAttributesGetter implements MessagingAttributesGetter<ExecutionAttributes, Response> {
2117
INSTANCE;
2218

2319
// copied from MessagingIncubatingAttributes.MessagingSystemIncubatingValues

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/SqsProcessRequestAttributesGetter.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,13 @@
66
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingAttributesGetter;
9-
import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingNetworkAttributesGetter;
109
import java.util.Collections;
1110
import java.util.List;
1211
import javax.annotation.Nullable;
1312
import software.amazon.awssdk.core.SdkRequest;
1413

1514
enum SqsProcessRequestAttributesGetter
16-
implements
17-
MessagingAttributesGetter<SqsProcessRequest, Response>,
18-
MessagingNetworkAttributesGetter<SqsProcessRequest, Response> {
15+
implements MessagingAttributesGetter<SqsProcessRequest, Response> {
1916
INSTANCE;
2017

2118
// copied from MessagingIncubatingAttributes.MessagingSystemIncubatingValues

‎instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/SqsReceiveRequestAttributesGetter.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66
package io.opentelemetry.instrumentation.awssdk.v2_2.internal;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingAttributesGetter;
9-
import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingNetworkAttributesGetter;
109
import java.util.List;
1110
import java.util.stream.Collectors;
1211
import java.util.stream.StreamSupport;
1312
import javax.annotation.Nullable;
1413
import software.amazon.awssdk.core.SdkRequest;
1514

1615
enum SqsReceiveRequestAttributesGetter
17-
implements
18-
MessagingAttributesGetter<SqsReceiveRequest, Response>,
19-
MessagingNetworkAttributesGetter<SqsReceiveRequest, Response> {
16+
implements MessagingAttributesGetter<SqsReceiveRequest, Response> {
2017
INSTANCE;
2118

2219
// copied from MessagingIncubatingAttributes.MessagingSystemIncubatingValues

0 commit comments

Comments
 (0)