From ec4de5795d472d6e76a7a04fb5b45999cfc2d15b Mon Sep 17 00:00:00 2001
From: albertteoh <see.kwang.teoh@gmail.com>
Date: Mon, 28 Aug 2023 21:31:09 +1000
Subject: [PATCH] Default to spanmetrics connector

Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>
---
 docker-compose/monitor/Makefile           | 31 ++++++++---------------
 docker-compose/monitor/README.md          |  2 +-
 docker-compose/monitor/docker-compose.yml |  8 +++---
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/docker-compose/monitor/Makefile b/docker-compose/monitor/Makefile
index 6ca32cb6ce9..cab9eca4e26 100644
--- a/docker-compose/monitor/Makefile
+++ b/docker-compose/monitor/Makefile
@@ -5,31 +5,22 @@ build: clean-jaeger
 	make build-all-in-one && \
 	make docker-images-jaeger-backend
 
-# run starts up the system required for SPM using the latest jaeger and otel images.
-.PHONY: run
-run: export JAEGER_IMAGE_TAG = latest
-run: _run-connector
-
-# run starts up the system required for SPM using the latest otel image and a development jaeger image.
+# starts up the system required for SPM using the latest otel image and a development jaeger image.
 # Note: the jaeger "dev" image can be built with "make build".
-.PHONY: run-dev
-run-dev: export JAEGER_IMAGE_TAG = dev
-run-dev: _run-connector
-
-# _run-connector is the base target to bring up the system required for SPM using the new OTEL spanmetrics connector.
-.PHONY: _run-connector
-_run-connector:
+.PHONY: dev
+dev: export JAEGER_IMAGE_TAG = dev
+dev:
 	docker compose -f docker-compose.yml up
 
-# run the older spanmetrics processor setup, for example,
+# starts older spanmetrics processor setup, for example,
 # to test backwards compatibility of Jaeger with spanmetrics processor.
-.PHONY: run-dev-processor
-run-dev-processor: export JAEGER_IMAGE_TAG = dev
+.PHONY: dev-processor
+dev-processor: export JAEGER_IMAGE_TAG = dev
 # Fix to a version before the breaking changes were introduced.
-run-dev-processor: export OTEL_IMAGE_TAG = 0.70.0
-run-dev-processor: export OTEL_CONFIG_SRC = ./otel-collector-config-processor.yml
-run-dev-processor: export PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR = false
-run-dev-processor:
+dev-processor: export OTEL_IMAGE_TAG = 0.70.0
+dev-processor: export OTEL_CONFIG_SRC = ./otel-collector-config-processor.yml
+dev-processor: export PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR = false
+dev-processor:
 	docker compose -f docker-compose.yml up
 
 .PHONY: clean-jaeger
diff --git a/docker-compose/monitor/README.md b/docker-compose/monitor/README.md
index bb94c464e1a..2a4f840d9e7 100644
--- a/docker-compose/monitor/README.md
+++ b/docker-compose/monitor/README.md
@@ -32,7 +32,7 @@ This brings up the system necessary to use the SPM feature locally.
 It uses the latest image tags from both Jaeger and OpenTelemetry.
 
 ```shell
-make run
+docker compose up
 ```
 
 **Tips:**
diff --git a/docker-compose/monitor/docker-compose.yml b/docker-compose/monitor/docker-compose.yml
index 1abf1d274d2..a4c705bd5d0 100644
--- a/docker-compose/monitor/docker-compose.yml
+++ b/docker-compose/monitor/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   jaeger:
     networks:
       - backend
-    image: jaegertracing/all-in-one:${JAEGER_IMAGE_TAG}
+    image: jaegertracing/all-in-one:${JAEGER_IMAGE_TAG:-latest}
     volumes:
       - "./jaeger-ui.json:/etc/jaeger/jaeger-ui.json"
     command: --query.ui-config /etc/jaeger/jaeger-ui.json
@@ -13,16 +13,14 @@ services:
       - PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR=${PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR:-true}
       - PROMETHEUS_QUERY_NAMESPACE=${PROMETHEUS_QUERY_NAMESPACE:-}
       - PROMETHEUS_QUERY_DURATION_UNIT=${PROMETHEUS_QUERY_DURATION_UNIT:-}
-      - OTEL_IMAGE_TAG=${OTEL_IMAGE_TAG:-0.80.0}
-      - OTEL_CONFIG_SRC=${OTEL_CONFIG_SRC:-./otel-collector-config-connector.yml}
     ports:
       - "16686:16686"
   otel_collector:
     networks:
       - backend
-    image: otel/opentelemetry-collector-contrib:${OTEL_IMAGE_TAG}
+    image: otel/opentelemetry-collector-contrib:${OTEL_IMAGE_TAG:-0.80.0}
     volumes:
-      - ${OTEL_CONFIG_SRC}:/etc/otelcol/otel-collector-config.yml
+      - ${OTEL_CONFIG_SRC:-./otel-collector-config-connector.yml}:/etc/otelcol/otel-collector-config.yml
     command: --config /etc/otelcol/otel-collector-config.yml
     ports:
       - "4317:4317"