Skip to content

Commit

Permalink
Fixes the issue of not being able to receive Jaeger HotROD 1.62.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 Oct 23, 2024
1 parent feaacfc commit 274d62d
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 45 deletions.
45 changes: 10 additions & 35 deletions examples/jaeger-hotrod/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,61 +4,38 @@ services:
image: opensearchproject/data-prepper:2
volumes:
- ./pipelines.yaml:/usr/share/data-prepper/pipelines/pipelines.yaml
- ../data-prepper-config.yaml:/usr/share/data-prepper/config/data-prepper-config.yaml
- opensearch-config:/usr/share/opensearch-test/:ro
ports:
- "21890:21890"
networks:
- my_network
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.111.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
networks:
- my_network
depends_on:
- otel-collector
- data-prepper
jaeger-hot-rod:
image: jaegertracing/example-hotrod:1.41.0
image: jaegertracing/example-hotrod:1.62.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"
- "8080:8080"
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.1
environment:
- discovery.type=single-node
- bootstrap.memory_lock=true # along with the memlock settings below, disables swapping
- "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
- OPENSEARCH_INITIAL_ADMIN_PASSWORD=yourStrongPassword123!
volumes:
- opensearch-config:/usr/share/opensearch/config/
ulimits:
memlock:
soft: -1
Expand All @@ -72,17 +49,15 @@ services:
networks:
- my_network
dashboards:
image: opensearchproject/opensearch-dashboards:2.16.0
image: opensearchproject/opensearch-dashboards:2.17.1
container_name: opensearch-dashboards
ports:
- "5601:5601"
environment:
OPENSEARCH_HOSTS: '["https://node-0.example.com:9200"]'
OPENSEARCH_HOSTS: '["https://opensearch:9200"]'
depends_on:
- opensearch
networks:
- my_network
networks:
my_network:
volumes:
opensearch-config:
12 changes: 6 additions & 6 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:
debug:

service:
pipelines:
traces:
receivers: [jaeger]
exporters: [logging, otlp/2]
receivers: [otlp]
exporters: [debug, otlp/2]
8 changes: 4 additions & 4 deletions examples/jaeger-hotrod/pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ raw-pipeline:
- otel_traces:
sink:
- opensearch:
hosts: [ "https://node-0.example.com:9200" ]
cert: "/usr/share/opensearch-test/root-ca.pem"
hosts: [ "https://opensearch:9200" ]
insecure: "true"
username: "admin"
password: "yourStrongPassword123!"
index_type: trace-analytics-raw
Expand All @@ -30,8 +30,8 @@ service-map-pipeline:
- service_map:
sink:
- opensearch:
hosts: ["https://node-0.example.com:9200"]
cert: "/usr/share/opensearch-test/root-ca.pem"
hosts: ["https://opensearch:9200"]
insecure: "true"
username: "admin"
password: "yourStrongPassword123!"
index_type: trace-analytics-service-map

0 comments on commit 274d62d

Please sign in to comment.