Merge branch 'main' into vertex-toolcalls

aabmass · aabmass · commit 2934cca7bbd1 · 2025-02-20T21:07:41.000Z
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -0,0 +1,20 @@
+name: FOSSA scanning
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  fossa:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+          team: OpenTelemetry
diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml b/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml
@@ -28,7 +28,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-instrumentation == 0.52b0.dev",
   "opentelemetry-api ~= 1.11",
-  "psutil >= 5.9.0, < 7",
+  "psutil >= 5.9.0, < 8",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt
@@ -3,7 +3,7 @@ Deprecated==1.2.14
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
-psutil==6.0.0
+psutil==7.0.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ classifiers = [`
`28`	`28`	`dependencies = [`
`29`	`29`	`"opentelemetry-instrumentation == 0.52b0.dev",`
`30`	`30`	`"opentelemetry-api ~= 1.11",`
`31`		`- "psutil >= 5.9.0, < 7",`
	`31`	`+ "psutil >= 5.9.0, < 8",`
`32`	`32`	`]`
`33`	`33`
`34`	`34`	`[project.optional-dependencies]`