-
Notifications
You must be signed in to change notification settings - Fork 710
Add Initial Support for Instrumenting OpenAI Python Library - Chat Completion Create #2759
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
lzchen
merged 53 commits into
open-telemetry:main
from
Scale3-Labs:openai-opentelemetry
Oct 22, 2024
Merged
Changes from 3 commits
Commits
Show all changes
53 commits
Select commit
Hold shift + click to select a range
c7b3c97
[WIP] Initial commit for OpenAI instrumentation
karthikscale3 52a5f07
Merge branch 'main' into openai-opentelemetry
karthikscale3 6383978
Merge branch 'main' of github.com:Scale3-Labs/opentelemetry-python-co…
alizenhom e1bca1a
Loosen openai version for instrumentation + linting
alizenhom 94c10f4
fix wrong patch.py import
alizenhom bb97ec9
add missing dependecies tiktoken & pydantic
alizenhom e15d443
remove async support from `StreamWrapper` until further notice
alizenhom 1efdfcd
addressing comments:
alizenhom 892d388
Merge branch 'open-telemetry:main' into openai-opentelemetry
alizenhom e7398a2
Merge branch 'open-telemetry:main' into openai-opentelemetry
alizenhom e601f6d
Merge branch 'open-telemetry:main' into openai-opentelemetry
alizenhom df3fc62
Merge branch 'open-telemetry:main' into openai-opentelemetry
alizenhom d04edad
Refactoring Openai instrumentation
alizenhom b8dde6c
Merge branch 'openai-opentelemetry' of github.com:Scale3-Labs/opentel…
alizenhom ec3c320
remove `SpanAttributes` and refactor streamwrapper
alizenhom 706c6f2
change instrumentation name & fix some nits
alizenhom 71aaeb6
change openai package name
alizenhom 8495a24
cleanup setting prompt events & finish reasons
alizenhom 885b7fd
catch connection drops and reraise error in streaming
alizenhom 6ac04cb
run `tox -e generate`
alizenhom 42370a7
run linter
alizenhom c5ef8c3
run `tox -e generate`
alizenhom d52460e
add changelog
alizenhom 452d41a
test requirments + tox ini
alizenhom 48fb3fb
Merge branch 'main' of github.com:open-telemetry/opentelemetry-python…
alizenhom e9a76c4
remove LLMSpanAttributes validation layer
alizenhom 3d5a2b3
add tests
alizenhom b583aa0
enhance build settings
alizenhom ae9bc2a
Merge branch 'main' of github.com:open-telemetry/opentelemetry-python…
alizenhom f2a5cfa
address test comments
alizenhom e701678
Merge branch 'open-telemetry:main' into openai-opentelemetry
alizenhom a457df2
Merge branch 'main' into openai-opentelemetry
karthikscale3 3bdfd8f
run `tox -e generate` & `tox -e generate-workflows`
alizenhom 41cbfd0
Update instrumentation/opentelemetry-instrumentation-openai/src/opent…
karthikscale3 f3b7c0e
Merge branch 'main' into openai-opentelemetry
karthikscale3 8813754
Merge branch 'main' into openai-opentelemetry
karthikscale3 578653d
change folder name to v2
alizenhom 578a942
adjust all naming to -v2
alizenhom 51f2438
run `tox -e generate`
alizenhom 8b58f27
adjust tests
alizenhom d467eb1
set attributes only when span is recording
alizenhom ad7f198
`model` fallback to `gpt-3.5-turbo`
alizenhom 5e4c2b2
Merge branch 'open-telemetry:main' into openai-opentelemetry
alizenhom bbee109
adjust `-v2` for linting
alizenhom 9ac90f9
make sure span is recording before setting attributes
alizenhom 2549f25
pass span_attributes when creating span inside `start_span`
alizenhom 1dacf8d
adjust unwrap + add pydantic to test reqs
alizenhom 4048410
bump openai support to `1.26.0`
alizenhom 8fc4336
run `tox -e generate` & `tox -e generate-workflows`
alizenhom 9e273f6
add uninstrument in tests + remove any none values from span attributes
alizenhom 8e667de
cleanup
alizenhom 592c18e
adjust `unwrap`
alizenhom cd8b098
Merge branch 'open-telemetry:main' into openai-opentelemetry
alizenhom File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
201 changes: 201 additions & 0 deletions
201
instrumentation/opentelemetry-instrumentation-openai/LICENSE
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,201 @@ | ||
Apache License | ||
Version 2.0, January 2004 | ||
http://www.apache.org/licenses/ | ||
|
||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION | ||
|
||
1. Definitions. | ||
|
||
"License" shall mean the terms and conditions for use, reproduction, | ||
and distribution as defined by Sections 1 through 9 of this document. | ||
|
||
"Licensor" shall mean the copyright owner or entity authorized by | ||
the copyright owner that is granting the License. | ||
|
||
"Legal Entity" shall mean the union of the acting entity and all | ||
other entities that control, are controlled by, or are under common | ||
control with that entity. For the purposes of this definition, | ||
"control" means (i) the power, direct or indirect, to cause the | ||
direction or management of such entity, whether by contract or | ||
otherwise, or (ii) ownership of fifty percent (50%) or more of the | ||
outstanding shares, or (iii) beneficial ownership of such entity. | ||
|
||
"You" (or "Your") shall mean an individual or Legal Entity | ||
exercising permissions granted by this License. | ||
|
||
"Source" form shall mean the preferred form for making modifications, | ||
including but not limited to software source code, documentation | ||
source, and configuration files. | ||
|
||
"Object" form shall mean any form resulting from mechanical | ||
transformation or translation of a Source form, including but | ||
not limited to compiled object code, generated documentation, | ||
and conversions to other media types. | ||
|
||
"Work" shall mean the work of authorship, whether in Source or | ||
Object form, made available under the License, as indicated by a | ||
copyright notice that is included in or attached to the work | ||
(an example is provided in the Appendix below). | ||
|
||
"Derivative Works" shall mean any work, whether in Source or Object | ||
form, that is based on (or derived from) the Work and for which the | ||
editorial revisions, annotations, elaborations, or other modifications | ||
represent, as a whole, an original work of authorship. For the purposes | ||
of this License, Derivative Works shall not include works that remain | ||
separable from, or merely link (or bind by name) to the interfaces of, | ||
the Work and Derivative Works thereof. | ||
|
||
"Contribution" shall mean any work of authorship, including | ||
the original version of the Work and any modifications or additions | ||
to that Work or Derivative Works thereof, that is intentionally | ||
submitted to Licensor for inclusion in the Work by the copyright owner | ||
or by an individual or Legal Entity authorized to submit on behalf of | ||
the copyright owner. For the purposes of this definition, "submitted" | ||
means any form of electronic, verbal, or written communication sent | ||
to the Licensor or its representatives, including but not limited to | ||
communication on electronic mailing lists, source code control systems, | ||
and issue tracking systems that are managed by, or on behalf of, the | ||
Licensor for the purpose of discussing and improving the Work, but | ||
excluding communication that is conspicuously marked or otherwise | ||
designated in writing by the copyright owner as "Not a Contribution." | ||
|
||
"Contributor" shall mean Licensor and any individual or Legal Entity | ||
on behalf of whom a Contribution has been received by Licensor and | ||
subsequently incorporated within the Work. | ||
|
||
2. Grant of Copyright License. Subject to the terms and conditions of | ||
this License, each Contributor hereby grants to You a perpetual, | ||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable | ||
copyright license to reproduce, prepare Derivative Works of, | ||
publicly display, publicly perform, sublicense, and distribute the | ||
Work and such Derivative Works in Source or Object form. | ||
|
||
3. Grant of Patent License. Subject to the terms and conditions of | ||
this License, each Contributor hereby grants to You a perpetual, | ||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable | ||
(except as stated in this section) patent license to make, have made, | ||
use, offer to sell, sell, import, and otherwise transfer the Work, | ||
where such license applies only to those patent claims licensable | ||
by such Contributor that are necessarily infringed by their | ||
Contribution(s) alone or by combination of their Contribution(s) | ||
with the Work to which such Contribution(s) was submitted. If You | ||
institute patent litigation against any entity (including a | ||
cross-claim or counterclaim in a lawsuit) alleging that the Work | ||
or a Contribution incorporated within the Work constitutes direct | ||
or contributory patent infringement, then any patent licenses | ||
granted to You under this License for that Work shall terminate | ||
as of the date such litigation is filed. | ||
|
||
4. Redistribution. You may reproduce and distribute copies of the | ||
Work or Derivative Works thereof in any medium, with or without | ||
modifications, and in Source or Object form, provided that You | ||
meet the following conditions: | ||
|
||
(a) You must give any other recipients of the Work or | ||
Derivative Works a copy of this License; and | ||
|
||
(b) You must cause any modified files to carry prominent notices | ||
stating that You changed the files; and | ||
|
||
(c) You must retain, in the Source form of any Derivative Works | ||
that You distribute, all copyright, patent, trademark, and | ||
attribution notices from the Source form of the Work, | ||
excluding those notices that do not pertain to any part of | ||
the Derivative Works; and | ||
|
||
(d) If the Work includes a "NOTICE" text file as part of its | ||
distribution, then any Derivative Works that You distribute must | ||
include a readable copy of the attribution notices contained | ||
within such NOTICE file, excluding those notices that do not | ||
pertain to any part of the Derivative Works, in at least one | ||
of the following places: within a NOTICE text file distributed | ||
as part of the Derivative Works; within the Source form or | ||
documentation, if provided along with the Derivative Works; or, | ||
within a display generated by the Derivative Works, if and | ||
wherever such third-party notices normally appear. The contents | ||
of the NOTICE file are for informational purposes only and | ||
do not modify the License. You may add Your own attribution | ||
notices within Derivative Works that You distribute, alongside | ||
or as an addendum to the NOTICE text from the Work, provided | ||
that such additional attribution notices cannot be construed | ||
as modifying the License. | ||
|
||
You may add Your own copyright statement to Your modifications and | ||
may provide additional or different license terms and conditions | ||
for use, reproduction, or distribution of Your modifications, or | ||
for any such Derivative Works as a whole, provided Your use, | ||
reproduction, and distribution of the Work otherwise complies with | ||
the conditions stated in this License. | ||
|
||
5. Submission of Contributions. Unless You explicitly state otherwise, | ||
any Contribution intentionally submitted for inclusion in the Work | ||
by You to the Licensor shall be under the terms and conditions of | ||
this License, without any additional terms or conditions. | ||
Notwithstanding the above, nothing herein shall supersede or modify | ||
the terms of any separate license agreement you may have executed | ||
with Licensor regarding such Contributions. | ||
|
||
6. Trademarks. This License does not grant permission to use the trade | ||
names, trademarks, service marks, or product names of the Licensor, | ||
except as required for reasonable and customary use in describing the | ||
origin of the Work and reproducing the content of the NOTICE file. | ||
|
||
7. Disclaimer of Warranty. Unless required by applicable law or | ||
agreed to in writing, Licensor provides the Work (and each | ||
Contributor provides its Contributions) on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
implied, including, without limitation, any warranties or conditions | ||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A | ||
PARTICULAR PURPOSE. You are solely responsible for determining the | ||
appropriateness of using or redistributing the Work and assume any | ||
risks associated with Your exercise of permissions under this License. | ||
|
||
8. Limitation of Liability. In no event and under no legal theory, | ||
whether in tort (including negligence), contract, or otherwise, | ||
unless required by applicable law (such as deliberate and grossly | ||
negligent acts) or agreed to in writing, shall any Contributor be | ||
liable to You for damages, including any direct, indirect, special, | ||
incidental, or consequential damages of any character arising as a | ||
result of this License or out of the use or inability to use the | ||
Work (including but not limited to damages for loss of goodwill, | ||
work stoppage, computer failure or malfunction, or any and all | ||
other commercial damages or losses), even if such Contributor | ||
has been advised of the possibility of such damages. | ||
|
||
9. Accepting Warranty or Additional Liability. While redistributing | ||
the Work or Derivative Works thereof, You may choose to offer, | ||
and charge a fee for, acceptance of support, warranty, indemnity, | ||
or other liability obligations and/or rights consistent with this | ||
License. However, in accepting such obligations, You may act only | ||
on Your own behalf and on Your sole responsibility, not on behalf | ||
of any other Contributor, and only if You agree to indemnify, | ||
defend, and hold each Contributor harmless for any liability | ||
incurred by, or claims asserted against, such Contributor by reason | ||
of your accepting any such warranty or additional liability. | ||
|
||
END OF TERMS AND CONDITIONS | ||
|
||
APPENDIX: How to apply the Apache License to your work. | ||
|
||
To apply the Apache License to your work, attach the following | ||
boilerplate notice, with the fields enclosed by brackets "[]" | ||
replaced with your own identifying information. (Don't include | ||
the brackets!) The text should be enclosed in the appropriate | ||
comment syntax for the file format. We also recommend that a | ||
file or class name and description of purpose be included on the | ||
same "printed page" as the copyright notice for easier | ||
identification within third-party archives. | ||
|
||
Copyright [yyyy] [name of copyright owner] | ||
|
||
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. |
26 changes: 26 additions & 0 deletions
26
instrumentation/opentelemetry-instrumentation-openai/README.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
OpenTelemetry OpenAI Instrumentation | ||
=================================== | ||
xrmx marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
|pypi| | ||
|
||
.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-openai.svg | ||
karthikscale3 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
:target: https://pypi.org/project/opentelemetry-instrumentation-openai/ | ||
karthikscale3 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
Instrumentation with OpenAI that supports the openai library and is | ||
specified to trace_integration using 'OpenAI'. | ||
|
||
|
||
Installation | ||
------------ | ||
|
||
:: | ||
|
||
pip install opentelemetry-instrumentation-openai | ||
|
||
|
||
References | ||
---------- | ||
* `OpenTelemetry OpenAI Instrumentation <https://opentelemetry-python-contrib.readthedocs.io/en/latest/instrumentation/openai/openai.html>`_ | ||
* `OpenTelemetry Project <https://opentelemetry.io/>`_ | ||
* `OpenTelemetry Python Examples <https://github.com/open-telemetry/opentelemetry-python/tree/main/docs/examples>`_ | ||
|
53 changes: 53 additions & 0 deletions
53
instrumentation/opentelemetry-instrumentation-openai/pyproject.toml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
[build-system] | ||
requires = ["hatchling"] | ||
build-backend = "hatchling.build" | ||
|
||
[project] | ||
name = "opentelemetry-instrumentation-openai" | ||
lmolkova marked this conversation as resolved.
Show resolved
Hide resolved
|
||
dynamic = ["version"] | ||
description = "OpenTelemetry OpenAI instrumentation" | ||
karthikscale3 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
readme = "README.rst" | ||
license = "Apache-2.0" | ||
requires-python = ">=3.8" | ||
authors = [ | ||
{ name = "OpenTelemetry Authors", email = "[email protected]" }, | ||
] | ||
classifiers = [ | ||
"Development Status :: 4 - Beta", | ||
"Intended Audience :: Developers", | ||
"License :: OSI Approved :: Apache Software License", | ||
"Programming Language :: Python", | ||
"Programming Language :: Python :: 3", | ||
"Programming Language :: Python :: 3.8", | ||
"Programming Language :: Python :: 3.9", | ||
"Programming Language :: Python :: 3.10", | ||
"Programming Language :: Python :: 3.11", | ||
"Programming Language :: Python :: 3.12", | ||
] | ||
dependencies = [ | ||
"opentelemetry-api ~= 1.12", | ||
"opentelemetry-instrumentation == 0.48b0.dev", | ||
xrmx marked this conversation as resolved.
Show resolved
Hide resolved
karthikscale3 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
] | ||
|
||
[project.optional-dependencies] | ||
instruments = [ | ||
"openai ~= 1.37.1", | ||
xrmx marked this conversation as resolved.
Show resolved
Hide resolved
|
||
] | ||
|
||
[project.entry-points.opentelemetry_instrumentor] | ||
openai = "opentelemetry.instrumentation.openai:OpenAIInstrumentor" | ||
|
||
[project.urls] | ||
Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-openai" | ||
|
||
[tool.hatch.version] | ||
path = "src/opentelemetry/instrumentation/openai/version.py" | ||
|
||
[tool.hatch.build.targets.sdist] | ||
include = [ | ||
"/src", | ||
"/tests", | ||
] | ||
|
||
[tool.hatch.build.targets.wheel] | ||
packages = ["src/opentelemetry"] |
74 changes: 74 additions & 0 deletions
74
...opentelemetry-instrumentation-openai/src/opentelemetry/instrumentation/openai/__init__.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
# 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. | ||
|
||
""" | ||
OpenAI client instrumentation supporting `openai`, it can be enabled by | ||
using ``OpenAIInstrumentor``. | ||
|
||
.. _openai: https://pypi.org/project/openai/ | ||
|
||
Usage | ||
----- | ||
|
||
.. code:: python | ||
|
||
from openai import OpenAI | ||
from opentelemetry.instrumentation.openai import OpenAIInstrumentor | ||
|
||
OpenAIInstrumentor().instrument() | ||
|
||
client = OpenAI() | ||
response = client.chat.completions.create( | ||
model="gpt-4o-mini", | ||
messages=[ | ||
{"role": "user", "content": "Write a short poem on open telemetry."}, | ||
], | ||
) | ||
|
||
API | ||
--- | ||
""" | ||
|
||
import importlib.metadata | ||
from typing import Collection | ||
|
||
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor | ||
from opentelemetry.instrumentation.openai.package import _instruments | ||
from opentelemetry.trace import get_tracer | ||
from wrapt import wrap_function_wrapper | ||
from langtrace_python_sdk.instrumentation.openai.patch import ( | ||
xrmx marked this conversation as resolved.
Show resolved
Hide resolved
|
||
chat_completions_create | ||
) | ||
|
||
|
||
class OpenAIInstrumentor(BaseInstrumentor): | ||
|
||
def instrumentation_dependencies(self) -> Collection[str]: | ||
return _instruments | ||
|
||
def _instrument(self, **kwargs): | ||
"""Enable OpenAI instrumentation. | ||
""" | ||
xrmx marked this conversation as resolved.
Show resolved
Hide resolved
|
||
tracer_provider = kwargs.get("tracer_provider") | ||
tracer = get_tracer(__name__, "", tracer_provider) | ||
lmolkova marked this conversation as resolved.
Show resolved
Hide resolved
|
||
version = importlib.metadata.version("openai") | ||
|
||
wrap_function_wrapper( | ||
"openai.resources.chat.completions", | ||
"Completions.create", | ||
chat_completions_create("openai.chat.completions.create", version, tracer), | ||
) | ||
|
||
def _uninstrument(self, **kwargs): | ||
pass |
16 changes: 16 additions & 0 deletions
16
.../opentelemetry-instrumentation-openai/src/opentelemetry/instrumentation/openai/package.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# 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 = ("openai ~= 1.37.1",) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.