From 600d82c5815289ba13197ce80b742c0f4411df78 Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Date: Tue, 26 Nov 2024 11:15:15 -0400
Subject: [PATCH] [refactor] Move SPM v2 config to cmd/jaeger/ with all other
 configs (#6256)

## Which problem is this PR solving?
- This config was demonstrating a setup with span metrics processor, but
was stashed in example directory

## Description of the changes
- Move the config to /cmd/jaeger/ where all other v2 configs are

## How was this change tested?
- ran SPM locally
- CI

## Follow-ups
* [ ] check if SPM documentation points to the old location of the
config

---------

Signed-off-by: Yuri Shkuro <github@ysh.us>
---
 .../jaeger-v2-config.yml => cmd/jaeger/config-spm.yaml       | 5 +++++
 docker-compose/monitor/README.md                             | 2 +-
 docker-compose/monitor/docker-compose-v2.yml                 | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)
 rename docker-compose/monitor/jaeger-v2-config.yml => cmd/jaeger/config-spm.yaml (90%)

diff --git a/docker-compose/monitor/jaeger-v2-config.yml b/cmd/jaeger/config-spm.yaml
similarity index 90%
rename from docker-compose/monitor/jaeger-v2-config.yml
rename to cmd/jaeger/config-spm.yaml
index de1a4ac0616..86d6a64576a 100644
--- a/docker-compose/monitor/jaeger-v2-config.yml
+++ b/cmd/jaeger/config-spm.yaml
@@ -9,6 +9,11 @@ service:
       receivers: [spanmetrics]
       exporters: [prometheus]
   telemetry:
+    resource:
+      service.name: jaeger
+    metrics:
+      level: detailed
+      address: 0.0.0.0:8888
     logs:
       level: DEBUG
 
diff --git a/docker-compose/monitor/README.md b/docker-compose/monitor/README.md
index 1d555de4880..b020dda7fd9 100644
--- a/docker-compose/monitor/README.md
+++ b/docker-compose/monitor/README.md
@@ -98,7 +98,7 @@ JAEGER_IMAGE_TAG=1.62.0 docker compose up
 or for Jaeger v2:
 
 ```shell
-JAEGER_IMAGE_TAG=2.0.0-rc2 docker compose -f docker-compose-v2.yml up
+JAEGER_IMAGE_TAG=2.0.0 docker compose -f docker-compose-v2.yml up
 ```
 
 ## Development
diff --git a/docker-compose/monitor/docker-compose-v2.yml b/docker-compose/monitor/docker-compose-v2.yml
index 8e5a248c509..ddadff0ddd0 100644
--- a/docker-compose/monitor/docker-compose-v2.yml
+++ b/docker-compose/monitor/docker-compose-v2.yml
@@ -7,11 +7,14 @@ services:
     image: jaegertracing/jaeger:${JAEGER_IMAGE_TAG:-latest}
     volumes:
       - "./jaeger-ui.json:/etc/jaeger/jaeger-ui.json" # Do we need this for v2 ? Seems to be running without this.
-      - "./jaeger-v2-config.yml:/etc/jaeger/config.yml"
+      - "../../cmd/jaeger/config-spm.yaml:/etc/jaeger/config.yml"
     command: ["--config", "/etc/jaeger/config.yml"]
     ports:
       - "16686:16686"
+      - "8888:8888"
       - "8889:8889"
+      - "4317:4317"
+      - "4318:4318"
 
   microsim:
     networks: