Merge branch 'main' into update-package-docs

Author: nagkumar91

instrumentation-genai/opentelemetry-instrumentation-google-genai/pyproject.toml

@@ -34,20 +34,17 @@ classifiers = [
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
-  "Programming Language :: Python :: 3.12"
+  "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
   "opentelemetry-api ~=1.37",
   "opentelemetry-instrumentation >=0.58b0, <2",
   "opentelemetry-semantic-conventions >=0.58b0, <2",
-  # TODO https://github.com/open-telemetry/opentelemetry-python-contrib/issues/3786: restrict
-  # version after the first release
-  "opentelemetry-util-genai",]
+  "opentelemetry-util-genai >= 0.2b0, <0.3b0",
+]
 
 [project.optional-dependencies]
-instruments = [
-    "google-genai >= 1.32.0"
-]
+instruments = ["google-genai >= 1.32.0"]
 
 [project.entry-points.opentelemetry_instrumentor]
 google-genai = "opentelemetry.instrumentation.google_genai:GoogleGenAiSdkInstrumentor"
@@ -60,21 +57,14 @@ Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 path = "src/opentelemetry/instrumentation/google_genai/version.py"
 
 [tool.hatch.build.targets.sdist]
-include = [
-  "/src",
-  "/tests",
-]
+include = ["/src", "/tests"]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/opentelemetry"]
 
 [tool.pyright]
-include = [
-  "src",
-]
-exclude = [
-  "**/__pycache__",
-]
+include = ["src"]
+exclude = ["**/__pycache__"]
 stubPath = "types"
 reportMissingImports = "error"
 reportMissingTypeStubs = false

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/requirements.oldest.txt

@@ -25,8 +25,10 @@ opentelemetry-api==1.37.0
 opentelemetry-sdk==1.37.0
 opentelemetry-semantic-conventions==0.58b0
 opentelemetry-instrumentation==0.58b0
+opentelemetry-util-genai[upload]==0.2b0
+
+fsspec==2025.9.0
 
 # Install locally from the folder. This path is relative to the
 # root directory, given invocation from "tox" at root level.
 -e instrumentation-genai/opentelemetry-instrumentation-google-genai
--e util/opentelemetry-util-genai[upload]

instrumentation-genai/opentelemetry-instrumentation-vertexai/pyproject.toml

@@ -26,10 +26,8 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.37",
   "opentelemetry-instrumentation ~= 0.58b0",
-  # TODO https://github.com/open-telemetry/opentelemetry-python-contrib/issues/3786: restrict
-  # version after the first release
-  "opentelemetry-util-genai",
   "opentelemetry-semantic-conventions ~= 0.58b0",
+  "opentelemetry-util-genai >= 0.2b0, <0.3b0",
 ]
 
 [project.optional-dependencies]

instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.latest.txt

@@ -91,4 +91,4 @@ zipp==3.20.2
 
 -e opentelemetry-instrumentation
 -e instrumentation-genai/opentelemetry-instrumentation-vertexai[instruments]
--e util/opentelemetry-util-genai
+-e util/opentelemetry-util-genai[upload]

instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.oldest.txt

@@ -69,7 +69,7 @@ opentelemetry-api==1.37
 opentelemetry-sdk==1.37
 opentelemetry-semantic-conventions==0.58b0
 opentelemetry-instrumentation==0.58b0
+opentelemetry-util-genai[upload]==0.2b0
 fsspec==2025.9.0
 
 -e instrumentation-genai/opentelemetry-instrumentation-vertexai[instruments]
--e util/opentelemetry-util-genai