convert disabled config test

Author: zeitlinger

smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SdkDisabledSmokeTest.groovy

@@ -5,23 +5,22 @@
 
 package io.opentelemetry.smoketest;
 
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
+
 import io.opentelemetry.sdk.testing.assertj.TracesAssert;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.semconv.ServiceAttributes;
 import io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes;
 import io.opentelemetry.semconv.incubating.HostIncubatingAttributes;
 import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes;
 import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes;
-import org.junit.jupiter.api.condition.DisabledIf;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
-
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
+import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 @DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
 class DeclarativeConfigurationSmokeTest extends JavaSmokeTest {

smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java

@@ -8,9 +8,11 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static java.util.stream.Collectors.toSet;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.instrumentation.testing.junit.MetricsAssert;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
+import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.testing.assertj.MetricAssert;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.smoketest.windows.WindowsTestContainerManager;
@@ -132,17 +134,22 @@ protected List<SpanData> waitForTraces() {
   @SuppressWarnings("varargs")
   protected final void waitAndAssertMetrics(
       String instrumentationName, Consumer<MetricAssert>... assertions) {
-    MetricsAssert.waitAndAssertMetrics(
-        () -> telemetryRetriever.waitForMetrics(), instrumentationName, assertions);
+    MetricsAssert.waitAndAssertMetrics(() -> waitForMetrics(), instrumentationName, assertions);
+  }
+
+  protected List<MetricData> waitForMetrics() {
+    return telemetryRetriever.waitForMetrics();
   }
 
   protected Collection<LogRecordData> waitForLogs() {
     return telemetryRetriever.waitForLogs();
   }
 
-  protected static boolean isVersionLogged(Consumer<OutputFrame> output, String version) {
-    return logLines(output)
-        .anyMatch(l -> l.contains("opentelemetry-javaagent - version: " + version));
+  protected static void assertVersionLogged(Consumer<OutputFrame> output, String version) {
+    assertThat(
+            logLines(output)
+                .anyMatch(l -> l.contains("opentelemetry-javaagent - version: " + version)))
+        .isTrue();
   }
 
   private static Stream<String> logLines(Consumer<OutputFrame> output) {

smoke-tests/src/test/java/io/opentelemetry/smoketest/JavaSmokeTest.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.smoketest;
+
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
+
+import java.util.Map;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+@DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
+class SdkDisabledSmokeTest extends JavaSmokeTest {
+  @Override
+  protected String getTargetImage(String jdk) {
+    return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
+        + jdk
+        + "-20211213.1570880324";
+  }
+
+  @Override
+  protected Map<String, String> getExtraEnv() {
+    return Map.of("OTEL_SDK_DISABLED", "true");
+  }
+
+  @ParameterizedTest
+  @ValueSource(ints = {8, 11, 17})
+  void noopSdkSmokeTest(int jdk) throws Exception {
+    runTarget(
+        jdk,
+        output -> {
+          String currentAgentVersion =
+              new JarFile(agentPath)
+                  .getManifest()
+                  .getMainAttributes()
+                  .get(Attributes.Name.IMPLEMENTATION_VERSION)
+                  .toString();
+
+          assertThat(client().get("/greeting").aggregate().join().contentUtf8()).isEqualTo("Hi!");
+          assertThat(waitForTraces()).isEmpty();
+          assertVersionLogged(output, currentAgentVersion);
+          assertThat(waitForTraces()).isEmpty();
+        });
+  }
+}

smoke-tests/src/test/java/io/opentelemetry/smoketest/SdkDisabledSmokeTest.java

@@ -104,7 +104,7 @@ void springBootSmokeTest(int jdk) throws Exception {
                           span -> span.hasName("WebController.withSpan")));
 
           // Check agent version is logged on startup
-          assertThat(isVersionLogged(output, currentAgentVersion)).isTrue();
+          assertVersionLogged(output, currentAgentVersion);
 
           // Check trace IDs are logged via MDC instrumentation
           Set<String> loggedTraceIds = getLoggedTraceIds(output);

smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java

@@ -5,12 +5,11 @@
 
 package io.opentelemetry.instrumentation.testing.junit;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.testing.assertj.MetricAssert;
-import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Consumer;
@@ -39,8 +38,7 @@ public static void assertMetrics(
       assertThat(metrics)
           .describedAs(
               "Metrics for instrumentation %s and assertion %d", instrumentationName, index)
-          .anySatisfy(
-              metric -> assertions[index].accept(OpenTelemetryAssertions.assertThat(metric)));
+          .anySatisfy(metric -> assertions[index].accept(assertThat(metric)));
     }
   }