Upstream updates

.env

@@ -8,10 +8,10 @@ ENV_PLATFORM=local
 
 # OpenTelemetry Collector
 OTEL_COLLECTOR_HOST=otelcol
-OTEL_COLLECTOR_PORT=4317
-OTEL_COLLECTOR_HEALTH_CHECK_PORT=1313
-OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT}
-PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4318/v1/traces
+OTEL_COLLECTOR_PORT_GRPC=4317
+OTEL_COLLECTOR_PORT_HTTP=4318
+OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
+PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/oltp-http/v1/traces
 
 # OpenTelemetry Resource Definitions
 OTEL_RESOURCE_ATTRIBUTES="service.namespace=opentelemetry-demo"
@@ -43,7 +43,7 @@ EMAIL_SERVICE_PORT=6060
 EMAIL_SERVICE_ADDR=http://emailservice:${EMAIL_SERVICE_PORT}
 
 # Feature Flag Service
-FEATURE_FLAG_SERVICE_PORT=8881
+FEATURE_FLAG_SERVICE_PORT=8081
 FEATURE_FLAG_SERVICE_ADDR=featureflagservice:${FEATURE_FLAG_SERVICE_PORT}
 FEATURE_FLAG_SERVICE_HOST=feature-flag-service
 FEATURE_FLAG_GRPC_SERVICE_PORT=50053

.github/workflows/build-images.yml

@@ -0,0 +1,133 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+on:
+  workflow_call:
+    inputs:
+      push:
+        description: Should the images be pushed
+        default: false
+        required: false
+        type: boolean
+      version:
+        description: The version used when tagging the image
+        default: dev
+        required: false
+        type: string
+
+jobs:
+  build_and_push_images:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    env:
+      RELEASE_VERSION: "${{ github.event.release.tag_name }}"
+      DOCKERHUB_REPO: "otel/demo"
+      GHCR_REPO: "ghcr.io/open-telemetry/demo"
+
+    strategy:
+      fail-fast: false
+      matrix:
+        file_tag:
+          - file: ./src/adservice/Dockerfile
+            tag_suffix: adservice
+            context: ./
+          - file: ./src/cartservice/src/Dockerfile
+            tag_suffix: cartservice
+            context: ./
+          - file: ./src/checkoutservice/Dockerfile
+            tag_suffix: checkoutservice
+            context: ./
+          - file: ./src/currencyservice/Dockerfile
+            tag_suffix: currencyservice
+            context: ./src/currencyservice
+          - file: ./src/emailservice/Dockerfile
+            tag_suffix: emailservice
+            context: ./src/emailservice
+          # TODO: https://github.com/open-telemetry/opentelemetry-demo/issues/956
+          # - file: ./src/featureflagservice/Dockerfile
+          #   tag_suffix: featureflagservice
+          #   context: ./
+          - file: ./src/frontend/Dockerfile
+            tag_suffix: frontend
+            context: ./
+          - file: ./src/frontendproxy/Dockerfile
+            tag_suffix: frontendproxy
+            context: ./
+          - file: ./src/loadgenerator/Dockerfile
+            tag_suffix: loadgenerator
+            context: ./
+          - file: ./src/paymentservice/Dockerfile
+            tag_suffix: paymentservice
+            context: ./
+          - file: ./src/productcatalogservice/Dockerfile
+            tag_suffix: productcatalogservice
+            context: ./
+          - file: ./src/quoteservice/Dockerfile
+            tag_suffix: quoteservice
+            context: ./
+          - file: ./src/shippingservice/Dockerfile
+            tag_suffix: shippingservice
+            context: ./
+          - file: ./src/recommendationservice/Dockerfile
+            tag_suffix: recommendationservice
+            context: ./
+          - file: ./src/kafka/Dockerfile
+            tag_suffix: kafka
+            context: ./
+          - file: ./src/accountingservice/Dockerfile
+            tag_suffix: accountingservice
+            context: ./
+          - file: ./src/frauddetectionservice/Dockerfile
+            tag_suffix: frauddetectionservice
+            context: ./
+          - file: ./src/frontend/Dockerfile.cypress
+            tag_suffix: frontend-tests
+            context: ./
+          - file: ./test/Dockerfile
+            tag_suffix: integrationTests
+            context: ./
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Log in to the Container registry
+        uses: docker/#-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+        if: ${{ inputs.push }}
+
+      - name: Log in to Docker Hub
+        uses: docker/#-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+        if: ${{ inputs.push }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          config-inline: |
+            [worker.oci]
+              max-parallelism = 2
+
+      - name: Matrix Build and push demo images
+        uses: docker/build-push-action@v3.3.0
+        with:
+          context: ${{ matrix.file_tag.context }}
+          file: ${{ matrix.file_tag.file }}
+          platforms: linux/amd64,linux/arm64
+          push: ${{ inputs.push }}
+          tags: |
+            ${{ env.DOCKERHUB_REPO }}:${{ inputs.version }}-${{matrix.file_tag.tag_suffix }}
+            ${{ env.GHCR_REPO }}:${{ inputs.version }}-${{ matrix.file_tag.tag_suffix }}
+          cache-from: type=gha
+          cache-to: type=gha

