Address review comment

Author: dao-jun

instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/TransactionImplInstrumentation.java

@@ -10,7 +10,6 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
-import io.opentelemetry.instrumentation.api.internal.Timer;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.pulsar.v2_8.telemetry.PulsarSingletons;
@@ -31,23 +30,17 @@ public void transform(TypeTransformer transformer) {
         named("registerProducedTopic")
             .and(isPublic())
             .and(takesArguments(1))
-            .and(takesArgument(0, named("java.lang.String"))),
+            .and(takesArgument(0, String.class)),
         TransactionImplInstrumentation.class.getName() + "$RegisterProducedTopicAdvice");
   }
 
   @SuppressWarnings("unused")
   public static class RegisterProducedTopicAdvice {
 
-    @Advice.OnMethodEnter
-    public static Timer before() {
-      return Timer.start();
-    }
-
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void after(
-        @Advice.Enter Timer timer,
         @Advice.Return(readOnly = false) CompletableFuture<Void> future) {
-      future = PulsarSingletons.wrap(future, timer);
+      future = PulsarSingletons.wrap(future);
     }
   }
 }

instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java

@@ -53,8 +53,6 @@ public final class PulsarSingletons {
       createConsumerBatchReceiveInstrumenter();
   private static final Instrumenter<PulsarRequest, Void> PRODUCER_INSTRUMENTER =
       createProducerInstrumenter();
-  private static final Instrumenter<String, Void> TXN_PRODUCE_INSTRUMENTER =
-      createTxnProduceInstrumenter();
 
   public static Instrumenter<PulsarRequest, Void> consumerProcessInstrumenter() {
     return CONSUMER_PROCESS_INSTRUMENTER;
@@ -153,22 +151,6 @@ private static Instrumenter<PulsarRequest, Void> createProducerInstrumenter() {
     return builder.buildProducerInstrumenter(MessageTextMapSetter.INSTANCE);
   }
 
-  private static Instrumenter<String, Void> createTxnProduceInstrumenter() {
-    InstrumenterBuilder<String, Void> instrumenterBuilder =
-        Instrumenter.builder(
-            TELEMETRY, INSTRUMENTATION_NAME, request -> "Txn Produce Register Topic");
-    return instrumenterBuilder.buildInstrumenter(SpanKindExtractor.alwaysProducer());
-  }
-
-  public static Context startAndEndTxnProduceRegister(
-      Context parent, Timer timer, Throwable throwable) {
-    if (!TXN_PRODUCE_INSTRUMENTER.shouldStart(parent, "")) {
-      return null;
-    }
-    return InstrumenterUtil.startAndEnd(
-        TXN_PRODUCE_INSTRUMENTER, parent, "", null, throwable, timer.startTime(), timer.now());
-  }
-
   private static <T> AttributesExtractor<T, Void> createMessagingAttributesExtractor(
       MessagingAttributesGetter<T, Void> getter, MessageOperation operation) {
     return MessagingAttributesExtractor.builder(getter, operation)
@@ -228,22 +210,21 @@ private static Context startAndEndConsumerReceive(
         timer.now());
   }
 
-  public static CompletableFuture<Void> wrap(CompletableFuture<Void> future, Timer timer) {
+  public static CompletableFuture<Void> wrap(CompletableFuture<Void> future) {
     Context parent = Context.current();
     CompletableFuture<Void> result = new CompletableFuture<>();
     future.whenComplete(
-        (unused, t) -> {
-          Context context = startAndEndTxnProduceRegister(parent, timer, t);
-          runWithContext(
-              context,
-              () -> {
-                if (t != null) {
-                  result.completeExceptionally(t);
-                } else {
-                  result.complete(null);
-                }
-              });
-        });
+        (unused, t) ->
+            runWithContext(
+                parent,
+                () -> {
+                  if (t != null) {
+                    result.completeExceptionally(t);
+                  } else {
+                    result.complete(null);
+                  }
+                })
+    );
 
     return result;
   }

instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.java

@@ -693,13 +693,9 @@ void testSendMessageWithTxn() throws Exception {
         trace ->
             trace.hasSpansSatisfyingExactly(
                 span -> span.hasName("parent1").hasKind(SpanKind.INTERNAL).hasNoParent(),
-                span ->
-                    span.hasName("Txn Produce Register Topic")
-                        .hasKind(SpanKind.PRODUCER)
-                        .hasParent(trace.getSpan(0)),
                 span ->
                     span.hasName(topic + " publish")
                         .hasKind(SpanKind.PRODUCER)
-                        .hasParent(trace.getSpan(1))));
+                        .hasParent(trace.getSpan(0))));
   }
 }