Merge branch 'main' into tnorth/fix

Author: tnoff

.github/component_owners.yml

@@ -40,3 +40,7 @@ components:
   util/opentelemetry-util-genai:
     - DylanRussell
     - keith-decker
+
+  instrumentation-genai/opentelemetry-instrumentation-langchain:
+    - zhirafovod
+    - wrisa

CHANGELOG.md

@@ -40,8 +40,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- `opentelemetry-util-genai` Add a utility to parse the `OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT` environment variable.
-  Add `gen_ai_latest_experimental` as a new value to the Sem Conv stability flag ([#3716](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3716)).
 - `opentelemetry-instrumentation-confluent-kafka` Add support for confluent-kafka <=2.11.0
   ([#3685](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3685))
 - `opentelemetry-instrumentation-system-metrics`: Add `cpython.gc.collected_objects` and `cpython.gc.uncollectable_objects` metrics

dev-requirements.txt

@@ -1,6 +1,6 @@
 pylint==3.0.2
 httpretty==1.1.4
-pyright==v1.1.396
+pyright==v1.1.404
 sphinx==7.1.2
 sphinx-rtd-theme==2.0.0rc4
 sphinx-autodoc-typehints==1.25.2

docs-requirements.txt

@@ -9,6 +9,9 @@ pymemcache~=1.3
 # Required by conf
 django>=2.2
 
+# Require by opentelemetry-util-genai
+fsspec>=2025.9.0
+
 # Required by instrumentation and exporter packages
 aio_pika~=7.2.0
 aiohttp~=3.0

docs/conf.py

@@ -130,6 +130,7 @@
         None,
     ),
     "redis": ("https://redis.readthedocs.io/en/latest/", None),
+    "fsspec": ("https://filesystem-spec.readthedocs.io/en/latest/", None),
 }
 
 # http://www.sphinx-doc.org/en/master/config.html#confval-nitpicky

docs/instrumentation-genai/util.rst

@@ -25,3 +25,7 @@ OpenTelemetry Python - GenAI Util
     :members:
     :undoc-members:
     :show-inheritance:
+
+.. automodule:: opentelemetry.util.genai._fsspec_upload
+    :members:
+    :show-inheritance:

instrumentation-genai/opentelemetry-instrumentation-langchain/CHANGELOG.md

@@ -5,4 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## Unreleased
+
+- Added span support for genAI langchain llm invocation.
+  ([#3665](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3665))

instrumentation-genai/opentelemetry-instrumentation-langchain/NOTICE

@@ -0,0 +1,3 @@
+This project is inspired by and portions of it are derived from Traceloop OpenLLMetry
+(https://github.com/traceloop/openllmetry).
+Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0).

instrumentation-genai/opentelemetry-instrumentation-langchain/examples/manual/.env

@@ -0,0 +1,8 @@
+# Update this with your real OpenAI API key
+OPENAI_API_KEY=sk-YOUR_API_KEY
+
+# Uncomment and change to your OTLP endpoint
+# OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4317
+# OTEL_EXPORTER_OTLP_PROTOCOL=grpc
+
+OTEL_SERVICE_NAME=opentelemetry-python-langchain-manual

instrumentation-genai/opentelemetry-instrumentation-langchain/examples/manual/README.rst

@@ -0,0 +1,39 @@
+OpenTelemetry Langcahin Instrumentation Example
+============================================
+
+This is an example of how to instrument Langchain when configuring OpenTelemetry SDK and instrumentations manually.
+
+When :code:`main.py <main.py>`_ is run, it exports traces to an OTLP-compatible endpoint.
+Traces include details such as the span name and other attributes.
+
+Note: :code:`.env <.env>`_ file configures additional environment variables:
+- :code:`OTEL_LOGS_EXPORTER=otlp` to specify exporter type.
+- :code:`OPENAI_API_KEY` open AI key for accessing the OpenAI API.
+- :code:`OTEL_EXPORTER_OTLP_ENDPOINT` to specify the endpoint for exporting traces (default is http://localhost:4317).
+
+Setup
+-----
+
+Minimally, update the :code:`.env <.env>`_ file with your :code:`OPENAI_API_KEY`.
+An OTLP compatible endpoint should be listening for traces http://localhost:4317.
+If not, update :code:`OTEL_EXPORTER_OTLP_ENDPOINT` as well.
+
+Next, set up a virtual environment like this:
+
+::
+
+    python3 -m venv .venv
+    source .venv/bin/activate
+    pip install "python-dotenv[cli]"
+    pip install -r requirements.txt
+
+Run
+---
+
+Run the example like this:
+
+::
+
+    dotenv run -- python main.py
+
+You should see the capital of France generated by Langchain ChatOpenAI while traces export to your configured observability tool.