Merge branch 'main' into renovate/php-di-php-di-7.x

open-telemetry · Aug 20, 2023 · c69feda · c69feda
2 parents e6e7fc6 + d7e31d9
commit c69feda
Show file tree

Hide file tree

Showing 22 changed files with 2,353 additions and 1,315 deletions.
diff --git a/.github/workflows/build-images.yml b/.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:
@@ -58,9 +63,6 @@ jobs:
           - file: ./src/loadgenerator/Dockerfile
             tag_suffix: loadgenerator
             context: ./
-          - file: ./src/otelcollector/Dockerfile
-            tag_suffix: otelcollector
-            context: ./
           - file: ./src/paymentservice/Dockerfile
             tag_suffix: paymentservice
             context: ./
@@ -96,35 +98,48 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-
+      - name: Check for file changes
+        id: check_changes
+        if: ${{ !inputs.push }}
+        run: |
+          DOCKERFILE_DIR=$(dirname ${{ matrix.file_tag.file }})
+          FILES_CHANGED=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} -- $DOCKERFILE_DIR)
+          if [ -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: Override skip for push
+        if: ${{ inputs.push }}
+        run: echo "skip=false >> $GITHUB_OUTPUT"
+        id: override_skip
       - name: Log in to the Container registry
         uses: docker/login-action@v2
         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
         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
+        if: steps.check_changes.outputs.skip == 'false' || steps.override_skip.outputs.skip == 'false'
         uses: docker/[email protected]
         with:
           context: ${{ matrix.file_tag.context }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,8 @@ 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
@@ -63,10 +65,12 @@ release.
   ([#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))
-* [otelcol] Use the collector builder to produce otelcol docker image
-  ([#944](https://github.com/open-telemetry/opentelemetry-demo/pull/944))
 * [quoteservice] update php dependencies
   ([#994](https://github.com/open-telemetry/opentelemetry-demo/issues/994))
+* [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/issues/1029))
 
 ## 1.4.0
 

diff --git a/Makefile b/Makefile
@@ -97,7 +97,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:

diff --git a/README.md b/README.md
@@ -53,22 +53,22 @@ 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)               | [Sentry](https://github.com/getsentry/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)          | [ServiceNow Cloud Observability](https://docs.lightstep.com/otel/quick-start-operator#send-data-from-the-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)                                                          | [New Relic](https://github.com/newrelic/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/)                   | [OpenSearch](https://github.com/opensearch-project/opentelemetry-demo) |                                                                                                                              |
+|                                                                                                                   |                                                                   |                                                                                                                              |
+|-------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------|
+| [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)                                                       | [Guance](https://github.com/GuanceCloud/opentelemetry-demo)       | [ServiceNow Cloud Observability](https://docs.lightstep.com/otel/quick-start-operator#send-data-from-the-opentelemetry-demo) |
+| [Axiom](https://play.axiom.co/axiom-play-qf1k/dashboards/otel.traces.otel-demo-traces)                            | [Helios](https://otelsandbox.gethelios.dev)                       | [Splunk](https://github.com/signalfx/opentelemetry-demo)                                                                     |
+| [Azure Data Explorer](https://github.com/Azure/Azure-kusto-opentelemetry-demo)                                    | [Honeycomb.io](https://github.com/honeycombio/opentelemetry-demo) | [Sumo Logic](https://www.sumologic.com/blog/common-opentelemetry-demo-application/)                                          |
+| [Coralogix](https://coralogix.com/blog/configure-otel-demo-send-telemetry-data-coralogix)                         | [Instana](https://github.com/instana/opentelemetry-demo)          | [TelemetryHub](https://github.com/TelemetryHub/opentelemetry-demo/tree/telemetryhub-backend)                                 |
+| [Datadog](https://github.com/DataDog/opentelemetry-demo)                                                          | [Kloudfuse](https://github.com/kloudfuse/opentelemetry-demo)      | [Teletrace](https://github.com/teletrace/opentelemetry-demo)                                                                 |
+| [Dynatrace](https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/)                   | [New Relic](https://github.com/newrelic/opentelemetry-demo)       | [Uptrace](https://github.com/uptrace/uptrace/tree/master/example/opentelemetry-demo)                                         |
 
 ## 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
 

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -486,7 +486,7 @@ services:
 
   # Grafana
   grafana:
-    image: grafana/grafana:9.4.7
+    image: grafana/grafana:9.5.7
     container_name: grafana
     deploy:
       resources:
@@ -501,7 +501,7 @@ services:
 
   # OpenTelemetry Collector
   otelcol:
-    image: otel/opentelemetry-collector-contrib:0.76.1
+    image: otel/opentelemetry-collector-contrib:0.82.0
     container_name: otel-col
     deploy:
       resources:
@@ -524,7 +524,7 @@ services:
 
   # Prometheus
   prometheus:
-    image: quay.io/prometheus/prometheus:v2.43.0
+    image: quay.io/prometheus/prometheus:v2.46.0
     container_name: prometheus
     command:
       - --web.console.templates=/etc/prometheus/consoles

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -630,7 +630,7 @@ services:
 
   # Grafana
   grafana:
-    image: grafana/grafana:9.4.7
+    image: grafana/grafana:9.5.7
     container_name: grafana
     deploy:
       resources:
@@ -645,13 +645,8 @@ services:
 
   # OpenTelemetry Collector
   otelcol:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-otelcol
+    image: otel/opentelemetry-collector-contrib:0.82.0
     container_name: otel-col
-    build:
-      context: ./
-      dockerfile: ./src/otelcollector/Dockerfile
-      cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-otelcol
     deploy:
       resources:
         limits:
@@ -673,7 +668,7 @@ services:
 
   # Prometheus
   prometheus:
-    image: quay.io/prometheus/prometheus:v2.43.0
+    image: quay.io/prometheus/prometheus:v2.46.0
     container_name: prometheus
     command:
       - --web.console.templates=/etc/prometheus/consoles