address review comments

Author: laurit

docs/supported-libraries.md

@@ -138,7 +138,7 @@ These are the supported libraries and frameworks:
 | [Spring Integration](https://spring.io/projects/spring-integration)                                                                         | 4.1+ (not including 6.0+ yet)      | [opentelemetry-spring-integration-4.1](../instrumentation/spring/spring-integration-4.1/library)                                                                                                                                                                                                                                                                                        | [Messaging Spans]                                                                                                                       |
 | [Spring JMS](https://docs.spring.io/spring-framework/docs/current/reference/html/integration.html#jms)                                      | 2.0+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [Messaging Spans]                                                                                                                       |
 | [Spring Kafka](https://spring.io/projects/spring-kafka)                                                                                     | 2.7+                               | [opentelemetry-spring-kafka-2.7](../instrumentation/spring/spring-kafka-2.7/library)                                                                                                                                                                                                                                                                                                    | [Messaging Spans]                                                                                                                       |
-| [Spring Pulsar](https://spring.io/projects/spring-pulsar)                                                                                   | 1.2+                               |                                                                                                                                                                                                                                                                                                                                                                                         | [Messaging Spans]                                                                                                                       |
+| [Spring Pulsar](https://spring.io/projects/spring-pulsar)                                                                                   | 1.0+                               |                                                                                                                                                                                                                                                                                                                                                                                         | [Messaging Spans]                                                                                                                       |
 | [Spring RabbitMQ](https://spring.io/projects/spring-amqp)                                                                                   | 1.0+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [Messaging Spans]                                                                                                                       |
 | [Spring RestTemplate](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/client/package-summary.html) | 3.1+                               | [opentelemetry-spring-web-3.1](../instrumentation/spring/spring-web/spring-web-3.1/library)                                                                                                                                                                                                                                                                                             | [HTTP Client Spans], [HTTP Client Metrics]                                                                                              |
 | [Spring RMI](https://docs.spring.io/spring-framework/docs/4.0.x/javadoc-api/org/springframework/remoting/rmi/package-summary.html)          | 4.0+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [RPC Client Spans], [RPC Server Spans]                                                                                                  |

instrumentation/spring/spring-pulsar-1.2/javaagent/build.gradle.kts instrumentation/spring/spring-pulsar-1.0/javaagent/build.gradle.kts

@@ -6,19 +6,20 @@ muzzle {
   pass {
     group.set("org.springframework.pulsar")
     module.set("spring-pulsar")
-    versions.set("[1.2.0,)")
+    versions.set("[1.0.0,)")
+    assertInverse.set(true)
+    excludeInstrumentationName("pulsar-2.8")
   }
 }
 
 dependencies {
-  library("org.springframework.pulsar:spring-pulsar:1.2.0")
+  library("org.springframework.pulsar:spring-pulsar:1.0.0")
   implementation(project(":instrumentation:pulsar:pulsar-2.8:javaagent"))
 
   testInstrumentation(project(":instrumentation:pulsar:pulsar-2.8:javaagent"))
 
-  testImplementation(project(":instrumentation:spring:spring-pulsar-1.2:testing"))
+  testImplementation(project(":instrumentation:spring:spring-pulsar-1.0: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")
 }
@@ -29,14 +30,14 @@ testing {
   suites {
     val testReceiveSpansDisabled by registering(JvmTestSuite::class) {
       dependencies {
-        implementation(project(":instrumentation:spring:spring-pulsar-1.2:testing"))
+        implementation(project(":instrumentation:spring:spring-pulsar-1.0:testing"))
 
         if (latestDepTest) {
           implementation("org.springframework.pulsar:spring-pulsar:latest.release")
           implementation("org.springframework.boot:spring-boot-starter-test:latest.release")
           implementation("org.springframework.boot:spring-boot-starter:latest.release")
         } else {
-          implementation("org.springframework.pulsar:spring-pulsar:1.2.0")
+          implementation("org.springframework.pulsar:spring-pulsar:1.0.0")
           implementation("org.springframework.boot:spring-boot-starter-test:3.2.4")
           implementation("org.springframework.boot:spring-boot-starter:3.2.4")
         }

instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/DefaultPulsarMessageListenerContainerInstrumentation.java instrumentation/spring/spring-pulsar-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_0/DefaultPulsarMessageListenerContainerInstrumentation.java

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2;
+package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_0;
 
-import static io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2.SpringPulsarSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_0.SpringPulsarSingletons.instrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@@ -31,7 +31,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         named("dispatchMessageToListener")
-            .and(takesArguments(3))
+            .and(takesArguments(3).or(takesArguments(2)))
             .and(takesArgument(0, named("org.apache.pulsar.client.api.Message"))),
         getClass().getName() + "$DispatchMessageToListenerAdvice");
   }

instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/MessageHeaderGetter.java instrumentation/spring/spring-pulsar-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_0/MessageHeaderGetter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2;
+package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_0;
 
 import io.opentelemetry.context.propagation.TextMapGetter;
 import javax.annotation.Nullable;

instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarInstrumentationModule.java instrumentation/spring/spring-pulsar-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_0/SpringPulsarInstrumentationModule.java

@@ -3,19 +3,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2;
+package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_0;
 
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Collections.singletonList;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.List;
+import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
 public class SpringPulsarInstrumentationModule extends InstrumentationModule {
   public SpringPulsarInstrumentationModule() {
-    super("spring-pulsar", "spring-pulsar-1.2");
+    super("spring-pulsar", "spring-pulsar-1.0");
+  }
+
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    // added in 1.0.0
+    return hasClassesNamed(
+        "org.springframework.pulsar.annotation.PulsarListenerConsumerBuilderCustomizer");
   }
 
   @Override

instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarMessageAttributesGetter.java instrumentation/spring/spring-pulsar-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_0/SpringPulsarMessageAttributesGetter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2;
+package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_0;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;

instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarSingletons.java instrumentation/spring/spring-pulsar-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_0/SpringPulsarSingletons.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2;
+package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_0;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
@@ -18,7 +18,7 @@
 import org.apache.pulsar.client.api.Message;
 
 public final class SpringPulsarSingletons {
-  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-pulsar-1.2";
+  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-pulsar-1.0";
   private static final Instrumenter<Message<?>, Void> INSTRUMENTER;
 
   static {

instrumentation/spring/spring-pulsar-1.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarTest.java instrumentation/spring/spring-pulsar-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_2;
+package io.opentelemetry.javaagent.instrumentation.spring.pulsar.v1_0;
 
 import static io.opentelemetry.api.trace.SpanKind.CONSUMER;
 import static io.opentelemetry.api.trace.SpanKind.PRODUCER;

instrumentation/spring/spring-pulsar-1.2/javaagent/src/testReceiveSpansDisabled/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarSuppressReceiveSpansTest.java instrumentation/spring/spring-pulsar-1.0/javaagent/src/testReceiveSpansDisabled/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_0/SpringPulsarSuppressReceiveSpansTest.java

@@ -6,7 +6,7 @@ dependencies {
   implementation(project(":testing-common"))
   implementation("org.testcontainers:pulsar")
 
-  compileOnly("org.springframework.pulsar:spring-pulsar:1.2.0")
+  compileOnly("org.springframework.pulsar:spring-pulsar:1.0.0")
   compileOnly("org.springframework.boot:spring-boot-starter-test:3.2.4")
   compileOnly("org.springframework.boot:spring-boot-starter:3.2.4")
 }

instrumentation/spring/spring-pulsar-1.2/testing/build.gradle.kts instrumentation/spring/spring-pulsar-1.0/testing/build.gradle.kts

@@ -15,14 +15,14 @@
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
 import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
+import static java.util.Arrays.asList;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.instrumentation.testing.GlobalTraceUtil;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
 import java.time.Duration;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -87,7 +87,7 @@ static void setUp() throws PulsarClientException {
   }
 
   @Test
-  void testSpringPulsar() throws InterruptedException {
+  void testSpringPulsar() throws PulsarClientException, InterruptedException {
     testing.runWithSpan(
         "parent",
         () -> {
@@ -113,7 +113,7 @@ static void teardown() {
       AttributeKey.stringKey("messaging.pulsar.message.type");
 
   protected List<AttributeAssertion> publishAttributes() {
-    return Arrays.asList(
+    return asList(
         equalTo(MESSAGING_SYSTEM, "pulsar"),
         equalTo(MESSAGING_OPERATION, "publish"),
         equalTo(MESSAGING_DESTINATION_NAME, OTEL_TOPIC),
@@ -125,7 +125,7 @@ protected List<AttributeAssertion> publishAttributes() {
   }
 
   protected List<AttributeAssertion> processAttributes() {
-    return Arrays.asList(
+    return asList(
         equalTo(MESSAGING_SYSTEM, "pulsar"),
         equalTo(MESSAGING_OPERATION, "process"),
         satisfies(MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative),
@@ -134,7 +134,7 @@ protected List<AttributeAssertion> processAttributes() {
   }
 
   protected List<AttributeAssertion> receiveAttributes() {
-    return Arrays.asList(
+    return asList(
         equalTo(MESSAGING_SYSTEM, "pulsar"),
         equalTo(MESSAGING_OPERATION, "receive"),
         equalTo(MESSAGING_DESTINATION_NAME, OTEL_TOPIC),

instrumentation/spring/spring-pulsar-1.2/testing/src/main/java/io/opentelemetry/instrumentation/spring/pulsar/v1_0/AbstractSpringPulsarTest.java instrumentation/spring/spring-pulsar-1.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/pulsar/v1_0/AbstractSpringPulsarTest.java

@@ -552,8 +552,8 @@ include(":instrumentation:spring:spring-jms:spring-jms-6.0:javaagent")
 include(":instrumentation:spring:spring-kafka-2.7:javaagent")
 include(":instrumentation:spring:spring-kafka-2.7:library")
 include(":instrumentation:spring:spring-kafka-2.7:testing")
-include(":instrumentation:spring:spring-pulsar-1.2:javaagent")
-include(":instrumentation:spring:spring-pulsar-1.2:testing")
+include(":instrumentation:spring:spring-pulsar-1.0:javaagent")
+include(":instrumentation:spring:spring-pulsar-1.0:testing")
 include(":instrumentation:spring:spring-rabbit-1.0:javaagent")
 include(":instrumentation:spring:spring-rmi-4.0:javaagent")
 include(":instrumentation:spring:spring-scheduling-3.1:bootstrap")