Skip to content

Commit ca117a3

Browse files
authored
chore: add env var for pinning trace-based test tool version (open-telemetry#1239)
* chore: add env var for pinning tracetesting image version * chore: add odd profile and start command * chore: fix yamllint * chore: update changelog * chore: update makefile comments
1 parent 8a73251 commit ca117a3

File tree

5 files changed

+20
-2
lines changed

5 files changed

+20
-2
lines changed

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Images
44
IMAGE_VERSION=1.6.0
55
IMAGE_NAME=ghcr.io/open-telemetry/demo
6+
TRACETEST_IMAGE_VERSION=v0.14.5
67

78
# Demo Platform
89
ENV_PLATFORM=local

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ release.
77

88
## Unreleased
99

10+
* add env var for pinning trace-based test tool version
11+
([#1239](https://github.com/open-telemetry/opentelemetry-demo/pull/1239))
1012
* update PHP quoteservice to use 1.0.0
1113
([#1236](https://github.com/open-telemetry/opentelemetry-demo/pull/1236))
1214

Makefile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,19 @@ start-minimal:
137137
@echo "Go to http://localhost:8080/grafana/ for the Grafana UI."
138138
@echo "Go to http://localhost:8080/loadgen/ for the Load Generator UI."
139139

140+
# Observabilty-Driven Development (ODD)
141+
.PHONY: start-odd
142+
start-odd:
143+
docker compose --profile odd up --force-recreate --remove-orphans --detach
144+
@echo ""
145+
@echo "OpenTelemetry Demo is running."
146+
@echo "Go to http://localhost:8080 for the demo UI."
147+
@echo "Go to http://localhost:8080/jaeger/ui for the Jaeger UI."
148+
@echo "Go to http://localhost:8080/grafana/ for the Grafana UI."
149+
@echo "Go to http://localhost:8080/loadgen/ for the Load Generator UI."
150+
@echo "Go to http://localhost:8080/feature/ for the Feature Flag UI."
151+
@echo "Go to http://localhost:11633/ for the Tracetest Web UI."
152+
140153
.PHONY: stop
141154
stop:
142155
docker compose down --remove-orphans --volumes

docker-compose.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,11 +832,12 @@ services:
832832
condition: service_started
833833

834834
tracetest-server:
835-
image: kubeshop/tracetest:v0.14.5
835+
image: kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}
836836
platform: linux/amd64
837837
container_name: tracetest-server
838838
profiles:
839839
- tests
840+
- odd # Observabilty-Driven Development (ODD)
840841
volumes:
841842
- type: bind
842843
source: ./test/tracetesting/tracetest-config.yaml
@@ -865,6 +866,7 @@ services:
865866
container_name: tracetest-postgres
866867
profiles:
867868
- tests
869+
- odd # Observabilty-Driven Development (ODD)
868870
environment:
869871
POSTGRES_PASSWORD: postgres
870872
POSTGRES_USER: postgres

test/tracetesting/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM alpine
77
WORKDIR /app
88

99
RUN apk --update add bash jq curl
10-
RUN curl -L https://raw.githubusercontent.com/kubeshop/tracetest/main/install-cli.sh | bash -s -- v0.13.10
10+
RUN curl -L https://raw.githubusercontent.com/kubeshop/tracetest/main/install-cli.sh | bash -s -- ${TRACETEST_IMAGE_VERSION}
1111

1212
WORKDIR /app/test/tracetesting
1313

0 commit comments

Comments
 (0)