Skip to content

Commit

Permalink
Fixes the issue of not being able to receive Jaeger HotROD 1.60.0 via…
Browse files Browse the repository at this point in the history
… OpenTelemetry SDK

Signed-off-by: linghengqian <[email protected]>
  • Loading branch information
linghengqian committed Sep 22, 2024
1 parent 8abf1d5 commit 2823b94
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 30 deletions.
42 changes: 16 additions & 26 deletions examples/jaeger-hotrod/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,45 +13,35 @@ services:
depends_on:
- opensearch
otel-collector:
image: otel/opentelemetry-collector:0.64.1
command: [ "--config=/etc/otel-collector-config.yml" ]
working_dir: "/project"
image: otel/opentelemetry-collector-contrib:0.109.0
volumes:
- ${PWD}/:/project
- ./otel-collector-config.yml:/etc/otel-collector-config.yml
ports:
- "14250:14250"
depends_on:
- data-prepper
networks:
- my_network
jaeger-agent:
image: jaegertracing/jaeger-agent:1.51.0
command: [ "--reporter.grpc.host-port=otel-collector:14250" ]
ports:
- "5775:5775/udp"
- "6831:6831/udp"
- "6832:6832/udp"
- "5778:5778/tcp"
- ./otel-collector-config.yml:/etc/otelcol-contrib/config.yaml
expose:
- 1888
- 8888
- 8889
- 13133
- 4317
- 4318
- 55679
networks:
- my_network
depends_on:
- otel-collector
- data-prepper
jaeger-hot-rod:
image: jaegertracing/example-hotrod:1.41.0
image: jaegertracing/example-hotrod:1.60.0
command: [ "all" ]
environment:
- JAEGER_AGENT_HOST=jaeger-agent
- JAEGER_AGENT_PORT=6831
- OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4318
ports:
- "8080-8083:8080-8083"
depends_on:
- jaeger-agent
- otel-collector
networks:
- my_network
opensearch:
container_name: node-0.example.com
image: opensearchproject/opensearch:2.16.0
image: opensearchproject/opensearch:2.17.0
environment:
- discovery.type=single-node
- bootstrap.memory_lock=true # along with the memlock settings below, disables swapping
Expand All @@ -72,7 +62,7 @@ services:
networks:
- my_network
dashboards:
image: opensearchproject/opensearch-dashboards:2.16.0
image: opensearchproject/opensearch-dashboards:2.17.0
container_name: opensearch-dashboards
ports:
- "5601:5601"
Expand Down
8 changes: 4 additions & 4 deletions examples/jaeger-hotrod/otel-collector-config.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
receivers:
jaeger:
otlp:
protocols:
grpc:
http:
endpoint: otel-collector:4318

exporters:
otlp/2:
endpoint: data-prepper:21890
tls:
insecure: true
insecure_skip_verify: true
logging:

service:
pipelines:
traces:
receivers: [jaeger]
receivers: [otlp]
exporters: [logging, otlp/2]

0 comments on commit 2823b94

Please sign in to comment.