Skip to content

Commit 240fc37

Browse files
michaelpri10michaelpri10
authored
deps: Remove OpenTelemetry semconv dependency (#2611)
* deps: Remove OpenTelemetry semconv dependency * chore: Fix formatting
1 parent 42ad2d0 commit 240fc37

File tree

4 files changed

+55
-51
lines changed

4 files changed

+55
-51
lines changed

‎google-cloud-pubsub/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@
108108
<groupId>io.opentelemetry</groupId>
109109
<artifactId>opentelemetry-context</artifactId>
110110
</dependency>
111-
<dependency>
112-
<groupId>io.opentelemetry</groupId>
113-
<artifactId>opentelemetry-semconv</artifactId>
114-
</dependency>
115111

116112
<!-- Test dependencies -->
117113
<dependency>

‎google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/OpenTelemetryPubsubTracer.java‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import io.opentelemetry.api.trace.StatusCode;
2828
import io.opentelemetry.api.trace.Tracer;
2929
import io.opentelemetry.context.Context;
30-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
3130
import java.util.List;
3231

3332
public class OpenTelemetryPubsubTracer {
@@ -40,6 +39,13 @@ public class OpenTelemetryPubsubTracer {
4039
"subscriber concurrency control";
4140
private static final String SUBSCRIBE_SCHEDULER_SPAN_NAME = "subscriber scheduler";
4241

42+
private static final String MESSAGING_SYSTEM_ATTR_KEY = "messaging.system";
43+
private static final String MESSAGING_DESTINATION_NAME_ATTR_KEY = "messaging.destination.name";
44+
private static final String CODE_FUNCTION_ATTR_KEY = "code.function";
45+
private static final String MESSAGING_OPERATION_ATTR_KEY = "messaging.operation";
46+
private static final String MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY =
47+
"messaging.batch.message_count";
48+
private static final String MESSAGING_MESSAGE_ID_ATTR_KEY = "messaging.message.id";
4349
private static final String MESSAGE_SIZE_ATTR_KEY = "messaging.message.body.size";
4450
private static final String ORDERING_KEY_ATTR_KEY = "messaging.gcp_pubsub.message.ordering_key";
4551
private static final String MESSAGE_ACK_ID_ATTR_KEY = "messaging.gcp_pubsub.message.ack_id";
@@ -66,12 +72,12 @@ private static final AttributesBuilder createCommonSpanAttributesBuilder(
6672
String destinationName, String projectName, String codeFunction, String operation) {
6773
AttributesBuilder attributesBuilder =
6874
Attributes.builder()
69-
.put(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
70-
.put(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName)
75+
.put(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
76+
.put(MESSAGING_DESTINATION_NAME_ATTR_KEY, destinationName)
7177
.put(PROJECT_ATTR_KEY, projectName)
72-
.put(SemanticAttributes.CODE_FUNCTION, codeFunction);
78+
.put(CODE_FUNCTION_ATTR_KEY, codeFunction);
7379
if (operation != null) {
74-
attributesBuilder.put(SemanticAttributes.MESSAGING_OPERATION, operation);
80+
attributesBuilder.put(MESSAGING_OPERATION_ATTR_KEY, operation);
7581
}
7682

7783
return attributesBuilder;
@@ -179,15 +185,15 @@ Span startPublishRpcSpan(TopicName topicName, List<PubsubMessageWrapper> message
179185
Attributes attributes =
180186
createCommonSpanAttributesBuilder(
181187
topicName.getTopic(), topicName.getProject(), "publishCall", "publish")
182-
.put(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, messages.size())
188+
.put(MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY, messages.size())
183189
.build();
184190
SpanBuilder publishRpcSpanBuilder =
185191
tracer
186192
.spanBuilder(topicName.getTopic() + PUBLISH_RPC_SPAN_SUFFIX)
187193
.setSpanKind(SpanKind.CLIENT)
188194
.setAllAttributes(attributes);
189195
Attributes linkAttributes =
190-
Attributes.builder().put(SemanticAttributes.MESSAGING_OPERATION, "publish").build();
196+
Attributes.builder().put(MESSAGING_OPERATION_ATTR_KEY, "publish").build();
191197
for (PubsubMessageWrapper message : messages) {
192198
if (message.getPublisherSpan().getSpanContext().isSampled())
193199
publishRpcSpanBuilder.addLink(message.getPublisherSpan().getSpanContext(), linkAttributes);
@@ -237,7 +243,7 @@ void startSubscriberSpan(PubsubMessageWrapper message, boolean exactlyOnceDelive
237243
message.getSubscriptionName(), message.getSubscriptionProject(), "onResponse", null);
238244

239245
attributesBuilder
240-
.put(SemanticAttributes.MESSAGING_MESSAGE_ID, message.getMessageId())
246+
.put(MESSAGING_MESSAGE_ID_ATTR_KEY, message.getMessageId())
241247
.put(MESSAGE_SIZE_ATTR_KEY, message.getDataSize())
242248
.put(MESSAGE_ACK_ID_ATTR_KEY, message.getAckId())
243249
.put(MESSAGE_EXACTLY_ONCE_ATTR_KEY, exactlyOnceDeliveryEnabled);
@@ -336,8 +342,7 @@ void startSubscribeProcessSpan(PubsubMessageWrapper message) {
336342
if (subscriberSpan != null) {
337343
Span subscribeProcessSpan =
338344
startChildSpan(message.getSubscriptionName() + " process", subscriberSpan);
339-
subscribeProcessSpan.setAttribute(
340-
SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE);
345+
subscribeProcessSpan.setAttribute(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE);
341346
Span publisherSpan = message.getPublisherSpan();
342347
if (publisherSpan != null) {
343348
subscribeProcessSpan.addLink(publisherSpan.getSpanContext());
@@ -373,7 +378,7 @@ Span startSubscribeRpcSpan(
373378
subscriptionName.getProject(),
374379
codeFunction,
375380
rpcOperation)
376-
.put(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, messages.size());
381+
.put(MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY, messages.size());
377382

378383
// Ack deadline and receipt modack are specific to the modack operation
379384
if (rpcOperation == "modack") {
@@ -388,7 +393,7 @@ Span startSubscribeRpcSpan(
388393
.setSpanKind(SpanKind.CLIENT)
389394
.setAllAttributes(attributesBuilder.build());
390395
Attributes linkAttributes =
391-
Attributes.builder().put(SemanticAttributes.MESSAGING_OPERATION, rpcOperation).build();
396+
Attributes.builder().put(MESSAGING_OPERATION_ATTR_KEY, rpcOperation).build();
392397
for (PubsubMessageWrapper message : messages) {
393398
if (message.getSubscriberSpan().getSpanContext().isSampled()) {
394399
rpcSpanBuilder.addLink(message.getSubscriberSpan().getSpanContext(), linkAttributes);

‎google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PubsubMessageWrapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import io.opentelemetry.context.Context;
2727
import io.opentelemetry.context.propagation.TextMapGetter;
2828
import io.opentelemetry.context.propagation.TextMapSetter;
29-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
3029

3130
/**
3231
* A wrapper class for a {@link PubsubMessage} object that handles creation and tracking of
@@ -54,6 +53,7 @@ public class PubsubMessageWrapper {
5453

5554
private static final String GOOGCLIENT_PREFIX = "googclient_";
5655

56+
private static final String MESSAGING_MESSAGE_ID_ATTR_KEY = "messaging.message.id";
5757
private static final String MESSAGE_RESULT_ATTR_KEY = "messaging.gcp_pubsub.result";
5858

5959
private Span publisherSpan;
@@ -194,7 +194,7 @@ void addPublishStartEvent() {
194194
*/
195195
void setPublisherMessageIdSpanAttribute(String messageId) {
196196
if (publisherSpan != null) {
197-
publisherSpan.setAttribute(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId);
197+
publisherSpan.setAttribute(MESSAGING_MESSAGE_ID_ATTR_KEY, messageId);
198198
}
199199
}
200200

‎google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenTelemetryTest.java‎

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import io.opentelemetry.sdk.trace.data.LinkData;
3636
import io.opentelemetry.sdk.trace.data.SpanData;
3737
import io.opentelemetry.sdk.trace.data.StatusData;
38-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
3938
import java.util.Arrays;
4039
import java.util.List;
4140
import org.junit.Test;
@@ -82,6 +81,13 @@ public class OpenTelemetryTest {
8281
private static final String ACK_START_EVENT = "ack start";
8382
private static final String ACK_END_EVENT = "ack end";
8483

84+
private static final String MESSAGING_SYSTEM_ATTR_KEY = "messaging.system";
85+
private static final String MESSAGING_DESTINATION_NAME_ATTR_KEY = "messaging.destination.name";
86+
private static final String CODE_FUNCTION_ATTR_KEY = "code.function";
87+
private static final String MESSAGING_OPERATION_ATTR_KEY = "messaging.operation";
88+
private static final String MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY =
89+
"messaging.batch.message_count";
90+
private static final String MESSAGING_MESSAGE_ID_ATTR_KEY = "messaging.message.id";
8591
private static final String MESSAGING_SYSTEM_VALUE = "gcp_pubsub";
8692
private static final String PROJECT_ATTR_KEY = "gcp.project_id";
8793
private static final String MESSAGE_SIZE_ATTR_KEY = "messaging.message.body.size";
@@ -159,12 +165,12 @@ public void testPublishSpansSuccess() {
159165
AttributesAssert publishRpcSpanAttributesAssert =
160166
OpenTelemetryAssertions.assertThat(publishRpcSpanData.getAttributes());
161167
publishRpcSpanAttributesAssert
162-
.containsEntry(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
163-
.containsEntry(SemanticAttributes.MESSAGING_DESTINATION_NAME, FULL_TOPIC_NAME.getTopic())
168+
.containsEntry(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
169+
.containsEntry(MESSAGING_DESTINATION_NAME_ATTR_KEY, FULL_TOPIC_NAME.getTopic())
164170
.containsEntry(PROJECT_ATTR_KEY, FULL_TOPIC_NAME.getProject())
165-
.containsEntry(SemanticAttributes.CODE_FUNCTION, "publishCall")
166-
.containsEntry(SemanticAttributes.MESSAGING_OPERATION, "publish")
167-
.containsEntry(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, messageWrappers.size());
171+
.containsEntry(CODE_FUNCTION_ATTR_KEY, "publishCall")
172+
.containsEntry(MESSAGING_OPERATION_ATTR_KEY, "publish")
173+
.containsEntry(MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY, messageWrappers.size());
168174

169175
// Check span data, events, links, and attributes for the publisher create span
170176
SpanDataAssert publisherSpanDataAssert = OpenTelemetryAssertions.assertThat(publisherSpanData);
@@ -190,14 +196,14 @@ public void testPublishSpansSuccess() {
190196
AttributesAssert publisherSpanAttributesAssert =
191197
OpenTelemetryAssertions.assertThat(publisherSpanData.getAttributes());
192198
publisherSpanAttributesAssert
193-
.containsEntry(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
194-
.containsEntry(SemanticAttributes.MESSAGING_DESTINATION_NAME, FULL_TOPIC_NAME.getTopic())
199+
.containsEntry(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
200+
.containsEntry(MESSAGING_DESTINATION_NAME_ATTR_KEY, FULL_TOPIC_NAME.getTopic())
195201
.containsEntry(PROJECT_ATTR_KEY, PROJECT_NAME)
196-
.containsEntry(SemanticAttributes.CODE_FUNCTION, "publish")
197-
.containsEntry(SemanticAttributes.MESSAGING_OPERATION, "create")
202+
.containsEntry(CODE_FUNCTION_ATTR_KEY, "publish")
203+
.containsEntry(MESSAGING_OPERATION_ATTR_KEY, "create")
198204
.containsEntry(ORDERING_KEY_ATTR_KEY, ORDERING_KEY)
199205
.containsEntry(MESSAGE_SIZE_ATTR_KEY, messageSize)
200-
.containsEntry(SemanticAttributes.MESSAGING_MESSAGE_ID, MESSAGE_ID);
206+
.containsEntry(MESSAGING_MESSAGE_ID_ATTR_KEY, MESSAGE_ID);
201207

202208
// Check that the message has the attribute containing the trace context.
203209
PubsubMessage message = messageWrapper.getPubsubMessage();
@@ -393,14 +399,13 @@ public void testSubscribeSpansSuccess() {
393399
AttributesAssert modackRpcSpanAttributesAssert =
394400
OpenTelemetryAssertions.assertThat(modackRpcSpanData.getAttributes());
395401
modackRpcSpanAttributesAssert
396-
.containsEntry(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
402+
.containsEntry(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
397403
.containsEntry(
398-
SemanticAttributes.MESSAGING_DESTINATION_NAME, FULL_SUBSCRIPTION_NAME.getSubscription())
404+
MESSAGING_DESTINATION_NAME_ATTR_KEY, FULL_SUBSCRIPTION_NAME.getSubscription())
399405
.containsEntry(PROJECT_ATTR_KEY, FULL_TOPIC_NAME.getProject())
400-
.containsEntry(SemanticAttributes.CODE_FUNCTION, "sendModAckOperations")
401-
.containsEntry(SemanticAttributes.MESSAGING_OPERATION, "modack")
402-
.containsEntry(
403-
SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, subscribeMessageWrappers.size())
406+
.containsEntry(CODE_FUNCTION_ATTR_KEY, "sendModAckOperations")
407+
.containsEntry(MESSAGING_OPERATION_ATTR_KEY, "modack")
408+
.containsEntry(MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY, subscribeMessageWrappers.size())
404409
.containsEntry(ACK_DEADLINE_ATTR_KEY, 10)
405410
.containsEntry(RECEIPT_MODACK_ATTR_KEY, true);
406411

@@ -420,14 +425,13 @@ public void testSubscribeSpansSuccess() {
420425
AttributesAssert ackRpcSpanAttributesAssert =
421426
OpenTelemetryAssertions.assertThat(ackRpcSpanData.getAttributes());
422427
ackRpcSpanAttributesAssert
423-
.containsEntry(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
428+
.containsEntry(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
424429
.containsEntry(
425-
SemanticAttributes.MESSAGING_DESTINATION_NAME, FULL_SUBSCRIPTION_NAME.getSubscription())
430+
MESSAGING_DESTINATION_NAME_ATTR_KEY, FULL_SUBSCRIPTION_NAME.getSubscription())
426431
.containsEntry(PROJECT_ATTR_KEY, FULL_TOPIC_NAME.getProject())
427-
.containsEntry(SemanticAttributes.CODE_FUNCTION, "sendAckOperations")
428-
.containsEntry(SemanticAttributes.MESSAGING_OPERATION, "ack")
429-
.containsEntry(
430-
SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, subscribeMessageWrappers.size());
432+
.containsEntry(CODE_FUNCTION_ATTR_KEY, "sendAckOperations")
433+
.containsEntry(MESSAGING_OPERATION_ATTR_KEY, "ack")
434+
.containsEntry(MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY, subscribeMessageWrappers.size());
431435

432436
// Check span data, links, and attributes for the nack RPC span
433437
SpanDataAssert nackRpcSpanDataAssert = OpenTelemetryAssertions.assertThat(nackRpcSpanData);
@@ -445,14 +449,13 @@ public void testSubscribeSpansSuccess() {
445449
AttributesAssert nackRpcSpanAttributesAssert =
446450
OpenTelemetryAssertions.assertThat(nackRpcSpanData.getAttributes());
447451
nackRpcSpanAttributesAssert
448-
.containsEntry(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
452+
.containsEntry(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
449453
.containsEntry(
450-
SemanticAttributes.MESSAGING_DESTINATION_NAME, FULL_SUBSCRIPTION_NAME.getSubscription())
454+
MESSAGING_DESTINATION_NAME_ATTR_KEY, FULL_SUBSCRIPTION_NAME.getSubscription())
451455
.containsEntry(PROJECT_ATTR_KEY, FULL_TOPIC_NAME.getProject())
452-
.containsEntry(SemanticAttributes.CODE_FUNCTION, "sendModAckOperations")
453-
.containsEntry(SemanticAttributes.MESSAGING_OPERATION, "nack")
454-
.containsEntry(
455-
SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, subscribeMessageWrappers.size());
456+
.containsEntry(CODE_FUNCTION_ATTR_KEY, "sendModAckOperations")
457+
.containsEntry(MESSAGING_OPERATION_ATTR_KEY, "nack")
458+
.containsEntry(MESSAGING_BATCH_MESSAGE_COUNT_ATTR_KEY, subscribeMessageWrappers.size());
456459

457460
// Check span data, events, links, and attributes for the publisher create span
458461
SpanDataAssert subscriberSpanDataAssert =
@@ -493,18 +496,18 @@ public void testSubscribeSpansSuccess() {
493496
AttributesAssert subscriberSpanAttributesAssert =
494497
OpenTelemetryAssertions.assertThat(subscriberSpanData.getAttributes());
495498
subscriberSpanAttributesAssert
496-
.containsEntry(SemanticAttributes.MESSAGING_SYSTEM, MESSAGING_SYSTEM_VALUE)
499+
.containsEntry(MESSAGING_SYSTEM_ATTR_KEY, MESSAGING_SYSTEM_VALUE)
497500
.containsEntry(
498-
SemanticAttributes.MESSAGING_DESTINATION_NAME, FULL_SUBSCRIPTION_NAME.getSubscription())
501+
MESSAGING_DESTINATION_NAME_ATTR_KEY, FULL_SUBSCRIPTION_NAME.getSubscription())
499502
.containsEntry(PROJECT_ATTR_KEY, PROJECT_NAME)
500-
.containsEntry(SemanticAttributes.CODE_FUNCTION, "onResponse")
503+
.containsEntry(CODE_FUNCTION_ATTR_KEY, "onResponse")
501504
.containsEntry(MESSAGE_SIZE_ATTR_KEY, messageSize)
502505
.containsEntry(ORDERING_KEY_ATTR_KEY, ORDERING_KEY)
503506
.containsEntry(MESSAGE_ACK_ID_ATTR_KEY, ACK_ID)
504507
.containsEntry(MESSAGE_DELIVERY_ATTEMPT_ATTR_KEY, DELIVERY_ATTEMPT)
505508
.containsEntry(MESSAGE_EXACTLY_ONCE_ATTR_KEY, EXACTLY_ONCE_ENABLED)
506509
.containsEntry(MESSAGE_RESULT_ATTR_KEY, PROCESS_ACTION)
507-
.containsEntry(SemanticAttributes.MESSAGING_MESSAGE_ID, MESSAGE_ID);
510+
.containsEntry(MESSAGING_MESSAGE_ID_ATTR_KEY, MESSAGE_ID);
508511
}
509512

510513
@Test

0 commit comments

Comments
 (0)