Rebase upstream 1.11.1

.env

@@ -1,74 +1,92 @@
 
 
 # Demo App version
-IMAGE_VERSION=1.7.2
+IMAGE_VERSION=1.11.0
 IMAGE_NAME=ghcr.io/open-telemetry/demo
+DEMO_VERSION=latest
 
 # Dependent images
-COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.93.0
-GRAFANA_IMAGE=grafana/grafana:10.3.1
-JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.53
-OPENSEARCH_IMAGE=opensearchproject/opensearch:2.11.1
-POSTGRES_IMAGE=postgres:16.1
-PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.49.1
-REDIS_IMAGE=redis:7.2-alpine
-TRACETEST_IMAGE_VERSION=v0.14.5
-TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}
+COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.105.0
+FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.11.1
+GRAFANA_IMAGE=grafana/grafana:11.1.1
+JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.59
+# must also update version field in ./src/grafana/provisioning/datasources/opensearch.yaml
+OPENSEARCH_IMAGE=opensearchproject/opensearch:2.15.0
+POSTGRES_IMAGE=postgres:16.3
+PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.53.1
+VALKEY_IMAGE=valkey/valkey:7.2-alpine
+# must also update the version arg in ./test/tracetesting/Dockerfile
+TRACETEST_IMAGE=kubeshop/tracetest:v1.4.2
 
 # Demo Platform
 ENV_PLATFORM=local
 
 # OpenTelemetry Collector
+HOST_FILESYSTEM=/
+DOCKER_SOCK=/var/run/docker.sock
 OTEL_COLLECTOR_HOST=otelcol
 OTEL_COLLECTOR_PORT_GRPC=4317
 OTEL_COLLECTOR_PORT_HTTP=4318
+OTEL_COLLECTOR_CONFIG=./src/otelcollector/otelcol-config.yml
+OTEL_COLLECTOR_CONFIG_EXTRAS=./src/otelcollector/otelcol-config-extras.yml
 OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
 PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/otlp-http/v1/traces
 
 # OpenTelemetry Resource Definitions
-OTEL_RESOURCE_ATTRIBUTES="service.namespace=opentelemetry-demo"
+OTEL_RESOURCE_ATTRIBUTES=service.namespace=opentelemetry-demo,service.version=${IMAGE_VERSION}
 
 # Metrics Temporality
 OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE=cumulative
 
 # ******************
 # Core Demo Services
 # ******************
+# Accounting Service
+ACCOUNTING_SERVICE_DOCKERFILE=./src/accountingservice/Dockerfile
+
 # Ad Service
 AD_SERVICE_PORT=9555
 AD_SERVICE_ADDR=adservice:${AD_SERVICE_PORT}
+AD_SERVICE_DOCKERFILE=./src/adservice/Dockerfile
 
 # Cart Service
 CART_SERVICE_PORT=7070
 CART_SERVICE_ADDR=cartservice:${CART_SERVICE_PORT}
+CART_SERVICE_DOCKERFILE=./src/cartservice/src/Dockerfile
 
 # Checkout Service
 CHECKOUT_SERVICE_PORT=5050
 CHECKOUT_SERVICE_ADDR=checkoutservice:${CHECKOUT_SERVICE_PORT}
+CHECKOUT_SERVICE_DOCKERFILE=./src/checkoutservice/Dockerfile
 
 # Currency Service
 CURRENCY_SERVICE_PORT=7001
 CURRENCY_SERVICE_ADDR=currencyservice:${CURRENCY_SERVICE_PORT}
+CURRENCY_SERVICE_DOCKERFILE=./src/currencyservice/Dockerfile
 
 # Email Service
 EMAIL_SERVICE_PORT=6060
 EMAIL_SERVICE_ADDR=http://emailservice:${EMAIL_SERVICE_PORT}
+EMAIL_SERVICE_DOCKERFILE=./src/emailservice/Dockerfile
 
-# Feature Flag Service
-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
-FEATURE_FLAG_GRPC_SERVICE_ADDR=featureflagservice:${FEATURE_FLAG_GRPC_SERVICE_PORT}
+# Fraud Service
+FRAUD_SERVICE_DOCKERFILE=./src/frauddetectionservice/Dockerfile
 
 # Frontend
 FRONTEND_PORT=8080
 FRONTEND_ADDR=frontend:${FRONTEND_PORT}
