Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

splitting up services into modules #872

Merged
merged 18 commits into from
Jul 10, 2023
Merged

splitting up services into modules #872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
80e3d1f
WIP splitting up services
joshleecreates May 2, 2023
7c50b4d
Merge remote-tracking branch 'upstream/main' into multiple-docker-com…
puckpuck May 10, 2023
be07733
send to kafka only if defined
puckpuck May 10, 2023
44ed85e
only check featureflag if env is defined
puckpuck May 10, 2023
1857137
split featureflag and kafka services
puckpuck May 10, 2023
f30cd09
Merge branch 'main' into multiple-docker-compose-files
puckpuck May 13, 2023
70de5d7
remove feature flag env var
joshleecreates May 14, 2023
66250cc
remove extra definitions in test file
joshleecreates May 14, 2023
77c32dc
split out observability
puckpuck May 20, 2023
8e14717
set recommendation resources based on flag
puckpuck May 20, 2023
458ffc4
add start/stop scripts
puckpuck May 20, 2023
5878814
split modules
puckpuck May 20, 2023
aa0e54c
split into modules
puckpuck May 20, 2023
f50a050
allows `docker compose up` for full
joshleecreates Jun 26, 2023
a8a1b3b
Merge branch 'main' into multiple-docker-compose-files
puckpuck Jul 9, 2023
73047d4
default full demo, optional minimal mode
puckpuck Jul 9, 2023
eb2a034
default full demo, optional minimal mode
puckpuck Jul 9, 2023
d1ef92b
Merge branch 'main' into multiple-docker-compose-files
austinlparker Jul 10, 2023
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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