Merge branch 'main' into elixir-chat-service

.github/workflows/component-build-images.yml

@@ -162,7 +162,7 @@ jobs:
             max-parallelism = 2
       - name: Matrix Build and push demo images
         if: steps.check_changes.outputs.skip == 'false'
-        uses: docker/build-push-action@v6.5.0
+        uses: docker/build-push-action@v6.7.0
         with:
           context: ${{ matrix.file_tag.context }}
           file: ${{ matrix.file_tag.file }}

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

@@ -15,4 +15,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: gradle/actions/wrapper-validation@v3.5.0
+      - uses: gradle/actions/wrapper-validation@v4.0.1

CHANGELOG.md

@@ -9,6 +9,8 @@ the release.
 
 * [accountingservice] allow running the container with non root user
   ([#1692](https://github.com/open-telemetry/opentelemetry-demo/pull/1692))
+* [chore] Add yamllint to `make all`
+  ([#1707](https://github.com/open-telemetry/opentelemetry-demo/pull/1707))
 
 ## 1.11.1
 

Makefile

@@ -16,10 +16,10 @@ DOCKER_COMPOSE_ENV=--env-file .env --env-file .env.override
 # see https://github.com/open-telemetry/build-tools/releases for semconvgen updates
 # Keep links in semantic_conventions/README.md and .vscode/settings.json in sync!
 SEMCONVGEN_VERSION=0.11.0
+YAMLLINT_VERSION=1.30.0
 
-# TODO: add `yamllint` step to `all` after making sure it works on Mac.
 .PHONY: all
-all: install-tools markdownlint misspell
+all: install-tools markdownlint misspell yamllint
 
 $(MISSPELL):
 	cd $(TOOLS_DIR) && go build -o $(MISSPELL_BINARY) github.com/client9/misspell/cmd/misspell
@@ -44,10 +44,10 @@ markdownlint:
 .PHONY: install-yamllint
 install-yamllint:
     # Using a venv is recommended
-	pip install -U yamllint~=1.30.0
+	yamllint --version >/dev/null 2>&1 || pip install -U yamllint~=$(YAMLLINT_VERSION)
 
 .PHONY: yamllint
-yamllint:
+yamllint: install-yamllint
 	yamllint .
 
 .PHONY: checklicense

src/loadgenerator/requirements.txt

@@ -19,17 +19,17 @@ locust==2.18.2
 locust_plugins==3.4.0
 markupsafe==2.1.3
 msgpack==1.0.7
-opentelemetry-api==1.23.0
-opentelemetry-exporter-otlp-proto-grpc==1.23.0
-opentelemetry-instrumentation==0.44b0
-opentelemetry-instrumentation-jinja2==0.44b0
-opentelemetry-instrumentation-requests==0.44b0
-opentelemetry-instrumentation-system-metrics==0.44b0
-opentelemetry-instrumentation-urllib3==0.44b0
-opentelemetry-proto==1.23.0
-opentelemetry-sdk==1.23.0
-opentelemetry-semantic-conventions==0.44b0
-opentelemetry-util-http==0.44b0
+opentelemetry-api==1.25.0
+opentelemetry-exporter-otlp-proto-grpc==1.25.0
+opentelemetry-instrumentation==0.46b0
+opentelemetry-instrumentation-jinja2==0.46b0
+opentelemetry-instrumentation-requests==0.46b0
+opentelemetry-instrumentation-system-metrics==0.46b0
+opentelemetry-instrumentation-urllib3==0.46b0
+opentelemetry-proto==1.25.0
+opentelemetry-sdk==1.25.0
+opentelemetry-semantic-conventions==0.46b0
+opentelemetry-util-http==0.46b0
 openfeature-sdk==0.7.0
 openfeature-provider-flagd==0.1.5
 openfeature-hooks-opentelemetry==0.1.3