fix

Signed-off-by: zzzk1 <[email protected]>
jaegertracing · Jan 13, 2025 · 379e71e · 379e71e
1 parent 80c02ab
commit 379e71e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/docker-compose/monitor/Makefile b/docker-compose/monitor/Makefile
@@ -1,7 +1,7 @@
 # Copyright (c) 2024 The Jaeger Authors.
 # SPDX-License-Identifier: Apache-2.0
 
-BINARY ?= jaeger # Default value uses v1 binary
+BINARY ?= jaeger # Default value uses v2 binary
 
 .PHONY: build
 build: clean-jaeger
@@ -22,10 +22,10 @@ dev: export JAEGER_IMAGE_TAG = dev
 dev: 
 	docker compose up $(DOCKER_COMPOSE_ARGS)
 
-.PHONY: dev-v2
-dev-v2: export JAEGER_IMAGE_TAG = dev
-dev-v2: export BINARY = all-in-one
-dev-v2: build
+.PHONY: dev-v1
+dev-v1: export JAEGER_IMAGE_TAG = dev
+dev-v1: export BINARY = all-in-one
+dev-v1: build
 	docker compose -f docker-compose-v1.yml up $(DOCKER_COMPOSE_ARGS)
 
 .PHONY: clean-jaeger

diff --git a/examples/hotrod/README.md b/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-v2.yml` from https://github.com/jaegertracing/jaeger/blob/main/examples/hotrod/docker-compose-v2.yml
+* Download `docker-compose.yml` from https://github.com/jaegertracing/jaeger/blob/main/examples/hotrod/docker-compose.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`

diff --git a/examples/hotrod/docker-compose-v2.yml → examples/hotrod/docker-compose.yml b/examples/hotrod/docker-compose-v2.yml → examples/hotrod/docker-compose.yml
diff --git a/scripts/build/build-hotrod-image.sh b/scripts/build/build-hotrod-image.sh
@@ -16,7 +16,7 @@ print_help() {
   exit 1
 }
 
-docker_compose_file="./examples/hotrod/docker-compose-v2.yml"
+docker_compose_file="./examples/hotrod/docker-compose.yml"
 platforms="$(make echo-linux-platforms)"
 current_platform="$(go env GOOS)/$(go env GOARCH)"
 jaeger_version="v2"
@@ -58,7 +58,7 @@ case "$jaeger_version" in
     binary="all-in-one"
     ;;
   v2)
-    docker_compose_file="./examples/hotrod/docker-compose-v2.yml"
+    docker_compose_file="./examples/hotrod/docker-compose.yml"
     binary="jaeger"
     ;;
   *)

diff --git a/scripts/e2e/spm.sh b/scripts/e2e/spm.sh
@@ -163,7 +163,7 @@ main() {
   if [ "$BINARY" == "jaeger" ]; then
     (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")
+    (cd docker-compose/monitor && make build BINARY="$BINARY" && make dev-v1 DOCKER_COMPOSE_ARGS="-d")
   fi
   wait_for_services
   check_spm