瀏覽代碼

Convert external-annotations javagent unit tests from groovy to java (#9582)

Jay DeLuca 1 年之前
父節點
當前提交
6e3f6d2d20

+ 0 - 37
instrumentation/external-annotations/javaagent-unit-tests/src/test/groovy/IncludeTest.groovy

@@ -1,37 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig
-import io.opentelemetry.javaagent.instrumentation.extannotations.ExternalAnnotationInstrumentation
-import spock.lang.Specification
-import spock.lang.Unroll
-
-import static io.opentelemetry.javaagent.instrumentation.extannotations.ExternalAnnotationInstrumentation.DEFAULT_ANNOTATIONS
-
-class IncludeTest extends Specification {
-
-  @Unroll
-  def "test configuration #value"() {
-    setup:
-    InstrumentationConfig config = Mock()
-    config.getString("otel.instrumentation.external-annotations.include") >> value
-
-    expect:
-    ExternalAnnotationInstrumentation.configureAdditionalTraceAnnotations(config) == expected.toSet()
-
-    where:
-    value                               | expected
-    null                                | DEFAULT_ANNOTATIONS.toList()
-    " "                                 | []
-    "some.Invalid[]"                    | []
-    "some.package.ClassName "           | ["some.package.ClassName"]
-    " some.package.Class\$Name"         | ["some.package.Class\$Name"]
-    "  ClassName  "                     | ["ClassName"]
-    "ClassName"                         | ["ClassName"]
-    "Class\$1;Class\$2;"                | ["Class\$1", "Class\$2"]
-    "Duplicate ;Duplicate ;Duplicate; " | ["Duplicate"]
-  }
-
-}

+ 53 - 0
instrumentation/external-annotations/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/IncludeTest.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.extannotations;
+
+import static io.opentelemetry.javaagent.instrumentation.extannotations.ExternalAnnotationInstrumentation.DEFAULT_ANNOTATIONS;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class IncludeTest {
+
+  @Mock InstrumentationConfig config;
+
+  @ParameterizedTest
+  @MethodSource("provideArguments")
+  void testConfiguration(String value, List<String> expected) {
+    when(config.getString("otel.instrumentation.external-annotations.include")).thenReturn(value);
+
+    assertThat(ExternalAnnotationInstrumentation.configureAdditionalTraceAnnotations(config))
+        .isEqualTo(new HashSet<>(expected));
+  }
+
+  private static Stream<Arguments> provideArguments() {
+    return Stream.of(
+        Arguments.of(null, DEFAULT_ANNOTATIONS),
+        Arguments.of(" ", Collections.emptyList()),
+        Arguments.of("some.Invalid[]", Collections.emptyList()),
+        Arguments.of(
+            "some.package.ClassName ", Collections.singletonList("some.package.ClassName")),
+        Arguments.of(
+            " some.package.Class$Name", Collections.singletonList("some.package.Class$Name")),
+        Arguments.of("  ClassName  ", Collections.singletonList("ClassName")),
+        Arguments.of("ClassName", Collections.singletonList("ClassName")),
+        Arguments.of("Class$1;Class$2", Arrays.asList("Class$1", "Class$2")),
+        Arguments.of("Duplicate ;Duplicate ;Duplicate; ", Collections.singletonList("Duplicate")));
+  }
+}

+ 4 - 2
instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationInstrumentation.java

@@ -52,7 +52,8 @@ public class ExternalAnnotationInstrumentation implements TypeInstrumentation {
           + PACKAGE_CLASS_NAME_REGEX
           + "\\s*;?\\s*";
 
-  private static final List<String> DEFAULT_ANNOTATIONS =
+  // visible for testing
+  static final List<String> DEFAULT_ANNOTATIONS =
       Arrays.asList(
           "com.appoptics.api.ext.LogMethod",
           "com.newrelic.api.agent.Trace",
@@ -111,7 +112,8 @@ public class ExternalAnnotationInstrumentation implements TypeInstrumentation {
         ExternalAnnotationInstrumentation.class.getName() + "$ExternalAnnotationAdvice");
   }
 
-  private static Set<String> configureAdditionalTraceAnnotations(InstrumentationConfig config) {
+  // visible for testing
+  static Set<String> configureAdditionalTraceAnnotations(InstrumentationConfig config) {
     String configString = config.getString(TRACE_ANNOTATIONS_CONFIG);
     if (configString == null) {
       return Collections.unmodifiableSet(new HashSet<>(DEFAULT_ANNOTATIONS));