+FRONTEND_DOCKERFILE=./src/frontend/Dockerfile
 
 # Frontend Proxy (Envoy)
 FRONTEND_HOST=frontend
 ENVOY_PORT=8080
 FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
+FRONTEND_PROXY_DOCKERFILE=./src/frontendproxy/Dockerfile
+
+# Image Provider
+IMAGE_PROVIDER_HOST=imageprovider
+IMAGE_PROVIDER_PORT=8081
+IMAGE_PROVIDER_DOCKERFILE=./src/imageprovider/Dockerfile
 
 # Load Generator
 LOCUST_WEB_PORT=8089
@@ -77,37 +95,48 @@ LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
 LOCUST_WEB_HOST=loadgenerator
 LOCUST_AUTOSTART=true
 LOCUST_HEADLESS=false
+LOAD_GENERATOR_DOCKERFILE=./src/loadgenerator/Dockerfile
 
 # Payment Service
 PAYMENT_SERVICE_PORT=50051
 PAYMENT_SERVICE_ADDR=paymentservice:${PAYMENT_SERVICE_PORT}
+PAYMENT_SERVICE_DOCKERFILE=./src/paymentservice/Dockerfile
 
 # Product Catalog Service
 PRODUCT_CATALOG_SERVICE_PORT=3550
 PRODUCT_CATALOG_SERVICE_ADDR=productcatalogservice:${PRODUCT_CATALOG_SERVICE_PORT}
+PRODUCT_CATALOG_DOCKERFILE=./src/productcatalogservice/Dockerfile
 
 # Quote Service
 QUOTE_SERVICE_PORT=8090
 QUOTE_SERVICE_ADDR=http://quoteservice:${QUOTE_SERVICE_PORT}
+QUOTE_SERVICE_DOCKERFILE=./src/quoteservice/Dockerfile
 
 # Recommendation Service
 RECOMMENDATION_SERVICE_PORT=9001
 RECOMMENDATION_SERVICE_ADDR=recommendationservice:${RECOMMENDATION_SERVICE_PORT}
+RECOMMENDATION_SERVICE_DOCKERFILE=./src/recommendationservice/Dockerfile
 
 # Shipping Service
 SHIPPING_SERVICE_PORT=50050
 SHIPPING_SERVICE_ADDR=shippingservice:${SHIPPING_SERVICE_PORT}
+SHIPPING_SERVICE_DOCKERFILE=./src/shippingservice/Dockerfile
 
 # ******************
 # Dependent Services
 # ******************
+# flagd
+FLAGD_HOST=flagd
+FLAGD_PORT=8013
+
 # Kafka
 KAFKA_SERVICE_PORT=9092
 KAFKA_SERVICE_ADDR=kafka:${KAFKA_SERVICE_PORT}
+KAFKA_SERVICE_DOCKERFILE=./src/kafka/Dockerfile
 
-# Redis
-REDIS_PORT=6379
-REDIS_ADDR=redis-cart:${REDIS_PORT}
+# Valkey
+VALKEY_PORT=6379
+VALKEY_ADDR=valkey-cart:${VALKEY_PORT}
 
 # ********************
 # Telemetry Components

.env.override

@@ -0,0 +1,2 @@
+# DO NOT PUSH CHANGES OF THIS FILE TO opentelemetry/opentelemetry-demo
+# PLACE YOUR .env ENVIRONMENT VARIABLES OVERRIDES IN THIS FILE

.github/workflows/build-images.yml

@@ -1,179 +1,14 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
+name: Test image generation
 
 on:
   push:
     paths:
       - 'src/**'
       - 'test/**'
