Merge branch 'main' into main

Author: nagkumar91

.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

.github/workflows/misc_0.yml

@@ -157,8 +157,8 @@ jobs:
       - name: Run tests
         run: tox -e shellcheck
 
-  ruff:
-    name: ruff
+  precommit:
+    name: precommit
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -174,7 +174,7 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e ruff
+        run: tox -e precommit
 
   typecheck:
     name: typecheck

.github/workflows/package-prepare-patch-release.yml

@@ -11,6 +11,7 @@ on:
         - opentelemetry-instrumentation-openai-v2
         - opentelemetry-instrumentation-vertexai
         - opentelemetry-instrumentation-google-genai
+        - opentelemetry-util-genai
         description: 'Package to be released'
         required: true
 permissions:
@@ -48,7 +49,7 @@ jobs:
 
           version=$(./scripts/eachdist.py version --package ${{ inputs.package }})
 
-          version_file=$(find $path -type f -path "*version*.py")
+          version_file=$(find $path -type f -path "**/version.py")
           file_count=$(echo "$version_file" | wc -l)
 
           if [ "$file_count" -ne 1 ]; then

.github/workflows/package-prepare-release.yml

@@ -11,6 +11,7 @@ on:
         - opentelemetry-instrumentation-openai-v2
         - opentelemetry-instrumentation-vertexai
         - opentelemetry-instrumentation-google-genai
+        - opentelemetry-util-genai
         description: 'Package to be released'
         required: true
 
@@ -60,7 +61,7 @@ jobs:
 
           version=${version_dev%.dev}
 
-          version_file=$(find $path -type f -path "*version*.py")
+          version_file=$(find $path -type f -path "**/version.py")
           file_count=$(echo "$version_file" | wc -l)
 
           if [ "$file_count" -ne 1 ]; then

.github/workflows/package-release.yml

@@ -11,6 +11,7 @@ on:
         - opentelemetry-instrumentation-openai-v2
         - opentelemetry-instrumentation-vertexai
         - opentelemetry-instrumentation-google-genai
+        - opentelemetry-util-genai
         description: 'Package to be released'
         required: true
 permissions:

.pre-commit-config.yaml

@@ -13,3 +13,9 @@ repos:
     rev: 0.6.0
     hooks:
       - id: uv-lock
+  - repo: https://github.com/rstcheck/rstcheck
+    rev: 77490ffa33bfc0928975ae3cf904219903db755d # frozen: v6.2.5
+    hooks:
+      - id: rstcheck
+        additional_dependencies: ['rstcheck[sphinx]']
+        args: ["--report-level", "warning"]

.rstcheck.cfg

@@ -0,0 +1,2 @@
+[rstcheck]
+ignore_directives = automodule

CHANGELOG.md

@@ -11,6 +11,15 @@ 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))
+- Add `rstcheck` to pre-commit to stop introducing invalid RST
+  ([#3777](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3777))
+
+
 ## Version 1.37.0/0.58b0 (2025-09-11)
 
 ### Fixed
@@ -40,8 +49,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

CONTRIBUTING.md

@@ -84,8 +84,9 @@ You can run `tox` with the following arguments:
 * `tox -e lint-some-package` to run lint checks on `some-package`
 * `tox -e generate-workflows` to run creation of new CI workflows if tox environments have been updated
 * `tox -e ruff` to run ruff linter and formatter checks against the entire codebase
+* `tox -e precommit` to run all `pre-commit` actions
 
-`ruff check` and `ruff format` are executed when `tox -e ruff` is run. We strongly recommend you to configure [pre-commit](https://pre-commit.com/) locally to run `ruff` automatically before each commit by installing it as git hooks. You just need to [install pre-commit](https://pre-commit.com/#install) in your environment:
+`ruff check` and `ruff format` are executed when `tox -e ruff` is run. We strongly recommend you to configure [pre-commit](https://pre-commit.com/) locally to run `ruff` and `rstcheck` automatically before each commit by installing it as git hooks. You just need to [install pre-commit](https://pre-commit.com/#install) in your environment:
 
 ```console
 pip install pre-commit -c dev-requirements.txt

_template/README.rst

@@ -1,5 +1,5 @@
 OpenTelemetry <REPLACE ME> Instrumentation
-===========================
+==========================================
 
 |pypi|
 
@@ -20,5 +20,5 @@ Installation
 References
 ----------
 
-* `OpenTelemetry <REPLACE ME>/ Tracing <https://opentelemetry-python-contrib.readthedocs.io/en/latest/instrumentation/<REPLACE ME>/<REPLACE ME>.html>`_
+* `OpenTelemetry REPLACE ME/ Tracing <https://opentelemetry-python-contrib.readthedocs.io/en/latest/instrumentation/REPLACE ME/REPLACE ME.html>`_
 * `OpenTelemetry Project <https://opentelemetry.io/>`_