Merge branch 'main' into basic-http-opamp-client

Author: xrmx

.github/component_owners.yml

@@ -1,77 +1,23 @@
 components:
 
-  docs/instrumentation:
-    - nemoshlag
-
-
-  instrumentation/opentelemetry-instrumentation-aio-pika:
-    - ofek1weiss
+  instrumentation/opentelemetry-instrumentation-aiokafka:
+    - dimastbk
 
-  instrumentation/opentelemetry-instrumentation-boto3sqs:
-    - oxeye-nikolay
-    - nikosokolik
-  
   instrumentation/opentelemetry-instrumentation-asyncclick:
     - jomcgi
 
-  instrumentation/opentelemetry-instrumentation-kafka-python:
-    - nozik
-  
-  instrumentation/opentelemetry-instrumentation-pika:
-    - oxeye-nikolay
-    - nikosokolik
-
-  instrumentation/opentelemetry-instrumentation-redis:
-    - sungwonh
-
-  instrumentation/opentelemetry-instrumentation-remoulade:
-    - ben-natan
-    - machine424
-
-  instrumentation/opentelemetry-instrumentation-confluent-kafka:
-    - oxeye-dorkolog
-    - dorkolog
-
-  propagator/opentelemetry-propagator-aws-xray:
-    - jj22ee
-
-  sdk-extension/opentelemetry-sdk-extension-aws:
-    - srprash
-    - jj22ee
-
-  instrumentation/opentelemetry-instrumentation-tortoiseorm:
-    - tonybaloney
+  instrumentation/opentelemetry-instrumentation-asyncio:
+    - bourbonkk
 
-  instrumentation/opentelemetry-instrumentation-tornado:
-    - shalevr
+  instrumentation/opentelemetry-instrumentation-pymssql:
+     - guillaumep
 
   instrumentation/opentelemetry-instrumentation-urllib:
     - shalevr
 
   instrumentation/opentelemetry-instrumentation-urllib3:
     - shalevr
 
-  instrumentation/opentelemetry-instrumentation-sqlalchemy:
-    - shalevr
-
-  instrumentation/opentelemetry-instrumentation-cassandra:
-    - mattcontinisio
-
-  instrumentation/opentelemetry-instrumentation-asyncio:
-    - bourbonkk
-
-  instrumentation/opentelemetry-instrumentation-psycopg:
-    - federicobond
-
-  instrumentation/opentelemetry-instrumentation-pymssql:
-    - guillaumep
-
-  instrumentation/opentelemetry-instrumentation-aiokafka:
-    - dimastbk
-
-  processor/opentelemetry-processor-baggage:
-    - codeboten
-
   instrumentation-genai/:
     - karthikscale3
     - lmolkova
@@ -80,3 +26,21 @@ components:
     - nirga
     - alizenhom
     - codefromthecrypt
+
+  processor/opentelemetry-processor-baggage:
+    - codeboten
+
+  propagator/opentelemetry-propagator-aws-xray:
+    - jj22ee
+
+  sdk-extension/opentelemetry-sdk-extension-aws:
+    - srprash
+    - jj22ee
+
+  util/opentelemetry-util-genai:
+    - DylanRussell
+    - keith-decker
+
+  instrumentation-genai/opentelemetry-instrumentation-langchain:
+    - zhirafovod
+    - wrisa

CHANGELOG.md

@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed
+
+### Added
+- `opentelemetry-instrumentation`: botocore: Add support for AWS Secrets Manager semantic convention attribute
+  ([#3765](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3765))
+
 ## Version 1.37.0/0.58b0 (2025-09-11)
 
 ### Fixed
@@ -40,8 +46,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

@@ -73,7 +73,14 @@
     os.path.abspath("/".join([opamp, f, "src"]))
     for f in listdir(opamp)
     if isdir(join(opamp, f))
+
+util = "../util"
+util_dirs = [
+    os.path.abspath("/".join([util, f, "src"]))
+    for f in listdir(util)
+    if isdir(join(util, f))
 ]
+
 sys.path[:0] = (
     exp_dirs
     + instr_dirs
@@ -82,6 +89,7 @@
     + prop_dirs
     + resource_dirs
     + opamp_dirs
+    + util_dirs
 )
 
 # -- Project information -----------------------------------------------------
@@ -131,6 +139,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

@@ -0,0 +1,31 @@
+OpenTelemetry Python - GenAI Util
+=================================
+
+.. automodule:: opentelemetry.util.genai
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: opentelemetry.util.genai.utils
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: opentelemetry.util.genai.types
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: opentelemetry.util.genai.environment_variables
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: opentelemetry.util.genai.upload_hook
+    :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.