From 17f394bc5baf1fecbd4bd4393aa737d801f6cbdb Mon Sep 17 00:00:00 2001
From: Devrim Demiroz <62701796+devrimdemiroz@users.noreply.github.com>
Date: Wed, 21 Dec 2022 01:52:50 +0100
Subject: [PATCH 1/6] prometheus.server-url parameter

--prometheus.server-url parameter and environment variable METRICS_STORAGE_TYPE=prometheus added to make Jaeger SPM page working.
---
 .env | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.env b/.env
index be7a0fbe26..dd461ad101 100644
--- a/.env
+++ b/.env
@@ -107,3 +107,4 @@ JAEGER_SERVICE_HOST=jaeger
 # Prometheus
 PROMETHEUS_SERVICE_PORT=9090
 PROMETHEUS_SERVICE_HOST=prometheus
+PROMETHEUS_ADDR=${PROMETHEUS_SERVICE_HOST}:${PROMETHEUS_SERVICE_PORT}

From ff208c5ccb0e14c6ecd0b4c6235d1082cce042b5 Mon Sep 17 00:00:00 2001
From: Devrim Demiroz <62701796+devrimdemiroz@users.noreply.github.com>
Date: Wed, 21 Dec 2022 01:56:01 +0100
Subject: [PATCH 2/6] prometheus.server-url

prometheus.server-url parameter and environment variable
---
 docker-compose.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f870a5b895..3eb9569c91 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -575,7 +575,7 @@ services:
   jaeger:
     image: jaegertracing/all-in-one
     container_name: jaeger
-    command: ["--memory.max-traces", "10000", "--query.base-path", "/jaeger/ui"]
+    command: ["--prometheus.server-url","http://${PROMETHEUS_ADDR}","--memory.max-traces", "10000", "--query.base-path", "/jaeger/ui"]
     deploy:
       resources:
         limits:
@@ -586,6 +586,7 @@ services:
       - "4317"                           # OTLP gRPC default port
     environment:
       - COLLECTOR_OTLP_ENABLED=true
+      - METRICS_STORAGE_TYPE=prometheus
     logging: *logging
 
   # Grafana

From 882f3b449b2bd6122c10a2821194560abc845a5e Mon Sep 17 00:00:00 2001
From: Devrim Demiroz <62701796+devrimdemiroz@users.noreply.github.com>
Date: Sat, 24 Dec 2022 19:37:23 +0100
Subject: [PATCH 3/6] Update docker-compose.yml

commited to test in local. will be resolving once it works.

Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
---
 docker-compose.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 643e08b70a..b2fb0137af 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -575,7 +575,13 @@ services:
   jaeger:
     image: jaegertracing/all-in-one
     container_name: jaeger
-    command: ["--prometheus.server-url","http://${PROMETHEUS_ADDR}","--memory.max-traces", "10000", "--query.base-path", "/jaeger/ui"]
+    command: 
+      - "--memory.max-traces"
+      - "10000"
+      - "--query.base-path"
+      - "/jaeger/ui"
+      - "--prometheus.server-url"
+      - "http://${PROMETHEUS_ADDR}"
     deploy:
       resources:
         limits:

From b853813d387dcfffe0f46fcf336b56ed286f604c Mon Sep 17 00:00:00 2001
From: Devrim Demiroz <62701796+devrimdemiroz@users.noreply.github.com>
Date: Sat, 24 Dec 2022 21:16:31 +0100
Subject: [PATCH 4/6] lint typo correctin

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b2fb0137af..900dc7d461 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -575,7 +575,7 @@ services:
   jaeger:
     image: jaegertracing/all-in-one
     container_name: jaeger
-    command: 
+    command:
       - "--memory.max-traces"
       - "10000"
       - "--query.base-path"

From 0d89ccd7b5e49c78f62b10ee254b1e843e673e46 Mon Sep 17 00:00:00 2001
From: Devrim Demiroz <62701796+devrimdemiroz@users.noreply.github.com>
Date: Sat, 24 Dec 2022 21:21:26 +0100
Subject: [PATCH 5/6] Update CHANGELOG.md

* Add Jaeger-SPM-Config
([#655](https://github.com/open-telemetry/opentelemetry-demo/pull/655))
---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4205d4c772..381083efb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -164,3 +164,6 @@ significant modifications will be credited to OpenTelemetry Authors.
 ([#651](https://github.com/open-telemetry/opentelemetry-demo/pull/651))
 * Add resource detectors to frontend service
 ([#648](https://github.com/open-telemetry/opentelemetry-demo/pull/648))
+* Add Jaeger-SPM-Config
+([#655](https://github.com/open-telemetry/opentelemetry-demo/pull/655))
+

From de8b0d9b79b8b5d8a6a849264ba1e18ba95b4a7c Mon Sep 17 00:00:00 2001
From: Pierre Tessier <pierre@pierretessier.com>
Date: Sat, 24 Dec 2022 22:44:07 -0500
Subject: [PATCH 6/6] remove extra blank space

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 381083efb2..d122bb058e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -166,4 +166,3 @@ significant modifications will be credited to OpenTelemetry Authors.
 ([#648](https://github.com/open-telemetry/opentelemetry-demo/pull/648))
 * Add Jaeger-SPM-Config
 ([#655](https://github.com/open-telemetry/opentelemetry-demo/pull/655))
-