Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ the release.

## Unreleased

* [docker] add support for "full" and "minimal" docker profiles
* [accounting] fix memory leak with dbcontext
([#2876](https://github.com/open-telemetry/opentelemetry-demo/pull/2876))
* [chore] Upgrade OTel Collector to v0.145.0 with :warning: breaking change:
Expand Down
15 changes: 7 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,12 @@ clean-images:

.PHONY: run-tests
run-tests:
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose-tests.yml run frontendTests
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose-tests.yml run traceBasedTests
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f compose.full.yaml -f docker-compose-tests.yml --profile full run frontendTests
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f compose.full.yaml -f docker-compose-tests.yml --profile full run traceBasedTests

.PHONY: run-tracetesting
run-tracetesting:
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose-tests.yml run traceBasedTests ${SERVICES_TO_TEST}
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f compose.full.yaml -f docker-compose-tests.yml --profile full run traceBasedTests ${SERVICES_TO_TEST}

.PHONY: generate-protobuf
generate-protobuf:
Expand Down Expand Up @@ -210,7 +210,7 @@ check-clean-work-tree:

.PHONY: start
start:
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) up --force-recreate --remove-orphans --detach
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f compose.yaml -f compose.full.yaml --profile full up --force-recreate --remove-orphans --detach
@echo ""
@echo "OpenTelemetry Demo is running."
@echo "Go to http://localhost:8080 for the demo UI."
Expand All @@ -221,19 +221,18 @@ start:

.PHONY: start-minimal
start-minimal:
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose.minimal.yml up --force-recreate --remove-orphans --detach
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) --profile minimal up --force-recreate --remove-orphans --detach
@echo ""
@echo "OpenTelemetry Demo in minimal mode 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 https://opentelemetry.io/docs/demo/feature-flags/ to learn how to change feature flags."

.PHONY: stop
stop:
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) down --remove-orphans --volumes
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose-tests.yml down --remove-orphans --volumes
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f compose.yaml -f compose.full.yaml down --remove-orphans --volumes
$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f compose.yaml -f compose.full.yaml -f docker-compose-tests.yml --profile full down --remove-orphans --volumes
@echo ""
@echo "OpenTelemetry Demo is stopped."

Expand Down
28 changes: 28 additions & 0 deletions compose.full.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

# YAML anchor for services that depend on Kafka
# This template can be reused with
# <<: *kafka-service
# to avoid duplication
x-kafka-service: &kafka-service
depends_on:
kafka:
condition: service_healthy
environment:
- KAFKA_ADDR=${KAFKA_HOST}:${KAFKA_PORT}

services:
accounting:
<<: *kafka-service

checkout:
<<: *kafka-service

fraud-detection:
<<: *kafka-service

frontend-proxy:
depends_on:
load-generator:
condition: service_started
Loading
Loading