-  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: ./
-            setup-qemu: true
-          - file: ./src/cartservice/src/Dockerfile
-            tag_suffix: cartservice
-            context: ./
-            setup-qemu: false
-          - file: ./src/checkoutservice/Dockerfile
-            tag_suffix: checkoutservice
-            context: ./
-            setup-qemu: true
-          - file: ./src/currencyservice/Dockerfile
-            tag_suffix: currencyservice
-            context: ./src/currencyservice
-            setup-qemu: true
-          - file: ./src/emailservice/Dockerfile
-            tag_suffix: emailservice
-            context: ./src/emailservice
-            setup-qemu: true
-          - file: ./src/ffspostgres/Dockerfile
-            tag_suffix: ffspostgres
-            context: ./
-            setup-qemu: true
-          # NOTE:
-          # https://github.com/open-telemetry/opentelemetry-demo/issues/956
-          # Until dedicated ARM runners are available for GHA we cannot upgrade
-          # OTP/Elixir versions. Please do not change the OTP/Elixir versions.
-          - file: ./src/featureflagservice/Dockerfile
-            tag_suffix: featureflagservice
-            context: ./
-            setup-qemu: true
-          - file: ./src/frontend/Dockerfile
-            tag_suffix: frontend
-            context: ./
-            setup-qemu: true
-          - file: ./src/frontendproxy/Dockerfile
-            tag_suffix: frontendproxy
-            context: ./
-            setup-qemu: true
-          - file: ./src/loadgenerator/Dockerfile
-            tag_suffix: loadgenerator
-            context: ./
-            setup-qemu: true
-          - file: ./src/paymentservice/Dockerfile
-            tag_suffix: paymentservice
-            context: ./
-            setup-qemu: true
-          - file: ./src/productcatalogservice/Dockerfile
-            tag_suffix: productcatalogservice
-            context: ./
-            setup-qemu: true
-          - file: ./src/quoteservice/Dockerfile
-            tag_suffix: quoteservice
-            context: ./
-            setup-qemu: true
-          - file: ./src/shippingservice/Dockerfile
-            tag_suffix: shippingservice
-            context: ./
-            setup-qemu: true
-          - file: ./src/recommendationservice/Dockerfile
-            tag_suffix: recommendationservice
-            context: ./
-            setup-qemu: true
-          - file: ./src/kafka/Dockerfile
-            tag_suffix: kafka
-            context: ./
-            setup-qemu: true
-          - file: ./src/accountingservice/Dockerfile
-            tag_suffix: accountingservice
-            context: ./
-            setup-qemu: true
-          - file: ./src/frauddetectionservice/Dockerfile
-            tag_suffix: frauddetectionservice
-            context: ./
-            setup-qemu: true
-          - file: ./src/frontend/Dockerfile.cypress
-            tag_suffix: frontend-tests
-            context: ./
-            setup-qemu: true
-          - file: ./test/Dockerfile
-            tag_suffix: integrationTests
-            context: ./
-            setup-qemu: true
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Check for changes and set push options
-        id: check_changes
-        run: |
-          DOCKERFILE_DIR=$(dirname ${{ matrix.file_tag.file }})
-          FILES_CHANGED=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }} -- $DOCKERFILE_DIR)
-          FORCE_PUSH=${{ inputs.push }}
-          if [ "$FORCE_PUSH" = true ]; then
-            echo "Force push is enabled, proceeding with build."
-            echo "skip=false" >> "$GITHUB_OUTPUT"
-          elif [ -z "$FILES_CHANGED" ]; then
-            echo "No changes in ${{ matrix.file_tag.context }}, skipping build."
-            echo "skip=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "Changes detected in ${{ matrix.file_tag.context }}, proceeding with build."
-            echo "skip=false" >> "$GITHUB_OUTPUT"
-          fi
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ inputs.push }}
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-        if: ${{ inputs.push }}
-      - name: Set up QEMU
-        if: ${{ matrix.file_tag.setup-qemu }}
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:master
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          config-inline: |
-            [worker.oci]
-            max-parallelism = 2
-      - name: Matrix Build and push demo images
-        if: steps.check_changes.outputs.skip == 'false'
-        uses: docker/build-push-action@v5.0.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
+  build_images:
+    if: github.repository == 'open-telemetry/opentelemetry-demo'
+    uses: ./.github/workflows/component-build-images.yml

.github/workflows/checks.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   build_images:
-    uses: ./.github/workflows/build-images.yml
+    uses: ./.github/workflows/component-build-images.yml
     with:
       push: false
       version: 'dev'