feedback

Author: trask

instrumentation/executors/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/executors/LambdaContextPropagationTest.java

@@ -40,17 +40,22 @@ void reset() {
   @MethodSource("executorInvocations")
   void propagateContext(ExecutorInvocation invocation) throws Exception {
     ExecutorService executor = Executors.newSingleThreadExecutor();
-
     try {
       Baggage baggage = Baggage.builder().put("test", "test").build();
       try (Scope ignored = baggage.makeCurrent()) {
         for (int i = 0; i < 20; i++) {
           invocation.invoke(executor);
         }
       }
-    } finally {
+
       executor.shutdown();
-      executor.awaitTermination(30, SECONDS);
+      assertThat(executor.awaitTermination(30, SECONDS)).isTrue();
+    } finally {
+      if (!executor.isTerminated()) {
+        // Best-effort cleanup to avoid leaked tasks mutating shared static state in later params.
+        executor.shutdownNow();
+        executor.awaitTermination(30, SECONDS);
+      }
     }
 
     assertThat(failureCounter).hasValue(0);

instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/internal/engine/AttributeExtractorTest.java

@@ -131,9 +131,8 @@ void testSetup() {
   }
 
   @ParameterizedTest
-  @MethodSource("numericAttributeArgs")
-  void testNumericAttributeInfo(
-      String attributeName, boolean usesDoubleValues, Number expectedValue) {
+  @MethodSource("numericAttributeInfoArgs")
+  void testNumericAttributeInfo(String attributeName, boolean usesDoubleValues) {
     BeanAttributeExtractor extractor = BeanAttributeExtractor.fromName(attributeName);
     AttributeInfo info = extractor.getAttributeInfo(theServer, objectName);
 
@@ -142,18 +141,23 @@ void testNumericAttributeInfo(
   }
 
   @ParameterizedTest
-  @MethodSource("numericAttributeArgs")
-  void testNumericAttributeValue(
-      String attributeName, boolean usesDoubleValues, Number expectedValue) {
+  @MethodSource("integralNumericAttributeArgs")
+  void testIntegralNumericAttributeValue(String attributeName, long expectedValue) {
     BeanAttributeExtractor extractor = BeanAttributeExtractor.fromName(attributeName);
     Number number = extractor.extractNumericalAttribute(theServer, objectName);
 
     assertThat(number).isNotNull();
-    if (usesDoubleValues) {
-      assertThat(number.doubleValue()).isEqualTo(expectedValue.doubleValue());
-    } else {
-      assertThat(number.longValue()).isEqualTo(expectedValue.longValue());
-    }
+    assertThat(number.longValue()).isEqualTo(expectedValue);
+  }
+
+  @ParameterizedTest
+  @MethodSource("floatingPointNumericAttributeArgs")
+  void testFloatingPointNumericAttributeValue(String attributeName, double expectedValue) {
+    BeanAttributeExtractor extractor = BeanAttributeExtractor.fromName(attributeName);
+    Number number = extractor.extractNumericalAttribute(theServer, objectName);
+
+    assertThat(number).isNotNull();
+    assertThat(number.doubleValue()).isEqualTo(expectedValue);
   }
 
   @Test
@@ -200,13 +204,25 @@ void testNegativeFilter(String attributeName) {
         .isNull();
   }
 
-  private static Stream<Arguments> numericAttributeArgs() {
+  private static Stream<Arguments> numericAttributeInfoArgs() {
+    return Stream.of(
+        Arguments.of("ByteAttribute", false),
+        Arguments.of("ShortAttribute", false),
+        Arguments.of("IntAttribute", false),
+        Arguments.of("LongAttribute", false),
+        Arguments.of("FloatAttribute", true),
+        Arguments.of("DoubleAttribute", true));
+  }
+
+  private static Stream<Arguments> integralNumericAttributeArgs() {
     return Stream.of(
-        Arguments.of("ByteAttribute", false, 10L),
-        Arguments.of("ShortAttribute", false, 11L),
-        Arguments.of("IntAttribute", false, 12L),
-        Arguments.of("LongAttribute", false, 13L),
-        Arguments.of("FloatAttribute", true, 14.0),
-        Arguments.of("DoubleAttribute", true, 15.0));
+        Arguments.of("ByteAttribute", 10L),
+        Arguments.of("ShortAttribute", 11L),
+        Arguments.of("IntAttribute", 12L),
+        Arguments.of("LongAttribute", 13L));
+  }
+
+  private static Stream<Arguments> floatingPointNumericAttributeArgs() {
+    return Stream.of(Arguments.of("FloatAttribute", 14.0), Arguments.of("DoubleAttribute", 15.0));
   }
 }