Update latest upstream patch

.env

@@ -1,6 +1,6 @@
 
 # Images
-IMAGE_VERSION=1.4.0
+IMAGE_VERSION=1.5.0
 IMAGE_NAME=ghcr.io/open-telemetry/demo
 
 # Demo Platform
@@ -11,7 +11,7 @@ OTEL_COLLECTOR_HOST=otelcol
 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
+PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/otlp-http/v1/traces
 
 # OpenTelemetry Resource Definitions
 OTEL_RESOURCE_ATTRIBUTES="service.namespace=opentelemetry-demo"
@@ -65,7 +65,7 @@ FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
 # Load Generator
 LOCUST_WEB_PORT=8089
 LOCUST_USERS=10
-LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
+LOCUST_HOST=http://${NGINX_ADDR}
 LOCUST_WEB_HOST=loadgenerator
 LOCUST_AUTOSTART=true
 LOCUST_HEADLESS=false
@@ -118,12 +118,12 @@ PROMETHEUS_SERVICE_HOST=prometheus
 PROMETHEUS_ADDR=${PROMETHEUS_SERVICE_HOST}:${PROMETHEUS_SERVICE_PORT}
 
 # OpenSearch versionins
-VERSION=2.8.0
+OPENSEARCH_VERSION=2.11.0
 
 # OpenSearch Node1
-OPENSEARCH1_PORT=9200
-OPENSEARCH1_HOST=opensearch-node1
-OPENSEARCH1_ADDR=${OPENSEARCH1_HOST}:${OPENSEARCH1_PORT}
+OPENSEARCH_PORT=9200
+OPENSEARCH_HOST=opensearch
+OPENSEARCH_ADDR=${OPENSEARCH_HOST}:${OPENSEARCH_PORT}
 
 # OpenSearch Dashboard
 OPENSEARCH_DASHBOARD_PORT=5601

.github/architecture.md

