chore: sync upstream/main into main (#132)

Author: Cirilla-zmh

.github/workflows/stale.yml

@@ -0,0 +1,35 @@
+name: Mark stale PRs
+
+on:
+  schedule:
+    - cron: "12 3 * * *"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  stale:
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-pr-stale: 14
+          days-before-pr-close: 14
+          days-before-issue-stale: -1
+          days-before-issue-close: -1
+          stale-pr-message: >
+            This PR has been automatically marked as stale because it has not had
+            any activity for 14 days. It will be closed if no further activity
+            occurs within 14 days of this comment.
+
+            If you're still working on this, please add a comment or push new commits.
+          close-pr-message: >
+            This PR has been closed due to inactivity. Please reopen if you would
+            like to continue working on it.
+          exempt-pr-labels: "hold,WIP,blocked-by-spec,do not merge"

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## Version 1.40.0/0.61b0 (2026-03-04)
+
 ### Added
 
 - Add Python 3.14 support
@@ -57,8 +59,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4141](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4141))
 - `opentelemetry-instrumentation-pyramid`: pass request attributes at span creation
   ([#4139](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4139))
+- `opentelemetry-instrumentation-logging`: Move there the SDK LoggingHandler
+  ([#4210](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4210))
+- Add stale PR GitHub Action
+  ([#4220](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4220))
 
 ### Fixed
+
+- `opentelemetry-instrumentation-flask`: Align `http.server.active_requests` initialization with semantic convention helpers to ensure consistent names, units, and descriptions.
+  ([#4094](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4094))
+- `opentelemetry-instrumentation-asyncio`: Fix environment variables not appearing in Read the Docs documentation
+  ([#4256](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/4256))
 - `opentelemetry-instrumentation-mysql`: Refactor MySQL integration test mocks to use concrete DBAPI connection attributes, reducing noisy attribute type warnings.
   ([#4116](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4116))
 - `opentelemetry-instrumentation-cassandra`: Use `_instruments_any` instead of `_instruments` for driver dependencies so that having either `cassandra-driver` or `scylla-driver` installed is sufficient
@@ -113,10 +124,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4078](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4171))
 - `opentelemetry-instrumentation-aiohttp-server`: fix HTTP error inconsistencies
   ([#4175](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4175))
+- `opentelemetry-instrumentation-falcon`: Refactor `_handle_exception` to remove pylint disables
+  ([#4207](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4207))
 - `opentelemetry-docker-tests` Fix docker-tests assumption by Postgres-Sqlalchemy case about scope of metrics
   ([#4258](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4258))
 - `opentelemetry-instrumentation-threading`: fix AttributeError when Thread is run without starting
   ([#4246](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4246))
+- `opentelemetry-instrumentation-psycopg2`: Fix AttributeError by using instrumented connections weakref, instead of mutating connection object
+  ([#4257](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4257))
 
 ### Breaking changes
 

CONTRIBUTING.md

@@ -31,6 +31,7 @@ Please also read the [OpenTelemetry Contributor Guide](https://github.com/open-t
     - [How to Receive Comments](#how-to-receive-comments)
     - [How to Get PRs Reviewed](#how-to-get-prs-reviewed)
     - [How to Get PRs Merged](#how-to-get-prs-merged)
+    - [Stale PRs](#stale-prs)
   - [Design Choices](#design-choices)
     - [Focus on Capabilities, Not Structure Compliance](#focus-on-capabilities-not-structure-compliance)
   - [Running Tests Locally](#running-tests-locally)
@@ -241,6 +242,12 @@ A PR is considered to be **ready to merge** when:
 
 Any Approver / Maintainer can merge the PR once it is **ready to merge**.
 
+### Stale PRs
+
+PRs with no activity for 14 days will be automatically marked as stale and closed after a further 14 days of inactivity. To prevent a PR from being marked stale, ensure there is regular activity (commits, comments, reviews, etc).
+
+Project managers can also exempt a PR from this by applying one of the following labels: `hold`, `WIP`, `blocked-by-spec`, `do not merge`.
+
 ## Design Choices
 
 As with other OpenTelemetry clients, opentelemetry-python follows the

README-upstream.md

@@ -122,9 +122,12 @@ For more information about the maintainer role, see the [community repository](h
 ### Approvers
 
 - [Dylan Russell](https://github.com/dylanrussell), Google
-- [Emídio Neto](https://github.com/emdneto), PicPay
+- [Emídio Neto](https://github.com/emdneto), Independent
+- [Héctor Hernández](https://github.com/hectorhdzg), Microsoft
 - [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
+- [Keith Decker](https://github.com/keith-decker), Cisco/Splunk
 - [Liudmila Molkova](https://github.com/lmolkova), Grafana Labs
+- [Lukas Hering](https://github.com/herin049), Capital One
 - [Owais Lone](https://github.com/owais), Splunk
 - [Pablo Collins](https://github.com/pmcollins), Splunk
 - [Sanket Mehta](https://github.com/sanketmehta28), Cisco

_template/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.61b0.dev"
+__version__ = "0.62b0.dev"

docs/conf.py

@@ -118,6 +118,8 @@
 
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3/", None),
+    "psycopg": ("https://www.psycopg.org/psycopg3/docs/", None),
+    "psycopg2": ("https://www.psycopg.org/docs/", None),
     "opentracing": (
         "https://opentracing-python.readthedocs.io/en/latest/",
         None,

docs/instrumentation/asyncio/asyncio.rst

@@ -5,3 +5,8 @@ OpenTelemetry asyncio Instrumentation
     :members:
     :undoc-members:
     :show-inheritance:
+
+.. automodule:: opentelemetry.instrumentation.asyncio.environment_variables
+    :members:
+    :undoc-members:
+    :show-inheritance:

eachdist.ini

@@ -16,7 +16,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.40.0.dev
+version=1.41.0.dev
 
 packages=
     opentelemetry-sdk
@@ -35,7 +35,7 @@ packages=
     opentelemetry-exporter-credential-provider-gcp
 
 [prerelease]
-version=0.61b0.dev
+version=0.62b0.dev
 
 packages=
     all
@@ -51,6 +51,8 @@ packages=
     opentelemetry-resource-detector-azure
     opentelemetry-sdk-extension-aws
     opentelemetry-propagator-aws-xray
+    opentelemetry-instrumentation-anthropic
+    opentelemetry-instrumentation-claude-agent-sdk
     opentelemetry-instrumentation-google-genai
     opentelemetry-instrumentation-vertexai
     opentelemetry-instrumentation-openai-v2

exporter/opentelemetry-exporter-credential-provider-gcp/src/opentelemetry/gcp_credential_provider/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.61b0.dev"
+__version__ = "0.62b0.dev"

exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.61b0.dev"
+__version__ = "0.62b0.dev"