fix

Signed-off-by: zzzk1 <[email protected]>

docker-compose/monitor/Makefile

@@ -1,7 +1,7 @@
 # Copyright (c) 2024 The Jaeger Authors.
 # SPDX-License-Identifier: Apache-2.0
 
-BINARY ?= all-in-one # Default value uses v1 binary
+BINARY ?= jaeger # Default value uses v1 binary
 
 .PHONY: build
 build: clean-jaeger
@@ -20,13 +20,13 @@ build: clean-jaeger
 .PHONY: dev
 dev: export JAEGER_IMAGE_TAG = dev
 dev: 
-	docker compose -f docker-compose-v1.yml up $(DOCKER_COMPOSE_ARGS)
+	docker compose up $(DOCKER_COMPOSE_ARGS)
 
 .PHONY: dev-v2
 dev-v2: export JAEGER_IMAGE_TAG = dev
-dev-v2: export BINARY = jaeger
-dev-v2: build 
-	docker compose -f docker-compose-v2.yml up $(DOCKER_COMPOSE_ARGS)
+dev-v2: export BINARY = all-in-one
+dev-v2: build
+	docker compose -f docker-compose-v1.yml up $(DOCKER_COMPOSE_ARGS)
 
 .PHONY: clean-jaeger
 clean-jaeger:

docker-compose/monitor/README.md

@@ -69,21 +69,21 @@ This brings up the system necessary to use the SPM feature locally.
 It uses the latest image tags from both Jaeger and OpenTelemetry.
 
 ```shell
-docker compose -f docker-compose-v1.yml up
+docker compose up
 ```
 
-**Jaeger v2**
+**Jaeger v1**
 
 ```shell
-docker compose -f docker-compose-v2.yml up
+docker compose -f docker-compose-v1.yml up
 ```
 
 **Tips:**
 - Let the application run for a couple of minutes to ensure there is enough time series data to plot in the dashboard.
 - Navigate to Jaeger UI at http://localhost:16686/ and inspect the Monitor tab. Select `redis` service from the dropdown to see more than one endpoint.
 - To visualize the raw metrics stored on the Prometheus server (for debugging and local development use cases), use the built-in Prometheus UI at http://localhost:9090/query. For example, http://localhost:9090/query?g0.expr=traces_span_metrics_calls_total&g0.tab=0&g0.range_input=5m
 
-**Warning:** The included [docker-compose-v1.yml](./docker-compose-v1.yml) file uses the `latest` version of Jaeger and other components. If your local Docker registry already contains older versions, which may still be tagged as `latest`, you may want to delete those images before running the full set, to ensure consistent behavior:
+**Warning:** The included ` docker compose` files use the `latest` version of Jaeger and other components. If your local Docker registry already contains older versions, which may still be tagged as `latest`, you may want to delete those images before running the full set, to ensure consistent behavior:
 
 ```bash
 make clean-all
@@ -92,13 +92,13 @@ make clean-all
 To use an official published image of Jaeger, specify the version via environment variable:
 
 ```shell
-JAEGER_IMAGE_TAG=1.62.0 docker compose -f docker-compose-v1.yml up  
+JAEGER_IMAGE_TAG=2.0.0 docker compose -f docker-compose.yml up
 ```
 
-or for Jaeger v2:
+or for Jaeger v1:
 
 ```shell
-JAEGER_IMAGE_TAG=2.0.0 docker compose -f docker-compose-v2.yml up
+JAEGER_IMAGE_TAG=1.62.0 docker compose -f docker-compose-v1.yml up  
 ```
 
 ## Development
@@ -107,7 +107,7 @@ These steps allow for running the system necessary for SPM, built from Jaeger's
 
 The primary use case is for testing source code changes to the SPM feature locally.
 
-### Build jaeger-all-in-one docker image
+### Build jaeger-v2 docker image
 
 ```shell
 make build
@@ -126,7 +126,7 @@ to emit traces to the OpenTelemetry Collector which, in turn, will aggregate the
 
 Start the local stack needed for SPM, if not already done:
 ```shell
-docker compose -f docker-compose-v2.yml up
+docker compose up
 ```
 
 Generate a specific number of traces with:

examples/hotrod/README.md

@@ -23,7 +23,7 @@ As of Jaeger v1.42.0 this application was upgraded to use the OpenTelemetry SDK
 
 ### Run everything via `docker compose`
 
-* Download `docker-compose-v1.yml` from https://github.com/jaegertracing/jaeger/blob/main/examples/hotrod/docker-compose-v1.yml
+* Download `docker-compose-v2.yml` from https://github.com/jaegertracing/jaeger/blob/main/examples/hotrod/docker-compose-v2.yml
 * Optional: find the latest Jaeger version (see https://www.jaegertracing.io/download/) and pass it via environment variable `JAEGER_VERSION`. Otherwise `docker compose` will use the `latest` tag, which is fine for the first time you download the images, but once they are in your local registry the `latest` tag is never updated and you may be running stale (and possibly incompatible) verions of Jaeger and the HotROD app.
 * Run Jaeger backend and HotROD demo, e.g.:
   * `JAEGER_VERSION=1.52 docker compose -f path-to-yml-file up`

scripts/e2e/spm.sh

@@ -161,9 +161,9 @@ teardown_services() {
 
 main() {
   if [ "$BINARY" == "jaeger" ]; then
-    (cd docker-compose/monitor && make build BINARY="$BINARY" && make dev-v2 DOCKER_COMPOSE_ARGS="-d")
-  else
     (cd docker-compose/monitor && make build BINARY="$BINARY" && make dev DOCKER_COMPOSE_ARGS="-d")
+  else
+    (cd docker-compose/monitor && make build BINARY="$BINARY" && make dev-v2 DOCKER_COMPOSE_ARGS="-d")
   fi
   wait_for_services
   check_spm