From 6654ba7ed8f113762a37debfd007add94e0c7769 Mon Sep 17 00:00:00 2001 From: Chao Weng <19381524+sincejune@users.noreply.github.com> Date: Wed, 19 Jan 2022 02:39:56 +0800 Subject: [PATCH] Remove jaeger_thrift in docker-compose example (#7243) * Remove jaeger_thrift in docker-compose example * Update changelog Co-authored-by: Alex Boten --- CHANGELOG.md | 1 + examples/tracing/docker-compose.yml | 1 - examples/tracing/otel-collector-config.yml | 8 +++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7d0425db1d39..802f85804a7fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - `mongodbreceiver`: Add metric metadata (#7163) - `postgresqlreceiver`: add the receiver to available components (#7079) - `tanzuobservability exporter`: Support summary metrics (#7121) +- Use Jaeger gRPC instead of Thrift in the docker-compose example (#7243) ## 🛑 Breaking changes 🛑 diff --git a/examples/tracing/docker-compose.yml b/examples/tracing/docker-compose.yml index 69ee7a2a932c6..ebbc5c301c1dd 100644 --- a/examples/tracing/docker-compose.yml +++ b/examples/tracing/docker-compose.yml @@ -5,7 +5,6 @@ services: image: jaegertracing/all-in-one:latest ports: - "16686:16686" - - "14268" - "14250" #Zipkin diff --git a/examples/tracing/otel-collector-config.yml b/examples/tracing/otel-collector-config.yml index 9b7f85cc4f8a8..c1978a00f1765 100644 --- a/examples/tracing/otel-collector-config.yml +++ b/examples/tracing/otel-collector-config.yml @@ -5,8 +5,10 @@ receivers: zipkin: exporters: - jaeger_thrift: - endpoint: "http://jaeger:14268/api/traces" + jaeger: + endpoint: jaeger:14250 + tls: + insecure: true logging: zipkin: endpoint: "http://zipkin:9411/api/v2/spans" @@ -24,5 +26,5 @@ service: pipelines: traces: receivers: [otlp, zipkin] - exporters: [zipkin, jaeger_thrift, logging] + exporters: [zipkin, jaeger, logging] processors: [batch]