.github/workflows/checks.yml

@@ -7,6 +7,9 @@ on:
     branches: [ main ]
 
 jobs:
+  build_images:
+    uses: ./.github/workflows/build-images.yml
+
   markdownlint:
     runs-on: ubuntu-latest
     steps:

.github/workflows/release.yml

@@ -8,116 +8,7 @@ on:
 
 jobs:
   build_and_push_images:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    env:
-      RELEASE_VERSION: "${{ github.event.release.tag_name }}"
-      DOCKERHUB_REPO: "otel/demo"
-      GHCR_REPO: "ghcr.io/open-telemetry/demo"
-
-    strategy:
-      matrix:
-        file_tag:
-          - file: ./src/adservice/Dockerfile
-            tag_suffix: adservice
-            context: ./
-          - file: ./src/cartservice/src/Dockerfile
-            tag_suffix: cartservice
-            context: ./
-          - file: ./src/checkoutservice/Dockerfile
-            tag_suffix: checkoutservice
-            context: ./
-          - file: ./src/currencyservice/Dockerfile
-            tag_suffix: currencyservice
-            context: ./src/currencyservice
-          - file: ./src/emailservice/Dockerfile
-            tag_suffix: emailservice
-            context: ./src/emailservice
-          - file: ./src/featureflagservice/Dockerfile
-            tag_suffix: featureflagservice
-            context: ./
-          - file: ./src/frontend/Dockerfile
-            tag_suffix: frontend
-            context: ./
-          - file: ./src/frontendproxy/Dockerfile
-            tag_suffix: frontendproxy
-            context: ./
-          - file: ./src/loadgenerator/Dockerfile
-            tag_suffix: loadgenerator
-            context: ./
-          - file: ./src/paymentservice/Dockerfile
-            tag_suffix: paymentservice
-            context: ./
-          - file: ./src/productcatalogservice/Dockerfile
-            tag_suffix: productcatalogservice
-            context: ./
-          - file: ./src/quoteservice/Dockerfile
-            tag_suffix: quoteservice
-            context: ./
-          - file: ./src/shippingservice/Dockerfile
-            tag_suffix: shippingservice
-            context: ./
-          - file: ./src/recommendationservice/Dockerfile
-            tag_suffix: recommendationservice
-            context: ./
-          - file: ./src/kafka/Dockerfile
-            tag_suffix: kafka
-            context: ./
-          - file: ./src/accountingservice/Dockerfile
-            tag_suffix: accountingservice
-            context: ./
-          - file: ./src/frauddetectionservice/Dockerfile
-            tag_suffix: frauddetectionservice
-            context: ./
-          - file: ./src/frontend/Dockerfile.cypress
-            tag_suffix: frontend-tests
-            context: ./
-          - file: ./test/Dockerfile
-            tag_suffix: integrationTests
-            context: ./
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Log in to the Container registry
-        uses: docker/#-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-        if: github.event_name != 'pull_request'
-
-      - name: Log in to Docker Hub
-        uses: docker/#-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-        if: github.event_name != 'pull_request'
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          config-inline: |
-            [worker.oci]
-              max-parallelism = 2
-
-      - name: Matrix Build and push demo images
-        uses: docker/build-push-action@v3.3.0
-        with:
-          context: ${{ matrix.file_tag.context }}
-          file: ${{ matrix.file_tag.file }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: |
-            ${{ env.DOCKERHUB_REPO }}:${{ env.RELEASE_VERSION || 'pr' }}-${{matrix.file_tag.tag_suffix }}
-            ${{ env.GHCR_REPO }}:${{ env.RELEASE_VERSION || 'pr' }}-${{ matrix.file_tag.tag_suffix }}
-          cache-from: type=gha
-          cache-to: type=gha
+    uses: ./.github/workflows/build-images.yml
+    with:
+      push: true
+      version: ${{ github.event.release.tag_name }}"

CHANGELOG.md

@@ -45,6 +45,10 @@ 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))
 
 ## 1.4.0
 

Makefile

@@ -94,6 +94,10 @@ build-env-file:
 run-tests:
 	docker compose run frontendTests
 	docker compose run integrationTests
+	docker compose run traceBasedTests
+
+run-tracetesting:
+	docker compose run traceBasedTests
 
 .PHONY: generate-protobuf
 generate-protobuf:
@@ -107,3 +111,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."