From 01b57ea19fb9cc104df834c9b75e50786a702a44 Mon Sep 17 00:00:00 2001
From: Istvan Toth <stoty@apache.org>
Date: Mon, 30 Oct 2023 05:38:11 +0100
Subject: [PATCH] use latest OTEL collector and switch Jaeger to OTLP protocol

---
 .env                       | 2 +-
 docker-compose.yaml        | 2 ++
 otel-collector-config.yaml | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index 5935660..43f8e75 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
-OTELCOL_IMG=otel/opentelemetry-collector:0.67.0
+OTELCOL_IMG=otel/opentelemetry-collector:latest
 OTELCOL_ARGS=
diff --git a/docker-compose.yaml b/docker-compose.yaml
index bc72aa4..a78a268 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -7,8 +7,10 @@ services:
     restart: always
     ports:
       - "16686:16686"
+      - "16685:16685"
       - "14268"
       - "14250"
+      - "4317"
 
   # Zipkin
   zipkin-all-in-one:
diff --git a/otel-collector-config.yaml b/otel-collector-config.yaml
index 858647e..71167f6 100644
--- a/otel-collector-config.yaml
+++ b/otel-collector-config.yaml
@@ -16,8 +16,8 @@ exporters:
     endpoint: "http://zipkin-all-in-one:9411/api/v2/spans"
     format: proto
 
-  jaeger:
-    endpoint: jaeger-all-in-one:14250
+  otlp/jaeger:
+    endpoint: jaeger-all-in-one:4317
     tls:
       insecure: true
 
@@ -37,7 +37,7 @@ service:
     traces:
       receivers: [otlp]
       processors: [batch]
-      exporters: [logging, zipkin, jaeger]
+      exporters: [logging, zipkin, otlp/jaeger]
     metrics:
       receivers: [otlp]
       processors: [batch]