Merging upstream changes

.env

@@ -1,9 +1,21 @@
 
 
-# Images
-IMAGE_VERSION=1.7.1
+# Demo App version
+IMAGE_VERSION=1.8.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.93.0
+GRAFANA_IMAGE=grafana/grafana:10.3.1
+JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.53
+# must also update version field in /src/grafana/provisioning/datasources/opensearch.yml
+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.15.8
+TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}
 
 # Demo Platform
 ENV_PLATFORM=local
@@ -51,6 +63,9 @@ FEATURE_FLAG_SERVICE_HOST=feature-flag-service
 FEATURE_FLAG_GRPC_SERVICE_PORT=50053
 FEATURE_FLAG_GRPC_SERVICE_ADDR=featureflagservice:${FEATURE_FLAG_GRPC_SERVICE_PORT}
 
+# flagd
+FLAGD_HOST=flagd
+
 # Frontend
 FRONTEND_PORT=8080
 FRONTEND_ADDR=frontend:${FRONTEND_PORT}

.github/workflows/build-images.yml

@@ -55,14 +55,6 @@ jobs:
             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
-            context: ./
-            setup-qemu: true
           - file: ./src/frontend/Dockerfile
             tag_suffix: frontend
             context: ./
@@ -111,10 +103,6 @@ jobs:
             tag_suffix: frontend-tests
             context: ./
             setup-qemu: true
-          - file: ./test/Dockerfile
-            tag_suffix: integrationTests
-            context: ./
-            setup-qemu: true
 
     steps:
       - uses: actions/checkout@v4
@@ -170,6 +158,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

.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@v2.1.1

.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

.github/workflows/run-integration-tests.yml

@@ -1,50 +1,21 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-name: Integration Tests
+# # Copyright The OpenTelemetry Authors
+# # SPDX-License-Identifier: Apache-2.0
+# @lukekraus - commented this out for now due to failures reading from the registry. Need to rethink how to run these in CI
+# name: Integration Tests
 
-on:
-  pull_request_target:
-    branches:
-      - main
-    types: [closed]
+# on:
+#   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/metal-action-runner@v0.1.1
-        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
-    name: "Run CI"
-    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
-      - 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/metal-sweeper-action@v0.6.1
-        with:
-          authToken: ${{ secrets.METAL_AUTH_TOKEN }}
-          projectID: ${{ secrets.METAL_PROJECT_ID }}
-          keepProject: true
+# jobs:
+#   run_tests:
+#     runs-on: ubuntu-latest
+#     name: "Run CI"
+#     if: github.event.review.state == 'APPROVED'
+#     steps:
+#       - name: check out code
+#         uses: actions/checkout@v4
+#       - name: run tracetesting
+#         run: |
+#           make build && make run-tracetesting

.gitignore

@@ -38,6 +38,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/

.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"

CHANGELOG.md

@@ -1,12 +1,92 @@
 # Changelog
 
 Please update changelog as part of any significant pull request. Place short
-description of your change into "Unreleased" section. As part of release process
-content of "Unreleased" section content will generate release notes for the
-release.
+description of your change into "Unreleased" section. As part of release
+process content of "Unreleased" section content will generate release notes for
+the release.
 
 ## Unreleased
 
