Fix issues in round1

CodePrometheus · CodePrometheus · commit d0f804c1e0c3 · 2025-03-01T21:20:18.000+08:00
diff --git a/.fossa.yml b/.fossa.yml
@@ -894,7 +894,7 @@ targets:
       target: ':instrumentation:spring:spring-kafka-2.7:library'
     - type: gradle
       path: ./
-      target: ':instrumentation:spring:spring-pulsar-1.0:javaagent'
+      target: ':instrumentation:spring:spring-pulsar-1.2:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:spring:spring-rabbit-1.0:javaagent'
diff --git a/instrumentation/spring/spring-pulsar-1.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-pulsar-1.0/javaagent/build.gradle.kts
diff --git a/instrumentation/spring/spring-pulsar-1.2/javaagent/build.gradle.kts b/instrumentation/spring/spring-pulsar-1.2/javaagent/build.gradle.kts
@@ -0,0 +1,52 @@
+plugins {
+  id("otel.javaagent-instrumentation")
+}
+
+muzzle {
+  pass {
+    group.set("org.springframework.pulsar")
+    module.set("spring-pulsar")
+    versions.set("[1.2.0,]")
+  }
+}
+
+dependencies {
+  library("org.springframework.pulsar:spring-pulsar:1.2.0")
+
+  testInstrumentation(project(":instrumentation:pulsar:pulsar-2.8:javaagent"))
+  testImplementation(project(":instrumentation:spring:spring-pulsar-1.2:testing"))
+  testLibrary("org.springframework.pulsar:spring-pulsar:1.2.0")
+
+  testLibrary("org.springframework.boot:spring-boot-starter-test:3.2.4")
+  testLibrary("org.springframework.boot:spring-boot-starter:3.2.4")
+}
+
+testing {
+  suites {
+    val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":instrumentation:spring:spring-pulsar-1.2:testing"))
+        implementation("org.springframework.pulsar:spring-pulsar:1.2.0")
+        implementation("org.springframework.boot:spring-boot-starter-test:3.2.4")
+        implementation("org.springframework.boot:spring-boot-starter:3.2.4")
+      }
+    }
+  }
+}
+
+tasks {
+  withType<Test>().configureEach {
+    jvmArgs("-Dotel.instrumentation.pulsar.experimental-span-attributes=true")
+    jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
+    usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+  }
+
+  check {
+    dependsOn(testing.suites)
+  }
+}
+
+// spring 6 requires java 17
+otelJava {
+  minJavaVersionSupported.set(JavaVersion.VERSION_17)
+}
diff --git a/instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/DefaultPulsarMessageListenerContainerInstrumentation.java b/instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/DefaultPulsarMessageListenerContainerInstrumentation.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_0;
+package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2;
 
-import static io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_0.SpringPulsarSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2.SpringPulsarSingletons.instrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
diff --git a/instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/MessageHeaderGetter.java b/instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/MessageHeaderGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_0;
+package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2;
 
 import io.opentelemetry.context.propagation.TextMapGetter;
 import javax.annotation.Nullable;
