Merge branch 'main' into renovate/org.apache.kafka-kafka-clients-3.x

open-telemetry · Aug 1, 2023 · 5450121 · 5450121
2 parents 2a37272 + 822d00d
commit 5450121
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 53 deletions.
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.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
diff --git a/src/cartservice/src/Dockerfile b/src/cartservice/src/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # https://mcr.microsoft.com/v2/dotnet/sdk/tags/list
-FROM mcr.microsoft.com/dotnet/sdk:6.0.402 AS builder
+FROM mcr.microsoft.com/dotnet/sdk:6.0.412 AS builder
 
 WORKDIR /usr/src/app/
 
@@ -35,7 +35,7 @@ RUN \
 # -----------------------------------------------------------------------------
 
 # https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list
-FROM mcr.microsoft.com/dotnet/runtime-deps:6.0.9-alpine3.16
+FROM mcr.microsoft.com/dotnet/runtime-deps:6.0.15-alpine3.16
 
 WORKDIR /usr/src/app/
 COPY --from=builder /cartservice/ ./

diff --git a/src/cartservice/src/cartservice.csproj b/src/cartservice/src/cartservice.csproj
@@ -10,8 +10,8 @@
     <PackageReference Include="Grpc.AspNetCore" Version="2.53.0" />
     <PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.53.0" />
     <PackageReference Include="StackExchange.Redis" Version="2.6.122" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.5.0" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.5.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.5.1" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.5.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.5.0-beta.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.5.0-beta.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.5.0-beta.1" />

diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json
diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -11,7 +11,7 @@
     "grpc:generate": "mkdir -p ./protos && protoc -I ./pb  --plugin=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_opt=esModuleInterop=true --ts_proto_out=./protos --ts_proto_opt=outputServices=grpc-js demo.proto"
   },
   "dependencies": {
-    "@grpc/grpc-js": "1.8.14",
+    "@grpc/grpc-js": "1.8.18",
     "@opentelemetry/api": "1.4.1",
     "@opentelemetry/auto-instrumentations-node": "0.38.0",
     "@opentelemetry/auto-instrumentations-web": "0.33.0",

diff --git a/src/loadgenerator/requirements.txt b/src/loadgenerator/requirements.txt
@@ -3,7 +3,7 @@ brotli==1.0.9
 certifi==2022.12.7
 charset-normalizer==3.1.0
 click==8.1.6
-configargparse==1.5.3
+configargparse==1.5.5
 deprecated==1.2.14
 flask==2.3.2
 flask-basicauth==0.2.0

diff --git a/src/paymentservice/package-lock.json b/src/paymentservice/package-lock.json
diff --git a/src/paymentservice/package.json b/src/paymentservice/package.json
@@ -12,7 +12,7 @@
   "author": "Jonathan Lui",
   "license": "ISC",
   "dependencies": {
-    "@grpc/grpc-js": "1.8.14",
+    "@grpc/grpc-js": "1.8.18",
     "@grpc/proto-loader": "^0.7.6",
     "@opentelemetry/auto-instrumentations-node": "0.38.0",
     "@opentelemetry/core": "1.15.0",