+* [featureflag] deprecate in favor of flagd
+  ([#1338](https://github.com/open-telemetry/opentelemetry-demo/pull/1388))
+* [checkoutservice] add producer interceptor for tracing
+  ([#1400](https://github.com/open-telemetry/opentelemetry-demo/pull/1400))
+* [chore] increase memory for Collector and Jaeger
+  ([#1396](https://github.com/open-telemetry/opentelemetry-demo/pull/1396))
+* [chore] fix Make targets for restart and redeploy
+  ([#1397](https://github.com/open-telemetry/opentelemetry-demo/pull/1397))
+* [chore] add nightly releases
+  ([#1398](https://github.com/open-telemetry/opentelemetry-demo/pull/1398))
+* [checkoutservice] add producer interceptor for tracing
+  ([#1400](https://github.com/open-telemetry/opentelemetry-demo/pull/1400))
+* [productcatalogservice] fix graceful shutdown issues
+  ([#1402](https://github.com/open-telemetry/opentelemetry-demo/pull/1402))
+* [chore] remove unused integration test
+  ([#1406](https://github.com/open-telemetry/opentelemetry-demo/pull/1406))
+* [CartService] - Add Host Detector
+  ([#1415](https://github.com/open-telemetry/opentelemetry-demo/pull/1415))
+
+## 1.8.0
+
+* [grafana] update grafana to 10.2.3
+  ([#1332](https://github.com/open-telemetry/opentelemetry-demo/pull/1332))
+* [frontendproxy] Enable envoy environment resource detector
+  ([#1291](https://github.com/open-telemetry/opentelemetry-demo/pull/1291))
+* [currencyservice] - add package name prefix to `rpc.service` attribute
+  ([#1333](https://github.com/open-telemetry/opentelemetry-demo/pull/1333))
+* [currency] fix metric exporter options
+  ([#1335](https://github.com/open-telemetry/opentelemetry-demo/pull/1335))
+* [ffspostgres] define and use demo specific postgres image
+  ([#1338](https://github.com/open-telemetry/opentelemetry-demo/pull/1338))
+* [loadgenerator, frontend] enable browser traffic in loadgenerator using playwright
+  ([#1345](https://github.com/open-telemetry/opentelemetry-demo/pull/1345))
+* [accountingservice] update wiki link
+  ([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
+* [checkoutservice] update wiki link
+  ([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
+* [productcatalogservice] update wiki link
+  ([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
+* [adservice] added group and anonymous read permission to
+  opentelemetry-javaagent.jar
+  ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348))
+* [frauddetectionservice] added group and anonymous read permission to
+  opentelemetry-javaagent.jar
+  ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348))
+* [adservice] Major version update for Java instrumentation, version 2.0.0
+  ([#1352](https://github.com/open-telemetry/opentelemetry-demo/pull/1352))
+* [frauddetectionservice] Major version update for Java instrumentation,
+  version 2.0.0
+  ([#1352](https://github.com/open-telemetry/opentelemetry-demo/pull/1352))
+* [kafka] Major version update for Java instrumentation, version 2.0.0
+  ([#1352](https://github.com/open-telemetry/opentelemetry-demo/pull/1352))
+* Align env variables for OTLP ports
+  ([#1353](https://github.com/open-telemetry/opentelemetry-demo/pull/1353))
+* Update dependent services - Collector, Grafana, Jaeger, Prometheus, etc.
+  ([#1354](https://github.com/open-telemetry/opentelemetry-demo/pull/1354))
+* [OpenSearch] Use native OpenSearch exporter from Collector
+  ([#1356](https://github.com/open-telemetry/opentelemetry-demo/pull/1356))
+* Update GO SDKs & fix metrics config
+  ([#1357](https://github.com/open-telemetry/opentelemetry-demo/pull/1357))
+* Update Python SDKs
+  ([#1358](https://github.com/open-telemetry/opentelemetry-demo/pull/1358))
+* [loadgenerator] fix browser traffic enabled flag
+  ([#1359](https://github.com/open-telemetry/opentelemetry-demo/pull/1359))
+* [productcatalog] allow products to be extended
+  ([#1363](https://github.com/open-telemetry/opentelemetry-demo/pull/1363))
+* [tests] update trace based tests for semantic conventions
+  ([#1377](https://github.com/open-telemetry/opentelemetry-demo/pull/1377))
+* [currencyservice] Add OTLP logs
+  ([#1378](https://github.com/open-telemetry/opentelemetry-demo/pull/1378))
+* [cartservice] update .NET to .NET 8.0.2
+  ([#1380](https://github.com/open-telemetry/opentelemetry-demo/pull/1380))
+
+## 1.7.2
+
+* [cartservice] update .NET package to 1.7.0 release
+  ([#1326](https://github.com/open-telemetry/opentelemetry-demo/pull/1326))
+* [loadgenerator and recommendationservice] Update python base image
+  ([#1329](https://github.com/open-telemetry/opentelemetry-demo/pull/1329))
+
 ## 1.7.1
 
 * [grafana] revert to 10.2.0
@@ -16,6 +96,8 @@ release.
   ([#1313](https://github.com/open-telemetry/opentelemetry-demo/pull/1313))
 * [accountingservice] Update dependencies and semconv
 * ([#1316](https://github.com/open-telemetry/opentelemetry-demo/pull/1316))
+* [featureflagservice] Allow setting initial feature flag values
+  ([#1319](https://github.com/open-telemetry/opentelemetry-demo/pull/1319))
 
 ## 1.7.0
 

CONTRIBUTING.md

@@ -113,7 +113,7 @@ GitHub pull requests (PRs).
 
 To create a new PR, fork the project in GitHub and clone the upstream repo:
 
-> **Note**
+> [!NOTE]
 > Please fork to a personal GitHub account rather than a corporate/enterprise
 > one so maintainers can push commits to your branch.
 > **Pull requests from protected forks will not be accepted.**

Makefile

@@ -95,11 +95,12 @@ build-env-file:
 	sed -i '/IMAGE_VERSION=.*/c\IMAGE_VERSION=${RELEASE_VERSION}' .ghcr.env
 	sed -i '/IMAGE_NAME=.*/c\IMAGE_NAME=${GHCR_REPO}' .ghcr.env
 
+.PHONY: run-tests
 run-tests:
 	docker compose run frontendTests
-	docker compose run integrationTests
 	docker compose run traceBasedTests
 
+.PHONY: run-tracetesting
 run-tracetesting:
 	docker compose run traceBasedTests ${SERVICES_TO_TEST}
 
@@ -161,10 +162,40 @@ stop:
 	@echo ""
 	@echo "OpenTelemetry Demo is stopped."
 
-
-# Use to rebuild and restart a single service component
+# Use to restart a single service component
 # Example: make restart service=frontend
 .PHONY: restart
 restart:
-	# work with `service` or `SERVICE` as input
-	./restart-service.sh ${service}${SERVICE}
+# work with `service` or `SERVICE` as input
+ifdef SERVICE
+	service := $(SERVICE)
+endif
+
+ifdef service
+	docker compose stop $(service)
+	docker compose rm --force $(service)
+	docker compose create $(service)
+	docker compose start $(service)
+else
+	@echo "Please provide a service name using `service=[service name]` or `SERVICE=[service name]`"
+endif
+
+# Use to rebuild and restart (redeploy) a single service component
+# Example: make redeploy service=frontend
+.PHONY: redeploy
+redeploy:
+# work with `service` or `SERVICE` as input
+ifdef SERVICE
+	service := $(SERVICE)
+endif
+
+ifdef service
+	docker compose build $(service)
+	docker compose stop $(service)
+	docker compose rm --force $(service)
+	docker compose create $(service)
+	docker compose start $(service)
+else
+	@echo "Please provide a service name using `service=[service name]` or `SERVICE=[service name]`"
+endif
+