diff --git a/examples/jaeger-hotrod/docker-compose.yml b/examples/jaeger-hotrod/docker-compose.yml index 5e15860dc7..9bb9b244c9 100644 --- a/examples/jaeger-hotrod/docker-compose.yml +++ b/examples/jaeger-hotrod/docker-compose.yml @@ -13,32 +13,23 @@ 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 @@ -46,12 +37,12 @@ services: 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 @@ -72,7 +63,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" diff --git a/examples/jaeger-hotrod/otel-collector-config.yml b/examples/jaeger-hotrod/otel-collector-config.yml index eab4fa894f..626b511782 100644 --- a/examples/jaeger-hotrod/otel-collector-config.yml +++ b/examples/jaeger-hotrod/otel-collector-config.yml @@ -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]