Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[collector] replace Jaeger to OTLP exporter #435

Merged
merged 4 commits into from
Oct 13, 2022
Merged

[collector] replace Jaeger to OTLP exporter #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbf25eb
[collector] replace Jaeger to OTLP exporter
julianocosta89 Oct 12, 2022
04adfbe
changelog
julianocosta89 Oct 12, 2022
14c5bad
Remove unused port
Oct 13, 2022
3828a07
Remove unused port
Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,5 @@ significant modifications will be credited to OpenTelemetry Authors.
([#339](https://github.com/open-telemetry/opentelemetry-demo/pull/339))
* Added basic metrics support for recommendation service (Python)
([#416](https://github.com/open-telemetry/opentelemetry-demo/pull/416))
* Replaced the Jaeger exporter to the OTLP exporter in the OTel Collector
([#435](https://github.com/open-telemetry/opentelemetry-demo/pull/435))
6 changes: 4 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@ services:
command:
- "--memory.max-traces"
- "10000"
environment:
- COLLECTOR_OTLP_ENABLED=true
ports:
- "16686:16686" # Jaeger UI
- "14250" # Jaeger model.proto endpoint
- "4317" # OTLP gRPC default port
logging: *logging

# Collector
otelcol:
image: otel/opentelemetry-collector-contrib:0.56.0
image: otel/opentelemetry-collector-contrib:0.61.0
container_name: otel-col
command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
volumes:
Expand Down
6 changes: 3 additions & 3 deletions src/otelcollector/otelcol-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ receivers:
endpoint: "localhost:65535"

exporters:
jaeger:
endpoint: "jaeger:14250"
otlp:
endpoint: "jaeger:4317"
tls:
insecure: true
logging:
Expand All @@ -31,7 +31,7 @@ service:
traces:
receivers: [otlp]
processors: [spanmetrics, batch]
exporters: [logging, jaeger]
exporters: [logging, otlp]
metrics:
receivers: [otlp]
processors: [batch]
Expand Down