diff --git a/.env b/.env index 46fb6637e2..74ae9122e9 100644 --- a/.env +++ b/.env @@ -3,6 +3,7 @@ # Images IMAGE_VERSION=1.6.0 IMAGE_NAME=ghcr.io/open-telemetry/demo +TRACETEST_IMAGE_VERSION=v0.14.5 # Demo Platform ENV_PLATFORM=local diff --git a/CHANGELOG.md b/CHANGELOG.md index e28f266221..9ee4b2868e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ release. ## Unreleased +* add env var for pinning trace-based test tool version + ([#1239](https://github.com/open-telemetry/opentelemetry-demo/pull/1239)) * update PHP quoteservice to use 1.0.0 ([#1236](https://github.com/open-telemetry/opentelemetry-demo/pull/1236)) diff --git a/Makefile b/Makefile index d6a662d491..e9340278b5 100644 --- a/Makefile +++ b/Makefile @@ -137,6 +137,19 @@ start-minimal: @echo "Go to http://localhost:8080/grafana/ for the Grafana UI." @echo "Go to http://localhost:8080/loadgen/ for the Load Generator UI." +# Observabilty-Driven Development (ODD) +.PHONY: start-odd +start-odd: + docker compose --profile odd up --force-recreate --remove-orphans --detach + @echo "" + @echo "OpenTelemetry Demo is running." + @echo "Go to http://localhost:8080 for the demo UI." + @echo "Go to http://localhost:8080/jaeger/ui for the Jaeger UI." + @echo "Go to http://localhost:8080/grafana/ for the Grafana UI." + @echo "Go to http://localhost:8080/loadgen/ for the Load Generator UI." + @echo "Go to http://localhost:8080/feature/ for the Feature Flag UI." + @echo "Go to http://localhost:11633/ for the Tracetest Web UI." + .PHONY: stop stop: docker compose down --remove-orphans --volumes diff --git a/docker-compose.yml b/docker-compose.yml index b191d05a9c..084852716e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -832,11 +832,12 @@ services: condition: service_started tracetest-server: - image: kubeshop/tracetest:v0.14.5 + image: kubeshop/tracetest:${TRACETEST_IMAGE_VERSION} platform: linux/amd64 container_name: tracetest-server profiles: - tests + - odd # Observabilty-Driven Development (ODD) volumes: - type: bind source: ./test/tracetesting/tracetest-config.yaml @@ -865,6 +866,7 @@ services: container_name: tracetest-postgres profiles: - tests + - odd # Observabilty-Driven Development (ODD) environment: POSTGRES_PASSWORD: postgres POSTGRES_USER: postgres diff --git a/test/tracetesting/Dockerfile b/test/tracetesting/Dockerfile index 242c995f42..392f3d986c 100644 --- a/test/tracetesting/Dockerfile +++ b/test/tracetesting/Dockerfile @@ -7,7 +7,7 @@ FROM alpine WORKDIR /app RUN apk --update add bash jq curl -RUN curl -L https://raw.githubusercontent.com/kubeshop/tracetest/main/install-cli.sh | bash -s -- v0.13.10 +RUN curl -L https://raw.githubusercontent.com/kubeshop/tracetest/main/install-cli.sh | bash -s -- ${TRACETEST_IMAGE_VERSION} WORKDIR /app/test/tracetesting