Merge branch 'main' into main-merge

* main: (138 commits) docs: update sig meeting schedule (open-telemetry#1567) chore(deps): upgrade otel collector contrib and opensearch (open-telemetry#1566) fix(loadgenerator): use add_hooks openfeature method (open-telemetry#1565) Revert "remove axoflow link (open-telemetry#1457)" (open-telemetry#1563) feat: configure feature flag tracing for Python services (open-telemetry#1553) chore(deps): upgrade go dependencies to latest versions (open-telemetry#1561) remove deprecated version property (open-telemetry#1557) chore(deps): upgrade otel collector contrib, grafana and prometheus (open-telemetry#1559) add imageprovider (open-telemetry#1552) [flagd] - upgrade to latest version and memory limits (open-telemetry#1554) update kubernetes manifest to 1.9.0 (open-telemetry#1555) [chore] specify default value for tracetest image version (open-telemetry#1551) improve baggage propagation (open-telemetry#1545) Bump gradle/wrapper-validation-action from 3.3.1 to 3.3.2 (open-telemetry#1548) [kafka][checkoutservice][frauddetectionservice] add kafkaQueueProblems featureflag (open-telemetry#1528) fix(productcatalogservice): handle err returned from openfeature.SetProvider func (open-telemetry#1535) feat(otelcol): add redisreceiver (open-telemetry#1537) chore(deps): upgrade opentelemetry-java-instrumentation for kafka to 2.3.0 (open-telemetry#1533) Bump gradle/wrapper-validation-action from 3.3.0 to 3.3.1 (open-telemetry#1539) chore(deps): upgrade opentelemetry-java-instrumentation to 2.3.0 (open-telemetry#1532) ... # Conflicts: # docker-compose.minimal.yml # src/frontend/package-lock.json
maxhakansson · May 10, 2024 · a8e5049 · a8e5049
2 parents 11e4141 + 3c665d3
commit a8e5049
Show file tree

Hide file tree

Showing 222 changed files with 8,435 additions and 25,364 deletions.
diff --git a/.env b/.env
@@ -1,9 +1,20 @@
 
 
-# Images
-IMAGE_VERSION=1.7.1
+# Demo App version
+IMAGE_VERSION=1.9.0
 IMAGE_NAME=ghcr.io/open-telemetry/demo
-TRACETEST_IMAGE_VERSION=v0.14.5
+DEMO_VERSION=latest
+
+# Dependent images
+COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.100.0
+GRAFANA_IMAGE=grafana/grafana:10.4.2
+JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.55
+# must also update version field in ./src/grafana/provisioning/datasources/opensearch.yml
+OPENSEARCH_IMAGE=opensearchproject/opensearch:2.13.0
+POSTGRES_IMAGE=postgres:16.2
+PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.51.2
+REDIS_IMAGE=redis:7.2-alpine
+TRACETEST_IMAGE=kubeshop/tracetest:v1.0.0
 
 # Demo Platform
 ENV_PLATFORM=local
@@ -44,13 +55,6 @@ CURRENCY_SERVICE_ADDR=currencyservice:${CURRENCY_SERVICE_PORT}
 EMAIL_SERVICE_PORT=6060
 EMAIL_SERVICE_ADDR=http://emailservice:${EMAIL_SERVICE_PORT}
 
-# 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}
-
 # Frontend
 FRONTEND_PORT=8080
 FRONTEND_ADDR=frontend:${FRONTEND_PORT}
@@ -60,6 +64,10 @@ FRONTEND_HOST=frontend
 ENVOY_PORT=8080
 FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
 
+# Image Provider
+IMAGE_PROVIDER_HOST=imageprovider
+IMAGE_PROVIDER_PORT=8081
+
 # Load Generator
 LOCUST_WEB_PORT=8089
 LOCUST_USERS=10
@@ -95,6 +103,10 @@ LOGIN_SERVICE_ADDR=http://loginservice:${LOGIN_SERVICE_PORT}
 # ******************
 # Dependent Services
 # ******************
+# flagd
+FLAGD_HOST=flagd
+FLAGD_PORT=8013
+
 # Kafka
 KAFKA_SERVICE_PORT=9092
 KAFKA_SERVICE_ADDR=kafka:${KAFKA_SERVICE_PORT}

diff --git a/.github/workflows/assign-reviewers.yml b/.github/workflows/assign-reviewers.yml
@@ -12,6 +12,7 @@ on:
 
 jobs:
   assign-reviewers:
+    if: github.repository == 'open-telemetry/opentelemetry-demo'
     runs-on: ubuntu-latest
     steps:
       - uses: dyladan/component-owners@main

diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -21,6 +21,7 @@ on:
 
 jobs:
   build_and_push_images:
+    if: github.repository == 'open-telemetry/opentelemetry-demo'
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -35,6 +36,10 @@ jobs:
       fail-fast: false
       matrix:
         file_tag:
+          - file: ./src/accountingservice/Dockerfile
+            tag_suffix: accountingservice
+            context: ./
+            setup-qemu: true
           - file: ./src/adservice/Dockerfile
             tag_suffix: adservice
             context: ./
@@ -49,18 +54,14 @@ jobs:
             setup-qemu: true
           - file: ./src/currencyservice/Dockerfile
             tag_suffix: currencyservice
-            context: ./src/currencyservice
+            context: ./
             setup-qemu: true
           - file: ./src/emailservice/Dockerfile
             tag_suffix: emailservice
             context: ./src/emailservice
             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
+          - file: ./src/frauddetectionservice/Dockerfile
+            tag_suffix: frauddetectionservice
             context: ./
             setup-qemu: true
           - file: ./src/frontend/Dockerfile
@@ -71,6 +72,18 @@ jobs:
             tag_suffix: frontendproxy
             context: ./
             setup-qemu: true
+          - file: ./src/frontend/Dockerfile.cypress
+            tag_suffix: frontend-tests
+            context: ./
+            setup-qemu: true
+          - file: ./src/imageprovider/Dockerfile
+            tag_suffix: imageprovider
+            context: ./
+            setup-qemu: true
+          - file: ./src/kafka/Dockerfile
+            tag_suffix: kafka
+            context: ./
+            setup-qemu: true
           - file: ./src/loadgenerator/Dockerfile
             tag_suffix: loadgenerator
             context: ./
@@ -87,32 +100,16 @@ jobs:
             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
+          - file: ./src/shippingservice/Dockerfile
+            tag_suffix: shippingservice
             context: ./
             setup-qemu: true
-          - file: ./test/Dockerfile
-            tag_suffix: integrationTests
+          - file: ./test/tracetesting/Dockerfile
+            tag_suffix: traceBasedTests
             context: ./
             setup-qemu: true
 
@@ -170,6 +167,8 @@ jobs:
           push: ${{ inputs.push }}
           tags: |
             ${{ env.DOCKERHUB_REPO }}:${{ inputs.version }}-${{matrix.file_tag.tag_suffix }}
+            ${{ env.DOCKERHUB_REPO }}:latest-${{matrix.file_tag.tag_suffix }}
             ${{ env.GHCR_REPO }}:${{ inputs.version }}-${{ matrix.file_tag.tag_suffix }}
+            ${{ env.GHCR_REPO }}:latest-${{ matrix.file_tag.tag_suffix }}
           cache-from: type=gha
           cache-to: type=gha
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -15,4 +15,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: gradle/wrapper-validation-action@v1.1.0
+      - uses: gradle/wrapper-validation-action@v3.3.2
diff --git a/.github/workflows/label-pr.yml b/.github/workflows/label-pr.yml
@@ -0,0 +1,60 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+# adds a label to a pull request if certain files are changed
+name: Label Pull Requests
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Check for changed files
+        id: file_changes
+        uses: dorny/paths-filter@v2
+        with:
+          list-files: shell
+          filters: |
+            docsUpdateRequired:
+              - 'src/flagd/**'
+            helmUpdateRequired:
+              - '.env'
+              - 'docker-compose*.yml'
+              - 'src/flagd/**'
+              - 'src/grafana/**'
+              - 'src/otelcollector/**'
+              - 'src/prometheus/**'
+
+      - name: "Add Label: docs-update-required"
+        if: steps.file_changes.outputs.docsUpdateRequired == 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const issue_number = context.issue.number;
+            github.rest.issues.addLabels({
+              issue_number: issue_number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['docs-update-required']
+            })
+
+      - name: "Add Label: helm-update-required"
+        if: steps.file_changes.outputs.helmUpdateRequired == 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const issue_number = context.issue.number;
+            github.rest.issues.addLabels({
+              issue_number: issue_number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['helm-update-required']
+            })
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
@@ -0,0 +1,17 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+name: Nightly Release
+
+on:
+  schedule:
+    # Runs at 00:00 UTC every day
+    - cron: '0 0 * * *'
+
+jobs:
+  build_and_push_images:
+    uses: ./.github/workflows/build-images.yml
+    if: github.repository == 'open-telemetry/opentelemetry-demo'
+    with:
+      push: true
+      version: nightly-${{ github.run_id }}
+    secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   build_and_push_images:
     uses: ./.github/workflows/build-images.yml
+    if: github.repository == 'open-telemetry/opentelemetry-demo'
     with:
       push: true
       version: ${{ github.event.release.tag_name }}

diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml
@@ -3,48 +3,18 @@
 name: Integration Tests
 
 on:
-  pull_request_target:
-    branches:
-      - main
-    types: [closed]
+  pull_request_review:
+    types:
+      - submitted
 
 jobs:
-  build_runner:
-    runs-on: ubuntu-latest
-    name: "Build Runner"
-    if: github.event.pull_request.merged == true
-    steps:
-      - name: metal-runner-action
-        uses: equinix-labs/[email protected]
-        with:
-          github_token: ${{ secrets.GH_CI_SECRET }}
-          metal_auth_token: ${{ secrets.METAL_AUTH_TOKEN }}
-          metal_project_id: ${{ secrets.METAL_PROJECT_ID }}
-          metro: "da"
-          plan: "c3.small.x86"
-          os: "ubuntu_20_04"
   run_tests:
-    needs: build_runner
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     name: "Run CI"
+    if: github.event.review.state == 'APPROVED'
     steps:
       - name: check out code
-        uses: actions/checkout@v3
-      - name: install docker
-        run: |
-          curl -fsSL https://get.docker.com -o get-docker.sh
-          sudo sh get-docker.sh
+        uses: actions/checkout@v4
       - name: run tracetesting
         run: |
           make build && make run-tracetesting
-  destroy:
-    needs: [build_runner, run_tests]
-    runs-on: ubuntu-latest
-    name: "Cleanup"
-    steps:
-      - name: metal-sweeper-action
-        uses: equinix-labs/[email protected]
-        with:
-          authToken: ${{ secrets.METAL_AUTH_TOKEN }}
-          projectID: ${{ secrets.METAL_PROJECT_ID }}
-          keepProject: true
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,8 @@
 .DS_Store
 \#*\#
 
+docker-compose.override.yml
+
 # Eclipse
 .classpath
 .project
@@ -38,6 +40,7 @@ composer.lock
 src/frontend/cypress/videos
 src/frontend/cypress/screenshots
 src/shippingservice/target/
+test/tracetesting/tracetesting-vars.yaml
 
 # Ignore copied/generated protobuf files
 /src/cartservice/src/protos/
@@ -51,3 +54,7 @@ src/shippingservice/target/
 /src/paymentservice/demo.proto
 /src/recommendationservice/demo_pb2*.py
 /src/shippingservice/proto/
+/src/productcatalogservice/genproto
+/src/currencyservice/proto
+/src/checkoutservice/genproto
+/src/accountingservice/genproto
diff --git a/.licenserc.json b/.licenserc.json
@@ -28,6 +28,10 @@
       "# Copyright The OpenTelemetry Authors",
       "# SPDX-License-Identifier: Apache-2.0"
     ],
+    "**/*.sql": [
+      "-- Copyright The OpenTelemetry Authors",
+      "-- SPDX-License-Identifier: Apache-2.0"
+    ],
     "**/{Dockerfile,Makefile}": [
       "# Copyright The OpenTelemetry Authors",
       "# SPDX-License-Identifier: Apache-2.0"