Skip to content

[fix][client] Fix incorrect topic in OTel spans for partitioned producers #25896

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

Open
void-ptr974 wants to merge 1 commit into
base: master
Choose a base branch
from
+49 −5
Open

[fix][client] Fix incorrect topic in OTel spans for partitioned producers #25896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 47 additions & 0 deletions ...r/src/test/java/org/apache/pulsar/broker/service/OpenTelemetryTracingIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.MessageRoutingMode;
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.Schema;
Expand Down Expand Up @@ -161,6 +162,52 @@ public void testBasicProducerConsumerTracing() throws Exception {
"acknowledge");
}

@Test
public void testPartitionedProducerSpanUsesCurrentProducerTopic() throws Exception {
String topic = "persistent://prop/ns-abc/test-partitioned-producer-tracing";
String partition0 = topic + "-partition-0";
String partition1 = topic + "-partition-1";
spanExporter.reset();

admin.topics().createPartitionedTopic(topic, 2);

PulsarClient client = PulsarClient.builder()
.serviceUrl(pulsar.getBrokerServiceUrl())
.openTelemetry(openTelemetry)
.enableTracing(true)
.build();

Producer<String> producer = client.newProducer(Schema.STRING)
.topic(topic)
.messageRoutingMode(MessageRoutingMode.RoundRobinPartition)
.enableBatching(false)
.create();

producer.send("message-0");
producer.send("message-1");

producer.close();
client.close();

flushSpans();

List<SpanData> spans = spanExporter.getFinishedSpanItems();
List<SpanData> producerSpans = spans.stream()
.filter(s -> s.getKind() == SpanKind.PRODUCER)
.collect(java.util.stream.Collectors.toList());
Set<String> producerSpanTopics = producerSpans.stream()
.map(s -> s.getAttributes().get(
io.opentelemetry.api.common.AttributeKey.stringKey("messaging.destination.name")))
.collect(java.util.stream.Collectors.toSet());
Set<String> producerSpanNames = producerSpans.stream()
.map(SpanData::getName)
.collect(java.util.stream.Collectors.toSet());

assertEquals(producerSpans.size(), 2);
assertEquals(producerSpanTopics, Set.of(partition0, partition1));
assertEquals(producerSpanNames, Set.of("send " + partition0, "send " + partition1));
}

@Test
public void testContextPropagationViaMessageProperties() throws Exception {
String topic = "persistent://prop/ns-abc/test-context-propagation";
Expand Down
7 changes: 2 additions & 5 deletions ...src/main/java/org/apache/pulsar/client/impl/tracing/OpenTelemetryProducerInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public class OpenTelemetryProducerInterceptor implements ProducerInterceptor {

private final Tracer tracer;
private final TextMapPropagator propagator;
private String topic;

public OpenTelemetryProducerInterceptor(InstrumentProvider instrumentProvider) {
this.tracer = instrumentProvider.getTracer();
Expand All @@ -70,9 +69,7 @@ public Message<?> beforeSend(Producer<?> producer, Message<?> message) {
}

try {
if (topic == null) {
topic = producer.getTopic();
}
String topic = producer.getTopic();

// Create a span for this message publication
// The span will be linked to the current context, which may have been set by:
Expand Down Expand Up @@ -121,4 +118,4 @@ public void onSendAcknowledgement(Producer<?> producer, Message<?> message, Mess
}
}
}
}
}