Remove zipkin from otel collector smoke test config (#3953) (#3981)

* Remove zipkin from otel collector smoke test config * Smoke tests too
open-telemetry · Aug 27, 2021 · bd576f2 · bd576f2
1 parent 2991cd2
commit bd576f2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/examples/distro/smoke-tests/src/test/resources/otel.yaml b/examples/distro/smoke-tests/src/test/resources/otel.yaml
@@ -9,7 +9,6 @@ receivers:
   otlp:
     protocols:
       grpc:
-  zipkin:
 
 processors:
   batch:
@@ -24,8 +23,8 @@ exporters:
 service:
   pipelines:
     traces:
-      receivers: [otlp, zipkin]
-      processors: [batch]
-      exporters: [logging, otlp]
+      receivers: [ otlp ]
+      processors: [ batch ]
+      exporters: [ logging, otlp ]
 
-  extensions: [health_check, pprof, zpages]
+  extensions: [ health_check, pprof, zpages ]
diff --git a/examples/extension/src/test/resources/otel.yaml b/examples/extension/src/test/resources/otel.yaml
@@ -9,7 +9,6 @@ receivers:
   otlp:
     protocols:
       grpc:
-  zipkin:
 
 processors:
   batch:
@@ -24,8 +23,8 @@ exporters:
 service:
   pipelines:
     traces:
-      receivers: [otlp, zipkin]
-      processors: [batch]
-      exporters: [logging, otlp]
+      receivers: [ otlp ]
+      processors: [ batch ]
+      exporters: [ logging, otlp ]
 
-  extensions: [health_check, pprof, zpages]
+  extensions: [ health_check, pprof, zpages ]
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java
@@ -44,7 +44,8 @@ protected void startEnvironment() {
     backend.start();
 
     collector =
-        new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-dev:latest"))
+        new GenericContainer<>(
+                DockerImageName.parse("otel/opentelemetry-collector-contrib-dev:latest"))
             .dependsOn(backend)
             .withNetwork(network)
             .withNetworkAliases(COLLECTOR_ALIAS)