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.

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

[Pulsar] Support Pulsar Client send message with transaction. #12731

Merged
merged 11 commits into from
Nov 19, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
new ProducerImplInstrumentation(),
new MessageInstrumentation(),
new MessageListenerInstrumentation(),
new SendCallbackInstrumentation());
new SendCallbackInstrumentation(),
new TransactionImplInstrumentation());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.pulsar.v2_8;

import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;

import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import io.opentelemetry.javaagent.instrumentation.pulsar.v2_8.telemetry.PulsarSingletons;
import java.util.concurrent.CompletableFuture;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;

public class TransactionImplInstrumentation implements TypeInstrumentation {
@Override
public ElementMatcher<TypeDescription> typeMatcher() {
return named("org.apache.pulsar.client.impl.transaction.TransactionImpl");
}

@Override
public void transform(TypeTransformer transformer) {
transformer.applyAdviceToMethod(
named("registerProducedTopic")
.and(isPublic())
.and(takesArguments(1))
.and(takesArgument(0, String.class)),
TransactionImplInstrumentation.class.getName() + "$RegisterProducedTopicAdvice");
}

@SuppressWarnings("unused")
public static class RegisterProducedTopicAdvice {

@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
public static void after(@Advice.Return(readOnly = false) CompletableFuture<Void> future) {
future = PulsarSingletons.wrap(future);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,24 @@ private static Context startAndEndConsumerReceive(
timer.now());
}

public static CompletableFuture<Void> wrap(CompletableFuture<Void> future) {
Context parent = Context.current();
CompletableFuture<Void> result = new CompletableFuture<>();
future.whenComplete(
(unused, t) ->
runWithContext(
parent,
() -> {
if (t != null) {
result.completeExceptionally(t);
} else {
result.complete(null);
}
}));

return result;
}

public static CompletableFuture<Message<?>> wrap(
CompletableFuture<Message<?>> future, Timer timer, Consumer<?> consumer) {
boolean listenerContextActive = MessageListenerContext.isProcessing();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,17 @@ static void beforeAll() throws PulsarClientException {
new PulsarContainer(DEFAULT_IMAGE_NAME)
.withEnv("PULSAR_MEM", "-Xmx128m")
.withLogConsumer(new Slf4jLogConsumer(logger))
.withStartupTimeout(Duration.ofMinutes(2));
.withStartupTimeout(Duration.ofMinutes(2))
.withTransactions();
pulsar.start();

brokerHost = pulsar.getHost();
brokerPort = pulsar.getMappedPort(6650);
client = PulsarClient.builder().serviceUrl(pulsar.getPulsarBrokerUrl()).build();
client =
PulsarClient.builder()
.serviceUrl(pulsar.getPulsarBrokerUrl())
.enableTransaction(true)
.build();
admin = PulsarAdmin.builder().serviceHttpUrl(pulsar.getHttpServiceUrl()).build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.apache.pulsar.client.api.Messages;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionInitialPosition;
import org.apache.pulsar.client.api.transaction.Transaction;
import org.junit.jupiter.api.Test;

class PulsarClientTest extends AbstractPulsarClientTest {
Expand Down Expand Up @@ -671,4 +672,30 @@ void testConsumePartitionedTopicUsingBatchReceive() throws Exception {
});
}));
}

@Test
void testSendMessageWithTxn() throws Exception {
String topic = "persistent://public/default/testSendMessageWithTxn";
admin.topics().createNonPartitionedTopic(topic);
producer =
client
.newProducer(Schema.STRING)
.topic(topic)
.sendTimeout(0, TimeUnit.SECONDS)
.enableBatching(false)
.create();
Transaction txn =
dao-jun marked this conversation as resolved.
Show resolved Hide resolved
client.newTransaction().withTransactionTimeout(5, TimeUnit.SECONDS).build().get();
dao-jun marked this conversation as resolved.
Show resolved Hide resolved
testing.runWithSpan("parent1", () -> producer.newMessage(txn).value("test1").send());
txn.commit();

testing.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("parent1").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName(topic + " publish")
.hasKind(SpanKind.PRODUCER)
.hasParent(trace.getSpan(0))));
}
}
Loading