Merge from upstream up to c44af53

Merge upstream up to c44af53

Author: girodav

.env

@@ -1,30 +1,32 @@
-
-
 # Demo App version
-IMAGE_VERSION=2.0.2
+IMAGE_VERSION=2.1.3
 IMAGE_NAME=ghcr.io/open-telemetry/demo
 DEMO_VERSION=latest
 
 # Build Args
 TRACETEST_IMAGE_VERSION=v1.7.1
-OTEL_JAVA_AGENT_VERSION=2.13.3
-OPENTELEMETRY_CPP_VERSION=1.19.0
+OTEL_JAVA_AGENT_VERSION=2.20.1
+OPENTELEMETRY_CPP_VERSION=1.23.0
 
 # Dependent images
-COLLECTOR_CONTRIB_IMAGE=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.120.0
-FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.12.1
-GRAFANA_IMAGE=grafana/grafana:11.5.2
-JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.66.0
+COLLECTOR_CONTRIB_IMAGE=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.133.0
+FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.12.8
+GRAFANA_IMAGE=grafana/grafana:12.2.0
+JAEGERTRACING_IMAGE=jaegertracing/jaeger:2.10.0
 # must also update version field in src/grafana/provisioning/datasources/opensearch.yaml
-OPENSEARCH_IMAGE=opensearchproject/opensearch:2.19.0
-POSTGRES_IMAGE=postgres:17.3
-PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v3.2.0
-VALKEY_IMAGE=valkey/valkey:8.1-alpine
+OPENSEARCH_IMAGE=opensearchproject/opensearch:3.2.0
+OPENSEARCH_DOCKERFILE=./src/opensearch/Dockerfile
+POSTGRES_IMAGE=postgres:17.6 # used only for TraceTest
+PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v3.5.0
+VALKEY_IMAGE=valkey/valkey:8.1.3-alpine
 TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}
 
 # Demo Platform
 ENV_PLATFORM=local
 
+# IPv6 Flag control
+IPV6_ENABLED=false
+
 # OpenTelemetry Collector
 HOST_FILESYSTEM=/
 DOCKER_SOCK=/var/run/docker.sock
@@ -82,8 +84,10 @@ FRONTEND_ADDR=frontend:${FRONTEND_PORT}
 FRONTEND_DOCKERFILE=./src/frontend/Dockerfile
 
 # Frontend Proxy (Envoy)
-FRONTEND_HOST=frontend
+ENVOY_ADDR=0.0.0.0
 ENVOY_PORT=8080
+ENVOY_ADMIN_PORT=10000
+FRONTEND_HOST=frontend
 FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
 FRONTEND_PROXY_DOCKERFILE=./src/frontend-proxy/Dockerfile
 
@@ -124,7 +128,7 @@ RECOMMENDATION_DOCKERFILE=./src/recommendation/Dockerfile
 
 # Shipping Service
 SHIPPING_PORT=50050
-SHIPPING_ADDR=shipping:${SHIPPING_PORT}
+SHIPPING_ADDR=http://shipping:${SHIPPING_PORT}
 SHIPPING_DOCKERFILE=./src/shipping/Dockerfile
 
 # ******************
@@ -142,13 +146,21 @@ FLAGD_UI_DOCKERFILE=./src/flagd-ui/Dockerfile
 
 # Kafka
 KAFKA_PORT=9092
-KAFKA_ADDR=kafka:${KAFKA_PORT}
+KAFKA_HOST=kafka
+KAFKA_ADDR=${KAFKA_HOST}:${KAFKA_PORT}
 KAFKA_DOCKERFILE=./src/kafka/Dockerfile
 
 # Valkey
 VALKEY_PORT=6379
 VALKEY_ADDR=valkey-cart:${VALKEY_PORT}
 
+# Postgres
+POSTGRES_HOST=postgresql
+POSTGRES_PORT=5432
+POSTGRES_DB=otel
+POSTGRES_PASSWORD=otel
+POSTGRES_DOCKERFILE=./src/postgres/Dockerfile
+
 # ********************
 # Telemetry Components
 # ********************
@@ -157,8 +169,9 @@ GRAFANA_PORT=3000
 GRAFANA_HOST=grafana
 
 # Jaeger
-JAEGER_PORT=16686
 JAEGER_HOST=jaeger
+JAEGER_UI_PORT=16686
+JAEGER_GRPC_PORT=4317
 
 # Prometheus
 PROMETHEUS_PORT=9090

.github/ISSUE_TEMPLATE/bug_report.md

@@ -36,3 +36,5 @@ We will close this issue if:
 ## Additional Context
 
 Please feel free to add any other context about the problem here.
+
+<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/ISSUE_TEMPLATE/feature_request.md

@@ -27,3 +27,5 @@ Which alternative solutions or features have you considered?
 ## Additional Context
 
 Feel free to add any other context about the feature request here.
+
+<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/ISSUE_TEMPLATE/question.md

