Merge branch 'main' into xray-header-from-context-support

jj22ee · web-flow · commit 4f2b29c273ee · 2025-09-04T12:29:40.000-07:00
diff --git a/contract-tests/images/mock-collector/pyproject.toml b/contract-tests/images/mock-collector/pyproject.toml
@@ -13,7 +13,7 @@ dependencies = [
     "grpcio ~= 1.60.0",
     "opentelemetry-proto==1.25.0",
     "opentelemetry-sdk==1.25.0",
-    "protobuf==4.25.2",
+    "protobuf==4.25.8",
     "typing-extensions==4.9.0"
 ]
 
diff --git a/contract-tests/images/mock-collector/requirements.txt b/contract-tests/images/mock-collector/requirements.txt
@@ -1,5 +1,5 @@
 grpcio==1.60.1
 opentelemetry-proto==1.25.0
 opentelemetry-sdk==1.25.0
-protobuf==4.25.2
+protobuf==4.25.8
 typing-extensions==4.9.0
diff --git a/contract-tests/tests/pyproject.toml b/contract-tests/tests/pyproject.toml
@@ -16,7 +16,7 @@ dependencies = [
     "grpcio==1.60.0",
     "docker==7.1.0",
     "mock-collector==1.0.0",
-    "requests==2.32.2"
+    "requests==2.32.4"
 ]
 
 [project.optional-dependencies]
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ dependencies = [`
`16`	`16`	`"grpcio==1.60.0",`
`17`	`17`	`"docker==7.1.0",`
`18`	`18`	`"mock-collector==1.0.0",`
`19`		`- "requests==2.32.2"`
	`19`	`+ "requests==2.32.4"`
`20`	`20`	`]`
`21`	`21`
`22`	`22`	`[project.optional-dependencies]`