Merge branch 'main' into renovate/node-18.x

.github/workflows/build-images.yml

@@ -58,9 +58,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: ./

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,10 @@ 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))
 

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:

README.md

@@ -67,8 +67,8 @@ keeping it up to date for you.
 ## 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
 

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,13 +501,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:
@@ -529,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

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