Add subproject to top-level project build mechanism.

Author: michaelsafyan

eachdist.ini

@@ -50,6 +50,7 @@ packages=
     opentelemetry-resource-detector-azure
     opentelemetry-sdk-extension-aws
     opentelemetry-propagator-aws-xray
+    opentelemetry-instrumentation-google-genai
     opentelemetry-instrumentation-vertexai
     opentelemetry-instrumentation-openai-v2
     opentelemetry-instrumentation-test

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

@@ -37,9 +37,9 @@ classifiers = [
   "Programming Language :: Python :: 3.12"
 ]
 dependencies = [
-  "opentelemetry-api ~= 1.30.0",
-  "opentelemetry-instrumentation ~= 0.51b0",
-  "opentelemetry-semantic-conventions ~= 0.51b0"
+  "opentelemetry-api >=1.30.0, <2",
+  "opentelemetry-instrumentation >=0.51b0, <2",
+  "opentelemetry-semantic-conventions >=0.51b0, <2"
 ]
 
 [project.optional-dependencies]

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

@@ -0,0 +1,32 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This variant of the requirements aims to test the system using
+# the newest supported version of external depenendencies.
+
+pytest==7.4.4
+pytest-asyncio==0.21.0
+pytest-vcr==1.0.2
+
+google-auth ~= 2.38.0
+google-genai ~= 1.0.0
+opentelemetry-api ~= 1.30.0
+opentelemetry-sdk ~= 1.30.0
+opentelemetry-semantic-conventions ~= 0.51b0
+opentelemetry-instrumentation ~=0.51b0
+
+# 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

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

@@ -0,0 +1,31 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This variant of the requirements aims to test the system using
+# the oldest supported version of external depenendencies.
+
+pytest==7.4.4
+pytest-asyncio==0.21.0
+pytest-vcr==1.0.2
+
+google-auth==2.15.0
+google-genai==1.0.0
+opentelemetry-api==1.30.0
+opentelemetry-sdk==1.30.0
+opentelemetry-semantic-conventions==0.51b0
+opentelemetry-instrumentation==0.51b0
+
+# 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

tox.ini

@@ -19,6 +19,12 @@ envlist =
     # pypy3-test-instrumentation-vertexai-{0,1}
     lint-instrumentation-vertexai
 
+    ; instrumentation-google-genai
+    py3{9, 10,11,12,13}-test-instrumentation-google-genai-{old-deps,recent-deps}
+    # Disabling pypy3 as shapely does not have wheels and fails to compile
+    # pypy3-test-instrumentation-google-genai-{0,1}
+    lint-instrumentation-google-genai
+
     ; opentelemetry-resource-detector-container
     py3{8,9,10,11,12,13}-test-resource-detector-container
     pypy3-test-resource-detector-container
@@ -451,6 +457,11 @@ deps =
   vertexai-1: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-1.txt
   lint-instrumentation-vertexai: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/test-requirements-0.txt
 
+  google-genai-old-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/requirements.oldest.txt
+  google-genai-recent-deps: {[testenv]test_deps}
+  google-genai-recent-deps: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/requirements.latest.txt
+  lint-instrumentation-google-genai: -r {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/requirements.latest.txt
+
   asgi: {[testenv]test_deps}
   asgi: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt
 
@@ -814,6 +825,9 @@ commands =
   test-instrumentation-vertexai: pytest {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai/tests --vcr-record=none {posargs}
   lint-instrumentation-vertexai: sh -c "cd instrumentation-genai && pylint --rcfile ../.pylintrc opentelemetry-instrumentation-vertexai"
 
+  test-instrumentation-google-genai: pytest {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests -o pythonpath={toxinidir}/instrumentation-genai/opentelemetry-instrumentation-google-genai/tests --vcr-record=none {posargs}
+  lint-instrumentation-google-genai: sh -c "cd instrumentation-genai && pylint --rcfile ../.pylintrc opentelemetry-instrumentation-google-genai"
+
   test-instrumentation-sio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/tests {posargs}
   lint-instrumentation-sio-pika: sh -c "cd instrumentation && pylint --rcfile ../.pylintrc opentelemetry-instrumentation-pika"
 
@@ -1024,5 +1038,6 @@ deps =
   {toxinidir}/opentelemetry-instrumentation
   {toxinidir}/util/opentelemetry-util-http
   {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-vertexai[instruments]
+  {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-google-genai[instruments]
 commands =
   pyright