open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

* Remove zipkin from otel collector smoke test config

* Smoke tests too
This commit is contained in:
Trask Stalnaker 2021-08-25 12:17:23 -07:00 committed by GitHub
parent 21f178b7bd
commit 99de444ffc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/distro/smoke-tests/src/test/resources/otel.yaml
View File

@ -9,7 +9,6 @@ receivers:
otlp: otlp:
protocols: protocols:
grpc: grpc:
zipkin:
processors: processors:
batch: batch:
@ -24,8 +23,8 @@ exporters:
service: service:
pipelines: pipelines:
traces: traces:
receivers: [otlp, zipkin] receivers: [ otlp ]
processors: [batch] processors: [ batch ]
exporters: [logging, otlp] exporters: [ logging, otlp ]
extensions: [health_check, pprof, zpages] extensions: [ health_check, pprof, zpages ]

9
examples/extension/src/test/resources/otel.yaml
View File

@ -9,7 +9,6 @@ receivers:
otlp: otlp:
protocols: protocols:
grpc: grpc:
zipkin:
processors: processors:
batch: batch:
@ -24,8 +23,8 @@ exporters:
service: service:
pipelines: pipelines:
traces: traces:
receivers: [otlp, zipkin] receivers: [ otlp ]
processors: [batch] processors: [ batch ]
exporters: [logging, otlp] exporters: [ logging, otlp ]
extensions: [health_check, pprof, zpages] extensions: [ health_check, pprof, zpages ]

3
smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java
View File

@ -44,7 +44,8 @@ public class LinuxTestContainerManager extends AbstractTestContainerManager {
backend.start(); backend.start();
collector = collector =
new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-dev:latest")) new GenericContainer<>(
DockerImageName.parse("otel/opentelemetry-collector-contrib-dev:latest"))
.dependsOn(backend) .dependsOn(backend)
.withNetwork(network) .withNetwork(network)
.withNetworkAliases(COLLECTOR_ALIAS) .withNetworkAliases(COLLECTOR_ALIAS)