Merge branch 'main' into chore-organize-deps

julianocosta89 · Oct 7, 2024 · 84b52d5 · 84b52d5
2 parents b8ed7ad + a1cfe47
commit 84b52d5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/component-build-images.yml b/.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.7.0
+        uses: docker/build-push-action@v6.9.0
         with:
           context: ${{ matrix.file_tag.context }}
           file: ${{ matrix.file_tag.file }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,11 @@ the release.
   ([#1709](https://github.com/open-telemetry/opentelemetry-demo/pull/1709))
 * [chore] Move dependencies control to .env file
   ([#1715](https://github.com/open-telemetry/opentelemetry-demo/pull/1715))
+* [accountingservice] bump OpenTelemetry .NET Automatic Instrumentation
+  to 1.8.0 together with other dependencies
+  ([#1727](https://github.com/open-telemetry/opentelemetry-demo/pull/1727))
+* [chore] Fix binding for host's volume mount
+  ([#1728](https://github.com/open-telemetry/opentelemetry-demo/pull/1728))
 
 ## 1.11.1
 

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -587,7 +587,7 @@ services:
     command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
     user: 0:0
     volumes:
-      - ${HOST_FILESYSTEM}:/hostfs:ro
+      - ${HOST_FILESYSTEM}:/hostfs:ro,rslave
       - ${DOCKER_SOCK}:/var/run/docker.sock:ro
       - ${OTEL_COLLECTOR_CONFIG}:/etc/otelcol-config.yml
       - ${OTEL_COLLECTOR_CONFIG_EXTRAS}:/etc/otelcol-config-extras.yml

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -702,7 +702,7 @@ services:
     command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
     user: 0:0
     volumes:
-      - ${HOST_FILESYSTEM}:/hostfs:ro
+      - ${HOST_FILESYSTEM}:/hostfs:ro,rslave
       - ${DOCKER_SOCK}:/var/run/docker.sock:ro
       - ${OTEL_COLLECTOR_CONFIG}:/etc/otelcol-config.yml
       - ${OTEL_COLLECTOR_CONFIG_EXTRAS}:/etc/otelcol-config-extras.yml

diff --git a/src/accountingservice/AccountingService.csproj b/src/accountingservice/AccountingService.csproj
@@ -9,15 +9,15 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Confluent.Kafka" Version="2.4.0" />
-		<PackageReference Include="Google.Protobuf" Version="3.27.1" />
-		<PackageReference Include="Grpc.Tools" Version="2.64.0">
+		<PackageReference Include="Confluent.Kafka" Version="2.5.3" />
+		<PackageReference Include="Google.Protobuf" Version="3.28.2" />
+		<PackageReference Include="Grpc.Tools" Version="2.66.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
-		<PackageReference Include="OpenTelemetry.AutoInstrumentation" Version="1.7.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
+		<PackageReference Include="OpenTelemetry.AutoInstrumentation" Version="1.8.0" />
 	</ItemGroup>
 
 	<ItemGroup>