Add (more) Spring JMS support (open-telemetry#6308)

* Add (more) Spring JMS support

* Remove duplication

* Better advice matcher

instrumentation/jms-1.1/javaagent/build.gradle.kts

@@ -18,37 +18,20 @@ muzzle {
 
 testSets {
   create("jms2Test")
-  create("jms2TestReceiveSpansDisabled") {
-    extendsFrom("jms2Test")
-  }
 }
 
 tasks {
-  val testReceiveSpansDisabled by registering(Test::class) {
-    filter {
-      includeTestsMatching("SpringListenerJms1SuppressReceiveSpansTest")
-    }
-    include("**/SpringListenerJms1SuppressReceiveSpansTest.*")
-  }
-
   val jms2Test by existing(Test::class) {
     jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
   }
 
-  val jms2TestReceiveSpansDisabled by existing
-
   test {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
-    filter {
-      excludeTestsMatching("SpringListenerJms1SuppressReceiveSpansTest")
-    }
     jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
   }
 
   check {
-    dependsOn(testReceiveSpansDisabled)
     dependsOn(jms2Test)
-    dependsOn(jms2TestReceiveSpansDisabled)
   }
 }
 
@@ -60,18 +43,11 @@ dependencies {
 
   compileOnly("javax.jms:jms-api:1.1-rev-1")
 
-  testImplementation("javax.annotation:javax.annotation-api:1.3.2")
-  testImplementation("org.springframework.boot:spring-boot-starter-activemq:${versions["org.springframework.boot"]}")
-  testImplementation("org.springframework.boot:spring-boot-starter-test:${versions["org.springframework.boot"]}") {
-    exclude("org.junit.vintage", "junit-vintage-engine")
-  }
+  testImplementation("org.apache.activemq:activemq-client:5.16.5")
 
   add("jms2TestImplementation", "org.hornetq:hornetq-jms-client:2.4.7.Final")
   add("jms2TestImplementation", "org.hornetq:hornetq-jms-server:2.4.7.Final") {
     // this doesn't exist in maven central, and doesn't seem to be needed anyways
     exclude("org.jboss.naming", "jnpserver")
   }
-
-  // this is just to avoid a bit more copy-pasting
-  add("jms2TestReceiveSpansDisabledImplementation", sourceSets["jms2Test"].output)
 }

instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageAttributesGetter.java

@@ -12,7 +12,8 @@
 import javax.annotation.Nullable;
 import javax.jms.JMSException;
 
-enum JmsMessageAttributesGetter implements MessagingAttributesGetter<MessageWithDestination, Void> {
+public enum JmsMessageAttributesGetter
+    implements MessagingAttributesGetter<MessageWithDestination, Void> {
   INSTANCE;
 
   private static final Logger logger = Logger.getLogger(JmsMessageAttributesGetter.class.getName());

instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessagePropertyGetter.java

@@ -9,7 +9,7 @@
 import java.util.Collections;
 import javax.jms.JMSException;
 
-enum MessagePropertyGetter implements TextMapGetter<MessageWithDestination> {
+public enum MessagePropertyGetter implements TextMapGetter<MessageWithDestination> {
   INSTANCE;
 
   @Override