@@ -7,3 +7,5 @@ labels: question
 # Question
 
 Use [Github Discussions](https://github.com/open-telemetry/opentelemetry-demo/discussions/).
+
+<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/dependabot.yml

@@ -52,7 +52,7 @@ updates:
       interval: "daily"
   - package-ecosystem: "npm"
     directories:
-      - "/src/flagd-ui/*"
+      - "/"
       - "/src/frontend/*"
       - "/src/payment/*"
     groups:
@@ -62,3 +62,29 @@ updates:
         dependency-type: "development"
     schedule:
       interval: "daily"
+  - package-ecosystem: "cargo"
+    directories:
+      - "/src/shipping/*"
+    groups:
+      cargo-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "bundler"
+    directories:
+      - "/src/email/*"
+    groups:
+      bundler-production-dependencies:
+        dependency-type: "production"
+      bundler-development-dependencies:
+        dependency-type: "development"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "mix"
+    directories:
+      - "/src/flagd-ui/*"
+    groups:
+      mix-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"

.github/workflows/assign-reviewers.yml

@@ -10,8 +10,13 @@ on:
   # because repository write permission is needed to assign reviewers
   pull_request_target:
 
+permissions:
+  contents: read
+
 jobs:
   assign-reviewers:
+    permissions:
+      pull-requests: write  # required for assigning reviewers to PRs
     if: github.repository == 'open-telemetry/opentelemetry-demo'
     runs-on: ubuntu-latest
     steps:

.github/workflows/build-images.yml

@@ -8,7 +8,13 @@ on:
       - 'src/**'
       - 'test/**'
 
+permissions:
+  contents: read
+
 jobs:
   build_images:
+    permissions:
+      contents: read
+      packages: write
     if: github.repository == 'open-telemetry/opentelemetry-demo'
     uses: ./.github/workflows/component-build-images.yml

.github/workflows/checks.yml

@@ -9,8 +9,14 @@ on:
     branches: [main]
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   build_images:
+    permissions: # required by the reusable workflow
+      contents: read
+      packages: write
     uses: ./.github/workflows/component-build-images.yml
     with:
       push: false
@@ -20,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: install dependencies
         run: npm install
       - name: run markdownlint
@@ -30,8 +36,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: check out code
-        uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+        uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.x'
       - name: install yamllint
@@ -43,15 +49,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: run misspell
         run: make misspell
 
   checklinks:
     name: linkspector
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Run linkspector
         uses: umbrelladocs/action-linkspector@v1
         with:
@@ -62,15 +68,15 @@ jobs:
   sanity:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: run sanitycheck.py
         run: python3 ./internal/tools/sanitycheck.py
 
   checklicense:
     runs-on: ubuntu-latest
     steps:
       - name: check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: install tools
         run: make install-tools
       - name: run checklicense

.github/workflows/component-build-images.yml

@@ -25,12 +25,15 @@ on:
         required: false
         type: string
 
+permissions:
+  contents: read
+
 jobs:
   protobufcheck:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Generate
         run: make clean docker-generate-protobuf
       - name: Check Clean Work Tree
@@ -75,6 +78,10 @@ jobs:
             tag_suffix: email
             context: ./
             setup-qemu: true
+          - file: ./src/flagd-ui/Dockerfile
+            tag_suffix: flagd-ui
+            context: ./
+            setup-qemu: true
           - file: ./src/fraud-detection/Dockerfile
             tag_suffix: fraud-detection
             context: ./
@@ -103,10 +110,18 @@ jobs:
             tag_suffix: load-generator
             context: ./
             setup-qemu: true
+          - file: ./src/opensearch/Dockerfile
+            tag_suffix: opensearch
+            context: ./
+            setup-qemu: true
           - file: ./src/payment/Dockerfile
             tag_suffix: payment
             context: ./
             setup-qemu: true
+          - file: ./src/postgres/Dockerfile
+            tag_suffix: postgresql
+            context: ./
+            setup-qemu: true
           - file: ./src/product-catalog/Dockerfile
             tag_suffix: product-catalog
             context: ./
@@ -123,17 +138,13 @@ jobs:
             tag_suffix: shipping
             context: ./
             setup-qemu: true
-          - file: ./src/flagd-ui/Dockerfile
-            tag_suffix: flagd-ui
-            context: ./
-            setup-qemu: true
           - file: ./test/tracetesting/Dockerfile
             tag_suffix: traceBasedTests
             context: ./
             setup-qemu: true
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Load environment variables from .env file
@@ -189,7 +200,7 @@ jobs:
             max-parallelism = 2
       - name: Matrix Build and push demo images
         if: steps.check_changes.outputs.skip == 'false'
-        uses: docker/build-push-action@v6.15.0
+        uses: docker/build-push-action@v6.18.0
         with:
           context: ${{ matrix.file_tag.context }}
           file: ${{ matrix.file_tag.file }}

.github/workflows/component_build-images-elastic.yml

@@ -108,6 +108,10 @@ jobs:
             tag_suffix: traceBasedTests
             context: ./
             setup-qemu: true
+          - file: ./src/postgres/Dockerfile
+            tag_suffix: postgresql
+            context: ./
+            setup-qemu: true
 
     steps:
       - uses: actions/checkout@v4