@@ -36,7 +36,7 @@ Backend supportive services
  - See [description](https://opentelemetry.io/docs/demo/services/load-generator/)
  - [Frontend Nginx Proxy](http://nginx:90) *(replacement for _Frontend-Proxy_)*
  - See [description](../src/nginx-otel/README.md)
- - [OpenSearch](https://opensearch-node1:9200)
+ - [OpenSearch](https://opensearch:9200)
  - See [description](https://github.com/opensearch-project/opentelemetry-demo/blob/12d52cbb23bbf4226f6de2dfec840482a0a7d054/docker-compose.yml#L697)
  - [Dashboards](http://opensearch-dashboards:5601)
  - See [description](https://github.com/opensearch-project/opentelemetry-demo/blob/12d52cbb23bbf4226f6de2dfec840482a0a7d054/docker-compose.yml#L747) 

.github/workflows/build-images.yml

@@ -1,6 +1,11 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
+
 on:
+ push:
+ paths:
+ - 'src/**'
+ - 'test/**'
  workflow_call:
  inputs:
  push:
@@ -10,7 +15,7 @@ on:
  type: boolean
  version:
  description: The version used when tagging the image
- default: dev
+ default: 'dev'
  required: false
  type: string
 
@@ -45,10 +50,13 @@ jobs:
  - 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: ./
+ # 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: ./
  - file: ./src/frontend/Dockerfile
  tag_suffix: frontend
  context: ./
@@ -93,34 +101,48 @@ jobs:
  - uses: actions/checkout@v3
  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.before }} ${{ 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@v2
+ 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@v2
+ uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKER_USERNAME }}
  password: ${{ secrets.DOCKER_PASSWORD }}
  if: ${{ inputs.push }}
-
  - name: Set up QEMU
  uses: docker/setup-qemu-action@v2
-
+ with:
+ image: tonistiigi/binfmt:master
  - name: Set up Docker Buildx
  uses: docker/setup-buildx-action@v2
  with:
  config-inline: |
  [worker.oci]
- max-parallelism = 2
-
+ max-parallelism = 2
  - name: Matrix Build and push demo images
- uses: docker/build-push-action@v3.3.0
+ if: steps.check_changes.outputs.skip == 'false'
+ uses: docker/build-push-action@v3.3.1
  with:
  context: ${{ matrix.file_tag.context }}
  file: ${{ matrix.file_tag.file }}

.github/workflows/checks.yml

@@ -3,12 +3,18 @@
 name: Checks
 
 on:
+ push:
+ branches: [ main ]
  pull_request:
  branches: [ main ]
+ workflow_dispatch:
 
 jobs:
  build_images:
  uses: ./.github/workflows/build-images.yml
+ with:
+ push: false
+ version: 'dev'
 
  markdownlint:
  runs-on: ubuntu-latest

.github/workflows/gradle-wrapper-validation.yml

@@ -15,4 +15,4 @@ jobs:
  steps:
  - uses: actions/checkout@v3
 
- - uses: gradle/wrapper-validation-action@v1.0.6
+ - uses: gradle/wrapper-validation-action@v1.1.0

.github/workflows/release.yml

@@ -11,4 +11,5 @@ jobs:
  uses: ./.github/workflows/build-images.yml
  with:
  push: true
- version: ${{ github.event.release.tag_name }}"
+ version: ${{ github.event.release.tag_name }}
+ secrets: inherit

.gitignore

@@ -45,6 +45,7 @@ src/shippingservice/target/
 /src/featureflagservice/src/ffs_demo_pb.erl
 /src/featureflagservice/src/ffs_service_*.erl
 /src/featureflagservice/src/oteldemo_*.erl
+/src/frauddetectionservice/src/main/proto
 /src/frontend/pb/
 /src/frontend/protos/
 /src/paymentservice/demo.proto

CHANGELOG.md

@@ -7,6 +7,31 @@ release.
 
 ## Unreleased
 
+* update PHP quoteservice to use RC1
+ ([#1114](https://github.com/open-telemetry/opentelemetry-demo/pull/1114))
+* [cartservice] update .NET package to 1.6.0 release
+ ([#1115](https://github.com/open-telemetry/opentelemetry-demo/pull/1115))
+* Set metric description to blank for rpc.server.duration and queueSize
+ ([#1120](https://github.com/open-telemetry/opentelemetry-demo/pull/1120))
+* sluggify Grafana dashboard name
+ ([#1121](https://github.com/open-telemetry/opentelemetry-demo/pull/1121))
+* [kafka frauddetection adservice] update java agent versions
+ ([#1132](https://github.com/open-telemetry/opentelemetry-demo/pull/1132))
+* update dependent components to latest versions
+ ([#1146](https://github.com/open-telemetry/opentelemetry-demo/pull/1146))
+* [prometheus] Enabled support for the OTLP write receiver
+ ([#1149](https://github.com/open-telemetry/opentelemetry-demo/pull/1149))
+* [grafana] fix dashboard metric names and update settings
+ ([#1150](https://github.com/open-telemetry/opentelemetry-demo/pull/1150))
+* [otelcol] add httpcheck receiver for synthetic check of frontendproxy
+ ([#1162](https://github.com/open-telemetry/opentelemetry-demo/pull/1162))
+* [otelcol] merge configuration files for base and observability configs
+ ([#1173](https://github.com/open-telemetry/opentelemetry-demo/pull/1173))
+
+## 1.5.0
+
+* update trace-based tests to test stream events
+ ([#1072](https://github.com/open-telemetry/opentelemetry-demo/pull/1072))
 * Add cartServiceFailure feature flag triggering Cart Service errors
  ([#824](https://github.com/open-telemetry/opentelemetry-demo/pull/824))
 * [paymentservice] update JS SDKs to 1.12.0/0.38.0
@@ -45,10 +70,46 @@ 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))
+* [tests] Add trace-based testing examples
+ ([#877](https://github.com/open-telemetry/opentelemetry-demo/pull/877))
 * 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))
+* [frontend] update JS SDKs to 1.15.0/0.41.0
+ ([#853](https://github.com/open-telemetry/opentelemetry-demo/pull/853))
+* [shippingservice] Update Rust dependencies and add TelemetryResourceDetector
+ ([#972](https://github.com/open-telemetry/opentelemetry-demo/pull/972))
+* Update frontendproxy's env for minimal
+ ([#983](https://github.com/open-telemetry/opentelemetry-demo/pull/983))
+* [FeatureFlagService] Update dependencies
+ ([#992](https://github.com/open-telemetry/opentelemetry-demo/pull/992))
+* [currencyService] Update OTel dependency
+ ([#991](https://github.com/open-telemetry/opentelemetry-demo/pull/991))
+* [LoadGenerator & RecommendatationService] update dependencies
+ ([#988](https://github.com/open-telemetry/opentelemetry-demo/pull/988))
+* [FraudDetectionService] Updated Kotlin version and OTel dependencies
+ ([#987](https://github.com/open-telemetry/opentelemetry-demo/pull/987))
+* [quoteservice] update php dependencies
+ ([#1009](https://github.com/open-telemetry/opentelemetry-demo/pull/1009))
+* [tests] Update trace-based tests run script
+ ([#1018](https://github.com/open-telemetry/opentelemetry-demo/pull/1018))
+* [PaymentService] Update node to LTS version and bump deps
+ ([#1029](https://github.com/open-telemetry/opentelemetry-demo/pull/1029))
+* [frontend] Update dependencies
+ ([#1054](https://github.com/open-telemetry/opentelemetry-demo/pull/1054))
+* [frontendproxy] Fix typo URL endpoint for FrontendProxy
+ ([#1075](https://github.com/open-telemetry/opentelemetry-demo/pull/1075))
+* [checkoutservice] Upgrade Shopify/sarama to IBM/sarama
+ ([#1083](https://github.com/open-telemetry/opentelemetry-demo/pull/1083))
+* [accountingservice] Upgrade Shopify/sarama to IBM/sarama
+ ([#1083](https://github.com/open-telemetry/opentelemetry-demo/pull/1083))
+* Update Telemetry Components
+ ([#1085](https://github.com/open-telemetry/opentelemetry-demo/pull/1085))
+* [cartservice] Support for logs
+ ([#1086](https://github.com/open-telemetry/opentelemetry-demo/pull/1086))
+* [TraceTests] Update span attributes to align with new IBM/sarama instrumentation
+ ([#1096](https://github.com/open-telemetry/opentelemetry-demo/pull/1096))
 
 ## 1.4.0
 

Makefile

@@ -72,6 +72,10 @@ install-tools: $(MISSPELL)
  npm install
  @echo "All tools installed"
 
+.PHONY: build
+build:
+ docker compose build
+
 .PHONY: build-and-push-dockerhub
 build-and-push-dockerhub:
  docker compose --env-file .dockerhub.env -f docker-compose.yml build
@@ -97,7 +101,7 @@ run-tests:
  docker compose run traceBasedTests
 
 run-tracetesting:
- docker compose run traceBasedTests
+ docker compose run traceBasedTests ${SERVICES_TO_TEST}
 
 .PHONY: generate-protobuf
 generate-protobuf:

README.md

@@ -53,22 +53,23 @@ We welcome any vendor to fork the project to demonstrate their services and
 adding a link below. The community is committed to maintaining the project and
 keeping it up to date for you.
 
-| | | |
-| ----------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- |
-| [AlibabaCloud LogService](https://github.com/aliyun-sls/opentelemetry-demo) | [Elastic](https://github.com/elastic/opentelemetry-demo) | [OpenSearch](https://github.com/opensearch-project/opentelemetry-demo) |
-| [AppDynamics](https://www.appdynamics.com/blog/cloud/how-to-observe-opentelemetry-demo-app-in-appdynamics-cloud/) | [Grafana Labs](https://github.com/grafana/opentelemetry-demo) | [Sentry](https://github.com/getsentry/opentelemetry-demo) |
-| [Aspecto](https://github.com/aspecto-io/opentelemetry-demo) | [Helios](https://otelsandbox.gethelios.dev) | [Splunk](https://github.com/signalfx/opentelemetry-demo) |
-| [Axiom](https://play.axiom.co/axiom-play-qf1k/dashboards/otel.traces.otel-demo-traces) | [Honeycomb.io](https://github.com/honeycombio/opentelemetry-demo) | [Sumo Logic](https://www.sumologic.com/blog/common-opentelemetry-demo-application/) |
-| [Azure Data Explorer](https://github.com/Azure/Azure-kusto-opentelemetry-demo) | [Instana](https://github.com/instana/opentelemetry-demo) | [TelemetryHub](https://github.com/TelemetryHub/opentelemetry-demo/tree/telemetryhub-backend) |
-| [Coralogix](https://coralogix.com/blog/configure-otel-demo-send-telemetry-data-coralogix) | [Kloudfuse](https://github.com/kloudfuse/opentelemetry-demo) | [Teletrace](https://github.com/teletrace/opentelemetry-demo) |
-| [Datadog](https://github.com/DataDog/opentelemetry-demo) | [Lightstep](https://github.com/lightstep/opentelemetry-demo) | [Uptrace](https://github.com/uptrace/uptrace/tree/master/example/opentelemetry-demo) |
-| [Dynatrace](https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/) | [New Relic](https://github.com/newrelic/opentelemetry-demo) | |
+| | | |
+|-----------------------------------------|-----------------------------|----------------------------------------------------------------|
+| [AlibabaCloud LogService][AlibabaCloud] | [Elastic][Elastic] | [OpenSearch][OpenSearch] |
+| [AppDynamics][AppDynamics] | [Grafana Labs][GrafanaLabs] | [Sentry][Sentry] |
+| [Aspecto][Aspecto] | [Guance][Guance] | [ServiceNow Cloud Observability][ServiceNowCloudObservability] |
+| [Axiom][Axiom] | [Helios][Helios] | [Splunk][Splunk] |
+| [Axoflow][Axoflow] | [Honeycomb.io][Honeycombio] | [Sumo Logic][SumoLogic] |
+| [Azure Data Explorer][Azure] | [Instana][Instana] | [TelemetryHub][TelemetryHub] |
+| [Coralogix][Coralogix] | [Kloudfuse][Kloudfuse] | [Teletrace][Teletrace] |
+| [Datadog][Datadog] | [Logz.io][Logzio] | [Tracetest][Tracetest] |
+| [Dynatrace][Dynatrace] | [New Relic][NewRelic] | [Uptrace][Uptrace] |
 
 ## Contributing
 
 To get involved with the project see our [CONTRIBUTING](CONTRIBUTING.md)
-documentation. Our [SIG Calls](CONTRIBUTING.md#join-a-sig-call) are Mondays at
-8:15 AM PST and anyone is welcome.
+documentation. Our [SIG Calls](CONTRIBUTING.md#join-a-sig-call) are every other
+Monday at 8:30 AM PST and anyone is welcome.
 
 ## Project leadership
 
@@ -83,6 +84,7 @@ documentation. Our [SIG Calls](CONTRIBUTING.md#join-a-sig-call) are Mondays at
 [Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
 ([@open-telemetry/demo-approvers](https://github.com/orgs/open-telemetry/teams/demo-approvers)):
 
+- [Cedric Ziel](https://github.com/cedricziel) Grafana Labs
 - [Mikko Viitanen](https://github.com/mviitane), Dynatrace
 - [Penghan Wang](https://github.com/wph95), AppDynamics
 - [Reiley Yang](https://github.com/reyang), Microsoft
@@ -98,3 +100,33 @@ Emeritus:
 [![contributors](https://contributors-img.web.app/image?repo=open-telemetry/opentelemetry-demo)](https://github.com/open-telemetry/opentelemetry-demo/graphs/contributors)
 
 [docs]: https://opentelemetry.io/docs/demo/
+
+<!-- Links for Demos featuring the Astronomy Shop section -->
+
+[AlibabaCloud]: https://github.com/aliyun-sls/opentelemetry-demo
+[AppDynamics]: https://www.appdynamics.com/blog/cloud/how-to-observe-opentelemetry-demo-app-in-appdynamics-cloud/
+[Aspecto]: https://github.com/aspecto-io/opentelemetry-demo
+[Axiom]: https://play.axiom.co/axiom-play-qf1k/dashboards/otel.traces.otel-demo-traces
+[Axoflow]: https://axoflow.com/opentelemetry-support-in-more-detail-in-axosyslog-and-syslog-ng/
+[Azure]: https://github.com/Azure/Azure-kusto-opentelemetry-demo
+[Coralogix]: https://coralogix.com/blog/configure-otel-demo-send-telemetry-data-coralogix
+[Datadog]: https://github.com/DataDog/opentelemetry-demo
+[Dynatrace]: https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/
+[Elastic]: https://github.com/elastic/opentelemetry-demo
+[GrafanaLabs]: https://github.com/grafana/opentelemetry-demo
+[Guance]: https://github.com/GuanceCloud/opentelemetry-demo
+[Helios]: https://otelsandbox.gethelios.dev
+[Honeycombio]: https://github.com/honeycombio/opentelemetry-demo
+[Instana]: https://github.com/instana/opentelemetry-demo
+[Kloudfuse]: https://github.com/kloudfuse/opentelemetry-demo
+[Logzio]: https://logz.io/learn/how-to-run-opentelemetry-demo-with-logz-io/
+[NewRelic]: https://github.com/newrelic/opentelemetry-demo
+[OpenSearch]: https://github.com/opensearch-project/opentelemetry-demo
+[Sentry]: https://github.com/getsentry/opentelemetry-demo
+[ServiceNowCloudObservability]: https://docs.lightstep.com/otel/quick-start-operator#send-data-from-the-opentelemetry-demo
+[Splunk]: https://github.com/signalfx/opentelemetry-demo
+[SumoLogic]: https://www.sumologic.com/blog/common-opentelemetry-demo-application/
+[TelemetryHub]: https://github.com/TelemetryHub/opentelemetry-demo/tree/telemetryhub-backend
+[Teletrace]: https://github.com/teletrace/opentelemetry-demo
+[Tracetest]: https://github.com/kubeshop/opentelemetry-demo
+[Uptrace]: https://github.com/uptrace/uptrace/tree/master/example/opentelemetry-demo

add_hosts_locally.sh

@@ -9,7 +9,7 @@
 IP="127.0.0.1"
 
 # The hostname you want to associate with the IP address
-OPENSEARCH_HOST="opensearch-node1"
+OPENSEARCH_HOST="opensearch"
 OPENSEARCH_DASHBOARD="opensearch-dashboards"
 OTEL_STORE="frontend"
 FEATURE_FLAG_SERVICE="feature-flag-service"