diff --git a/examples/jaeger-hotrod/docker-compose.yml b/examples/jaeger-hotrod/docker-compose.yml index 5e15860dc7..8668211c85 100644 --- a/examples/jaeger-hotrod/docker-compose.yml +++ b/examples/jaeger-hotrod/docker-compose.yml @@ -1,7 +1,7 @@ services: data-prepper: restart: unless-stopped - image: opensearchproject/data-prepper:2 + image: docker.io/opensearchproject/data-prepper:2.16.0 volumes: - ./pipelines.yaml:/usr/share/data-prepper/pipelines/pipelines.yaml - ../data-prepper-config.yaml:/usr/share/data-prepper/config/data-prepper-config.yaml @@ -12,8 +12,9 @@ services: - my_network depends_on: - opensearch + otel-collector: - image: otel/opentelemetry-collector:0.64.1 + image: docker.io/otel/opentelemetry-collector-contrib:0.158.0 command: [ "--config=/etc/otel-collector-config.yml" ] working_dir: "/project" volumes: @@ -25,33 +26,22 @@ services: - 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" - networks: - - my_network - depends_on: - - otel-collector + jaeger-hot-rod: - image: jaegertracing/example-hotrod:1.41.0 + image: docker.io/jaegertracing/example-hotrod:2.20.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: docker.io/opensearchproject/opensearch:3.8.0 environment: - discovery.type=single-node - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping @@ -72,7 +62,7 @@ services: networks: - my_network dashboards: - image: opensearchproject/opensearch-dashboards:2.16.0 + image: docker.io/opensearchproject/opensearch-dashboards:3.8.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..82f57114f5 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: + otlp_grpc/data-prepper: 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_grpc/data-prepper] diff --git a/examples/jaeger-hotrod/pipelines.yaml b/examples/jaeger-hotrod/pipelines.yaml index 8d628a6406..1318492b27 100644 --- a/examples/jaeger-hotrod/pipelines.yaml +++ b/examples/jaeger-hotrod/pipelines.yaml @@ -1,13 +1,15 @@ entry-pipeline: delay: "100" source: - otel_trace_source: + otlp_traces: ssl: false + port: 21890 sink: - pipeline: name: "raw-pipeline" - pipeline: name: "service-map-pipeline" + raw-pipeline: source: pipeline: @@ -21,6 +23,7 @@ raw-pipeline: username: "admin" password: "yourStrongPassword123!" index_type: trace-analytics-raw + service-map-pipeline: delay: "100" source: