Merge branch 'main' into ffs.add-probability-based-flags

# Conflicts:
#	CHANGELOG.md

.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

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))
 * Add ability to do probabilistic A/B testing with feature flags
   ([#1237](https://github.com/open-telemetry/opentelemetry-demo/pull/1237))
 * update PHP quoteservice to use 1.0.0

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

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

src/shippingservice/Dockerfile

@@ -44,7 +44,7 @@ ENV GRPC_HEALTH_PROBE_VERSION=v0.4.18
 RUN wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-${TARGETARCH} && \
     chmod +x /bin/grpc_health_probe
 
-FROM debian:bullseye-slim as release
+FROM debian:bookworm-slim as release
 
 WORKDIR /app
 COPY --from=builder /app/target/release/shippingservice /app/shippingservice

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