diff --git a/instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarInstrumentationModule.java b/instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarInstrumentationModule.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_0;
+package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2;
 
 import static java.util.Collections.singletonList;
 
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class SpringPulsarInstrumentationModule extends InstrumentationModule {
   public SpringPulsarInstrumentationModule() {
-    super("spring-pulsar", "spring-pulsar-1.0");
+    super("spring-pulsar", "spring-pulsar-1.2");
   }
 
   @Override
diff --git a/instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarMessageAttributesGetter.java b/instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarMessageAttributesGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_0;
+package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
diff --git a/instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarSingletons.java b/instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarSingletons.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_0;
+package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessageOperation;
@@ -14,7 +14,7 @@
 import org.apache.pulsar.client.api.Message;
 
 public final class SpringPulsarSingletons {
-  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-pulsar-1.0";
+  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-pulsar-1.2";
   private static final Instrumenter<Message<?>, Void> INSTRUMENTER;
 
   static {
diff --git a/instrumentation/spring/spring-pulsar-1.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarTest.java b/instrumentation/spring/spring-pulsar-1.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2;
+
+import static io.opentelemetry.api.trace.SpanKind.CONSUMER;
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL;
+import static io.opentelemetry.api.trace.SpanKind.PRODUCER;
+import static io.opentelemetry.instrumentation.testing.util.TelemetryDataUtil.orderByRootSpanKind;
+
+import io.opentelemetry.instrumentation.spring.pulsar.v1_0.AbstractSpringPulsarTest;
+
+class SpringPulsarTest extends AbstractSpringPulsarTest {
+
+  @Override
+  protected void assertSpringPulsar() {
+    testing.waitAndAssertSortedTraces(
+        orderByRootSpanKind(INTERNAL, CONSUMER),
+        trace ->
+            trace.hasSpansSatisfyingExactly(
+                span -> span.hasName("parent").hasNoParent(),
+                span ->
+                    span.hasName(OTEL_TOPIC + " publish")
+                        .hasKind(PRODUCER)
+                        .hasParent(trace.getSpan(0))
+                        .hasAttributesSatisfyingExactly(publishAttributes()),
+                span ->
+                    span.hasName(String.format("%s process", OTEL_TOPIC))
+                        .hasKind(CONSUMER)
+                        .hasParent(trace.getSpan(1))
+                        .hasAttributesSatisfyingExactly(processAttributes()),
+                span -> span.hasName("consumer").hasParent(trace.getSpan(2))),
+        trace ->
+            trace.hasSpansSatisfyingExactly(
+                span ->
+                    span.hasName(String.format("%s receive", OTEL_TOPIC))
+                        .hasKind(CONSUMER)
+                        .hasNoParent()
+                        .hasAttributesSatisfyingExactly(receiveAttributes())));
+  }
+}
diff --git a/instrumentation/spring/spring-pulsar-1.2/javaagent/src/testReceiveSpansDisabled/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarSuppressReceiveSpansTest.java b/instrumentation/spring/spring-pulsar-1.2/javaagent/src/testReceiveSpansDisabled/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarSuppressReceiveSpansTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2;
+
+import static io.opentelemetry.api.trace.SpanKind.CONSUMER;
+import static io.opentelemetry.api.trace.SpanKind.PRODUCER;
+
+import io.opentelemetry.instrumentation.spring.pulsar.v1_0.AbstractSpringPulsarTest;
+
+class SpringPulsarSuppressReceiveSpansTest extends AbstractSpringPulsarTest {
+
+  @Override
+  protected void assertSpringPulsar() {
+    testing.waitAndAssertTraces(
+        trace ->
+            trace.hasSpansSatisfyingExactly(
+                span -> span.hasName("parent").hasNoParent(),
+                span ->
+                    span.hasName(OTEL_TOPIC + " publish")
+                        .hasKind(PRODUCER)
+                        .hasParent(trace.getSpan(0))
+                        .hasAttributesSatisfyingExactly(publishAttributes()),
+                span ->
+                    span.hasName(String.format("%s process", OTEL_TOPIC))
+                        .hasKind(CONSUMER)
+                        .hasParent(trace.getSpan(1))
+                        .hasTotalRecordedLinks(0)
+                        .hasAttributesSatisfyingExactly(processAttributes()),
+                span -> span.hasName("consumer").hasParent(trace.getSpan(2))),
+        trace ->
+            trace.hasSpansSatisfyingExactly(
+                span -> span.hasName(String.format("%s receive", OTEL_TOPIC)).hasKind(CONSUMER)));
+  }
+}
diff --git a/instrumentation/spring/spring-pulsar-1.2/testing/build.gradle.kts b/instrumentation/spring/spring-pulsar-1.2/testing/build.gradle.kts
@@ -0,0 +1,12 @@
+plugins {
+  id("otel.java-conventions")
+}
+
+dependencies {
+  implementation(project(":testing-common"))
+  implementation("org.testcontainers:pulsar")
+
+  compileOnly("org.springframework.pulsar:spring-pulsar:1.2.0")
+  compileOnly("org.springframework.boot:spring-boot-starter-test:3.2.4")
+  compileOnly("org.springframework.boot:spring-boot-starter:3.2.4")
+}
diff --git a/instrumentation/spring/spring-pulsar-1.2/testing/src/main/java/io/opentelemetry/instrumentation/spring/pulsar/v1_0/AbstractSpringPulsarTest.java b/instrumentation/spring/spring-pulsar-1.2/testing/src/main/java/io/opentelemetry/instrumentation/spring/pulsar/v1_0/AbstractSpringPulsarTest.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
