Skip to content

Commit

Permalink
chore: add env var for pinning trace-based test tool version (open-te…
Browse files Browse the repository at this point in the history
…lemetry#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
  • Loading branch information
adnanrahic authored Nov 14, 2023
1 parent b53d5bf commit 336d910
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 2 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
13 changes: 13 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -865,6 +866,7 @@ services:
container_name: tracetest-postgres
profiles:
- tests
- odd # Observabilty-Driven Development (ODD)
environment:
POSTGRES_PASSWORD: postgres
POSTGRES_USER: postgres
Expand Down
2 changes: 1 addition & 1 deletion test/tracetesting/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 336d910

Please sign in to comment.