From b9b5cd905f7b831f920f923c109c4380d7e40203 Mon Sep 17 00:00:00 2001
From: Devrim Demiroz <62701796+devrimdemiroz@users.noreply.github.com>
Date: Sun, 25 Dec 2022 12:55:36 +0100
Subject: [PATCH] Jaeger-SPM-Config (#655)

* prometheus.server-url parameter

--prometheus.server-url parameter and environment variable METRICS_STORAGE_TYPE=prometheus added to make Jaeger SPM page working.

* prometheus.server-url

prometheus.server-url parameter and environment variable

* Update docker-compose.yml

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

Co-authored-by: Pierre Tessier <pierre@pierretessier.com>

* lint typo correctin

* Update CHANGELOG.md

* Add Jaeger-SPM-Config
([#655](https://github.com/open-telemetry/opentelemetry-demo/pull/655))

* remove extra blank space

Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
---
 .env               | 1 +
 CHANGELOG.md       | 2 ++
 docker-compose.yml | 9 ++++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

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}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4205d4c772..d122bb058e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -164,3 +164,5 @@ 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))
diff --git a/docker-compose.yml b/docker-compose.yml
index 50c2b56629..900dc7d461 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -575,7 +575,13 @@ services:
   jaeger:
     image: jaegertracing/all-in-one
     container_name: jaeger
-    command: ["--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:
@@ -586,6 +592,7 @@ services:
       - "4317"                           # OTLP gRPC default port
     environment:
       - COLLECTOR_OTLP_ENABLED=true
+      - METRICS_STORAGE_TYPE=prometheus
     logging: *logging
 
   # Grafana