From 8cc435df92cb3030f3a42cf266e52e9057c858cd Mon Sep 17 00:00:00 2001
From: Ahmedul Haque Abid <a_h_abid@hotmail.com>
Date: Fri, 3 Jan 2025 15:41:23 +0600
Subject: [PATCH] Add Jaeger with new v2

---
 .env.example                       |  2 +-
 .envs/jaeger.example.env           |  3 +--
 docker-compose.override.jaeger.yml |  2 +-
 jaeger/.example.env                |  1 +
 jaeger/compose.jaeger.example.yaml | 15 +++++++++++++++
 5 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 jaeger/.example.env
 create mode 100644 jaeger/compose.jaeger.example.yaml

diff --git a/.env.example b/.env.example
index ffc361e..be5173d 100644
--- a/.env.example
+++ b/.env.example
@@ -22,7 +22,7 @@ CASSANDRA_IMAGE_TAG=4.1.0
 ELASTICSEARCH_KIBANA_IMAGE_TAG=8.15.2
 FLUENTD_IMAGE_TAG=v1.14-debian-1
 GRAFANA_IMAGE_TAG=9.3.2
-JAEGER_IMAGE_TAG=1.41
+JAEGER_IMAGE_TAG=2.1.0
 LDAP_IMAGE_TAG=2.6.3
 MAILDEV_IMAGE_TAG=2.1.0
 MAILHOG_IMAGE_TAG=v1.0.1
diff --git a/.envs/jaeger.example.env b/.envs/jaeger.example.env
index b5af65e..cb5b8bf 100644
--- a/.envs/jaeger.example.env
+++ b/.envs/jaeger.example.env
@@ -1,2 +1 @@
-COLLECTOR_ZIPKIN_HOST_PORT=:9411
-COLLECTOR_OTLP_ENABLED=true
+JAEGER_LISTEN_HOST=0.0.0.0
diff --git a/docker-compose.override.jaeger.yml b/docker-compose.override.jaeger.yml
index 04c5b96..3b52888 100644
--- a/docker-compose.override.jaeger.yml
+++ b/docker-compose.override.jaeger.yml
@@ -5,7 +5,7 @@ volumes:
 services:
 
   jaeger:
-    image: 'jaegertracing/all-in-one:${JAEGER_IMAGE_TAG}'
+    image: 'jaegertracing/jaeger:${JAEGER_IMAGE_TAG}'
     env_file:
       - .envs/jaeger.env
     networks:
diff --git a/jaeger/.example.env b/jaeger/.example.env
new file mode 100644
index 0000000..cb5b8bf
--- /dev/null
+++ b/jaeger/.example.env
@@ -0,0 +1 @@
+JAEGER_LISTEN_HOST=0.0.0.0
diff --git a/jaeger/compose.jaeger.example.yaml b/jaeger/compose.jaeger.example.yaml
new file mode 100644
index 0000000..da866ac
--- /dev/null
+++ b/jaeger/compose.jaeger.example.yaml
@@ -0,0 +1,15 @@
+volumes:
+  common-jaeger:
+    name: 'common-jaeger'
+
+services:
+  jaeger:
+    image: 'jaegertracing/jaeger:${JAEGER_IMAGE_TAG:-2.1.0}'
+    env_file:
+      - .env
+    networks:
+      common-net:
+        aliases:
+          - common-jaeger
+    volumes:
+      - common-jaeger:/tmp