Skip to content

Commit

Permalink
splitting up services into modules (open-telemetry#872)
Browse files Browse the repository at this point in the history
* WIP splitting up services

- splits up services into multiple docker files
- experiment with changing service definition for checkout service when kafka is enabled

todo:

[ ] fix checkout service to work without kafka
[ ] fix services that error without feature flag service
[ ] provide noop config for collector when observability backends are
disabled

* send to kafka only if defined

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* only check featureflag if env is defined

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* split featureflag and kafka services

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* remove feature flag env var

* remove extra definitions in test file

* split out observability

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* set recommendation resources based on flag

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* add start/stop scripts

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* split modules

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* split into modules

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* allows `docker compose up` for full

* default full demo, optional minimal mode

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* default full demo, optional minimal mode

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Austin Parker <austin@ap2.io>
  • Loading branch information
3 people authored and AlexanderWert committed Jul 24, 2023
1 parent 2bb4348 commit 864ec86
Show file tree
Hide file tree
Showing 11 changed files with 699 additions and 61 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ release.
([#935](https://github.com/open-telemetry/opentelemetry-demo/pull/935))
* [cartservice] update service to .NET 7
([#942](https://github.com/open-telemetry/opentelemetry-demo/pull/942))
* Introduce minimal mode to run demo
([#872](https://github.com/open-telemetry/opentelemetry-demo/pull/872))
* [frontendproxy]Envoy expose a route for the collector to route frontend spans
([#938](https://github.com/open-telemetry/opentelemetry-demo/pull/938))

Expand Down
27 changes: 27 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,30 @@ generate-kubernetes-manifests:
echo "# SPDX-License-Identifier: Apache-2.0" >> kubernetes/opentelemetry-demo.yaml
echo "# This file is generated by 'make generate-kubernetes-manifests'" >> kubernetes/opentelemetry-demo.yaml
helm template opentelemetry-demo open-telemetry/opentelemetry-demo --namespace otel-demo | sed '/helm.sh\/chart\:/d' | sed '/helm.sh\/hook/d' | sed '/managed-by\: Helm/d' >> kubernetes/opentelemetry-demo.yaml

.PHONY: start
start:
docker compose 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."

.PHONY: start-minimal
start-minimal:
docker compose -f docker-compose.minimal.yml 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."

.PHONY: stop
stop:
docker compose down --remove-orphans --volumes
@echo ""
@echo "OpenTelemetry Demo is stopped."
Loading

0 comments on commit 864ec86

Please sign in to comment.