Skip to content

Commit

Permalink
[chore] Update collector demo (open-telemetry#26675)
Browse files Browse the repository at this point in the history
open-telemetry#26546
removed the jaeger exporter, but the `build-and-test` workflow depended
on that exporter since it uses the config in
`examples/demo/otel-collector-config.yaml` for its test.

This PR updates the demo to use OTLP with jaeger, which also fixes the
`rpm` and `deb` test job in `build-and-test`.
  • Loading branch information
TylerHelmuth committed Sep 13, 2023
1 parent 82d0db2 commit 943b345
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion examples/demo/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
OTELCOL_IMG=otel/opentelemetry-collector:0.67.0
OTELCOL_IMG=otel/opentelemetry-collector:0.85.0
OTELCOL_ARGS=
2 changes: 1 addition & 1 deletion examples/demo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ This demo uses `docker-compose` and by default runs against the
to the `examples/demo` folder and run:

```shell
docker-compose up -d
docker compose up -d
```

The demo exposes the following backends:
Expand Down
6 changes: 3 additions & 3 deletions examples/demo/otel-collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ exporters:
endpoint: "http:https://zipkin-all-in-one:9411/api/v2/spans"
format: proto

jaeger:
endpoint: jaeger-all-in-one:14250
otlp:
endpoint: jaeger-all-in-one:4317
tls:
insecure: true

Expand All @@ -36,7 +36,7 @@ service:
traces:
receivers: [otlp]
processors: [batch]
exporters: [logging, zipkin, jaeger]
exporters: [logging, zipkin, otlp]
metrics:
receivers: [otlp]
processors: [batch]
Expand Down

0 comments on commit 943b345

Please sign in to comment.