Remove collector from smoke tests (#4186)

open-telemetry · Sep 29, 2021 · 84bc413 · 84bc413
1 parent 5684d39
commit 84bc413
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 331 deletions.
diff --git a/.github/workflows/pr-smoke-test-fake-backend-images.yml b/.github/workflows/pr-smoke-test-fake-backend-images.yml
@@ -67,5 +67,5 @@ jobs:
           key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('smoke-tests/fake-backend/gradle/wrapper/gradle-wrapper.properties') }}
 
       - name: Build Docker Image
-        run: ./gradlew windowsBackendImageBuild windowsCollectorImageBuild
+        run: ./gradlew windowsBackendImageBuild
         working-directory: smoke-tests/fake-backend
diff --git a/examples/distro/custom/src/main/java/com/example/javaagent/DemoPropertySource.java b/examples/distro/custom/src/main/java/com/example/javaagent/DemoPropertySource.java
@@ -14,7 +14,7 @@ public class DemoPropertySource implements ConfigPropertySource {
   @Override
   public Map<String, String> getProperties() {
     return Map.of(
-        "otel.exporter.otlp.endpoint", "http://collector:4317",
+        "otel.exporter.otlp.endpoint", "http://backend:8080",
         "otel.exporter.otlp.insecure", "true",
         "otel.config.max.attrs", "16");
   }

diff --git a/examples/distro/settings.gradle b/examples/distro/settings.gradle
@@ -1,8 +1,7 @@
-rootProject.name = 'opentelemetry-java-instrumentation-demo'
+rootProject.name = 'opentelemetry-java-instrumentation-distro-demo'
 
 include "agent"
 include "custom"
 include "instrumentation"
 include "instrumentation:servlet-3"
 include "smoke-tests"
-
diff --git a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java
@@ -47,7 +47,6 @@ protected Map<String, String> getExtraEnv() {
   }
 
   private static GenericContainer backend;
-  private static GenericContainer collector;
 
   @BeforeAll
   static void setupSpec() {
@@ -60,17 +59,6 @@ static void setupSpec() {
             .withNetworkAliases("backend")
             .withLogConsumer(new Slf4jLogConsumer(logger));
     backend.start();
-
-    collector =
-        new GenericContainer<>("otel/opentelemetry-collector-contrib:latest")
-            .dependsOn(backend)
-            .withNetwork(network)
-            .withNetworkAliases("collector")
-            .withLogConsumer(new Slf4jLogConsumer(logger))
-            .withCopyFileToContainer(
-                MountableFile.forClasspathResource("/otel.yaml"), "/etc/otel.yaml")
-            .withCommand("--config /etc/otel.yaml");
-    collector.start();
   }
 
   protected GenericContainer target;
@@ -109,7 +97,6 @@ void stopTarget() {
   @AfterAll
   static void cleanupSpec() {
     backend.stop();
-    collector.stop();
   }
 
   protected static int countResourcesByValue(

diff --git a/examples/distro/smoke-tests/src/test/resources/otel.yaml b/examples/distro/smoke-tests/src/test/resources/otel.yaml
diff --git a/examples/extension/src/main/java/com/example/javaagent/DemoPropertySource.java b/examples/extension/src/main/java/com/example/javaagent/DemoPropertySource.java
@@ -16,7 +16,7 @@ public class DemoPropertySource implements ConfigPropertySource {
   @Override
   public Map<String, String> getProperties() {
     return Map.of(
-        "otel.exporter.otlp.endpoint", "http://collector:4317",
+        "otel.exporter.otlp.endpoint", "http://backend:8080",
         "otel.exporter.otlp.insecure", "true",
         "otel.config.max.attrs", "16");
   }

diff --git a/examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java b/examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java
@@ -52,7 +52,6 @@ protected Map<String, String> getExtraEnv() {
   }
 
   private static GenericContainer backend;
-  private static GenericContainer collector;
 
   @BeforeAll
   static void setupSpec() {
@@ -65,17 +64,6 @@ static void setupSpec() {
             .withNetworkAliases("backend")
             .withLogConsumer(new Slf4jLogConsumer(logger));
     backend.start();
-
-    collector =
-        new GenericContainer<>("otel/opentelemetry-collector-contrib:latest")
-            .dependsOn(backend)
-            .withNetwork(network)
-            .withNetworkAliases("collector")
-            .withLogConsumer(new Slf4jLogConsumer(logger))
-            .withCopyFileToContainer(
-                MountableFile.forClasspathResource("/otel.yaml"), "/etc/otel.yaml")
-            .withCommand("--config /etc/otel.yaml");
-    collector.start();
   }
 
   protected GenericContainer<?> target;
@@ -136,7 +124,6 @@ void stopTarget() {
   @AfterAll
   static void cleanupSpec() {
     backend.stop();
-    collector.stop();
   }
 
   protected static int countResourcesByValue(

diff --git a/examples/extension/src/test/resources/otel.yaml b/examples/extension/src/test/resources/otel.yaml
diff --git a/smoke-tests/fake-backend/build.gradle b/smoke-tests/fake-backend/build.gradle
@@ -62,40 +62,9 @@ task windowsBackendImageBuild(type: DockerBuildImage) {
   it.dockerFile = new File(backendDockerBuildDir, "windows.dockerfile")
 }
 
-def collectorDockerBuildDir = new File(project.buildDir, "docker-collector")
-
-task windowsCollectorBinaryDownload(type: Download) {
-  doFirst {
-    collectorDockerBuildDir.mkdirs()
-  }
-
-  // TODO (trask) update this to point to new opentelemetry-collector-releases repo
-  //   this involves making two further changes:
-  //     * all the artifacts in the new repo now have version in their name (so no single url for "latest")
-  //     * the artifacts are now tar.gz format, so need to extract the exe
-  //   note: version is hardcoded below because that is last version in the collector repo that has the releases attached
-  src("https://github.com/open-telemetry/opentelemetry-collector/releases/download/v0.33.0/otelcol_windows_amd64.exe")
-  dest(collectorDockerBuildDir)
-}
-
-task windowsCollectorImagePrepare(type: Copy) {
-  dependsOn(windowsCollectorBinaryDownload)
-  into(collectorDockerBuildDir)
-  from("src/docker/collector")
-}
-
-task windowsCollectorImageBuild(type: DockerBuildImage) {
-  dependsOn(windowsCollectorImagePrepare)
-  inputDir = collectorDockerBuildDir
-
-  it.images.add "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-collector-windows:$extraTag"
-  it.dockerFile = new File(collectorDockerBuildDir, "windows.dockerfile")
-}
-
 tasks.create("dockerPush", DockerPushImage) {
   group = "publishing"
   description = "Push all Docker images for the test backend"
-  dependsOn(windowsBackendImageBuild, windowsCollectorImageBuild)
-  images.set(["ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:$extraTag",
-              "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-collector-windows:$extraTag"])
+  dependsOn(windowsBackendImageBuild)
+  images.set(["ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:$extraTag"])
 }
diff --git a/smoke-tests/fake-backend/src/docker/collector/windows.dockerfile b/smoke-tests/fake-backend/src/docker/collector/windows.dockerfile
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerExporterSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerExporterSmokeTest.groovy
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/ZipkinExporterSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/ZipkinExporterSmokeTest.groovy
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/AbstractTestContainerManager.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/AbstractTestContainerManager.java
@@ -13,7 +13,6 @@ public abstract class AbstractTestContainerManager implements TestContainerManag
   protected static final int BACKEND_PORT = 8080;
 
   protected static final String BACKEND_ALIAS = "backend";
-  protected static final String COLLECTOR_ALIAS = "collector";
   protected static final String TARGET_AGENT_FILENAME = "opentelemetry-javaagent.jar";
   protected static final String COLLECTOR_CONFIG_RESOURCE = "/otel.yaml";
 
@@ -28,7 +27,7 @@ protected Map<String, String> getAgentEnvironment(String jvmArgsEnvVarName) {
     environment.put("OTEL_BSP_MAX_EXPORT_BATCH_SIZE", "1");
     environment.put("OTEL_BSP_SCHEDULE_DELAY", "10ms");
     environment.put("OTEL_IMR_EXPORT_INTERVAL", "1000");
-    environment.put("OTEL_EXPORTER_OTLP_ENDPOINT", "http://" + COLLECTOR_ALIAS + ":4317");
+    environment.put("OTEL_EXPORTER_OTLP_ENDPOINT", "http://" + BACKEND_ALIAS + ":8080");
     environment.put("OTEL_RESOURCE_ATTRIBUTES", "service.name=smoke-test");
     environment.put("OTEL_JAVAAGENT_DEBUG", "true");
     return environment;

diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java
@@ -22,12 +22,10 @@
 
 public class LinuxTestContainerManager extends AbstractTestContainerManager {
   private static final Logger logger = LoggerFactory.getLogger(LinuxTestContainerManager.class);
-  private static final Logger collectorLogger = LoggerFactory.getLogger("Collector");
   private static final Logger backendLogger = LoggerFactory.getLogger("Backend");
 
   private final Network network = Network.newNetwork();
   private GenericContainer<?> backend = null;
-  private GenericContainer<?> collector = null;
   private GenericContainer<?> target = null;
 
   @Override
@@ -42,17 +40,6 @@ protected void startEnvironment() {
             .withNetworkAliases(BACKEND_ALIAS)
             .withLogConsumer(new Slf4jLogConsumer(backendLogger));
     backend.start();
-
-    collector =
-        new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:latest"))
-            .dependsOn(backend)
-            .withNetwork(network)
-            .withNetworkAliases(COLLECTOR_ALIAS)
-            .withLogConsumer(new Slf4jLogConsumer(collectorLogger))
-            .withCopyFileToContainer(
-                MountableFile.forClasspathResource(COLLECTOR_CONFIG_RESOURCE), "/etc/otel.yaml")
-            .withCommand("--config /etc/otel.yaml");
-    collector.start();
   }
 
   @Override
@@ -62,11 +49,6 @@ protected void stopEnvironment() {
       backend = null;
     }
 
-    if (collector != null) {
-      collector.stop();
-      collector = null;
-    }
-
     network.close();
   }