From c75e0ea2b3d601c8d9d7781f5625c20dcb0ccdd1 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Tue, 1 Apr 2025 11:34:34 +0200 Subject: [PATCH 1/4] scripts: build a README also for instrumentation-genai --- scripts/generate_instrumentation_readme.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/generate_instrumentation_readme.py b/scripts/generate_instrumentation_readme.py index 5e47e70cb7..b4a712cc83 100755 --- a/scripts/generate_instrumentation_readme.py +++ b/scripts/generate_instrumentation_readme.py @@ -27,10 +27,7 @@ | --------------- | ------------------ | --------------- | -------------- |""" -def main(): - root_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - base_instrumentation_path = os.path.join(root_path, "instrumentation") - +def main(base_instrumentation_path): table = [header] for instrumentation in sorted(os.listdir(base_instrumentation_path)): instrumentation_path = os.path.join( @@ -85,4 +82,10 @@ def main(): if __name__ == "__main__": - main() + root_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + instrumentation_path = os.path.join(root_path, "instrumentation") + main(instrumentation_path) + genai_instrumentation_path = os.path.join( + root_path, "instrumentation-genai" + ) + main(genai_instrumentation_path) From 563f41dad477b95ed8cab501c6f9775da691d810 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Tue, 1 Apr 2025 11:38:28 +0200 Subject: [PATCH 2/4] opentelemetry-instrumentation-openai-v2: add supports_metrics to package --- .../src/opentelemetry/instrumentation/openai_v2/package.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/package.py b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/package.py index b53e25f7df..4973d360e7 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/package.py +++ b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/package.py @@ -14,3 +14,5 @@ _instruments = ("openai >= 1.26.0",) + +_supports_metrics = True From cc885d06d0be7cb16cdb36f0b9259175d7e1c100 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Tue, 1 Apr 2025 11:38:55 +0200 Subject: [PATCH 3/4] opentelemetry-instrumentation-google-genai: add missing package.py --- .../instrumentation/google_genai/package.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/package.py diff --git a/instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/package.py b/instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/package.py new file mode 100644 index 0000000000..46a0504cce --- /dev/null +++ b/instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/package.py @@ -0,0 +1,15 @@ +# 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. + +_instruments = ("google-genai >= 1.0.0",) From 8ef099436e6a899948e2b5878b679829092f19f0 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Tue, 1 Apr 2025 11:39:50 +0200 Subject: [PATCH 4/4] Build instrumentation-genai/README.md --- instrumentation-genai/README.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 instrumentation-genai/README.md diff --git a/instrumentation-genai/README.md b/instrumentation-genai/README.md new file mode 100644 index 0000000000..f0a90af797 --- /dev/null +++ b/instrumentation-genai/README.md @@ -0,0 +1,6 @@ + +| Instrumentation | Supported Packages | Metrics support | Semconv status | +| --------------- | ------------------ | --------------- | -------------- | +| [opentelemetry-instrumentation-google-genai](./opentelemetry-instrumentation-google-genai) | google-genai >= 1.0.0 | No | development +| [opentelemetry-instrumentation-openai-v2](./opentelemetry-instrumentation-openai-v2) | openai >= 1.26.0 | Yes | development +| [opentelemetry-instrumentation-vertexai](./opentelemetry-instrumentation-vertexai) | google-cloud-aiplatform >= 1.64 | No | development \ No newline at end of file