fix

Author: laurit

instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/AbstractJms1Test.java

@@ -318,7 +318,7 @@ private static Stream<Arguments> emptyReceiveArguments() {
         arguments(queue, receiveNoWait));
   }
 
-  private static Stream<Arguments> destinationArguments() {
+  protected static Stream<Arguments> destinationArguments() {
     DestinationFactory topic = session -> session.createTopic("someTopic");
     DestinationFactory queue = session -> session.createQueue("someQueue");
     DestinationFactory tempTopic = Session::createTemporaryTopic;

instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1InstrumentationTest.java

@@ -23,13 +23,13 @@
 import javax.jms.MessageProducer;
 import javax.jms.TextMessage;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ArgumentsSource;
+import org.junit.jupiter.params.provider.MethodSource;
 
 class Jms1InstrumentationTest extends AbstractJms1Test {
 
   @SuppressWarnings("deprecation") // using deprecated semconv
-  @ArgumentsSource(DestinationsProvider.class)
   @ParameterizedTest
+  @MethodSource("destinationArguments")
   void testMessageConsumer(
       DestinationFactory destinationFactory, String destinationName, boolean isTemporary)
       throws JMSException {

instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1SuppressReceiveSpansTest.java

@@ -20,13 +20,13 @@
 import javax.jms.MessageProducer;
 import javax.jms.TextMessage;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ArgumentsSource;
+import org.junit.jupiter.params.provider.MethodSource;
 
 class Jms1SuppressReceiveSpansTest extends AbstractJms1Test {
 
   @SuppressWarnings("deprecation") // using deprecated semconv
-  @ArgumentsSource(DestinationsProvider.class)
   @ParameterizedTest
+  @MethodSource("destinationArguments")
   void testMessageConsumer(
       DestinationFactory destinationFactory, String destinationName, boolean isTemporary)
       throws JMSException {

instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java

@@ -24,13 +24,13 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ArgumentsSource;
+import org.junit.jupiter.params.provider.MethodSource;
 
 class Jms3InstrumentationTest extends AbstractJms3Test {
 
   @SuppressWarnings("deprecation") // using deprecated semconv
-  @ArgumentsSource(DestinationsProvider.class)
   @ParameterizedTest
+  @MethodSource("destinationArguments")
   void testMessageConsumer(DestinationFactory destinationFactory, boolean isTemporary)
       throws JMSException {
 

instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3SuppressReceiveSpansTest.java

@@ -21,13 +21,13 @@
 import jakarta.jms.TextMessage;
 import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ArgumentsSource;
+import org.junit.jupiter.params.provider.MethodSource;
 
 class Jms3SuppressReceiveSpansTest extends AbstractJms3Test {
 
   @SuppressWarnings("deprecation") // using deprecated semconv
-  @ArgumentsSource(DestinationsProvider.class)
   @ParameterizedTest
+  @MethodSource("destinationArguments")
   void testMessageConsumer(DestinationFactory destinationFactory, boolean isTemporary)
       throws JMSException {
 

instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java

@@ -29,7 +29,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.assertj.core.api.AbstractStringAssert;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ArgumentsSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.jms.core.JmsTemplate;
@@ -82,8 +82,8 @@ void assertSpringJmsListener() {
                 span -> span.hasName("consumer").hasParent(trace.getSpan(1))));
   }
 
-  @ArgumentsSource(ConfigClasses.class)
   @ParameterizedTest
+  @ValueSource(classes = {AnnotatedListenerConfig.class, ManualListenerConfig.class})
   @SuppressWarnings("unchecked")
   void shouldCaptureHeaders(Class<?> configClass)
       throws ExecutionException, InterruptedException, TimeoutException {