Merge branch 'main' into docs/periodic-exporting-metric-reader-ref

Author: chimchim89

.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"

.pylintrc

@@ -11,7 +11,7 @@ ignore=CVS,gen,proto
 
 # Add files or directories matching the regex patterns to be excluded. The
 # regex matches against base names, not paths.
-ignore-patterns=
+ignore-patterns=^models\.py$
 
 # Python code to execute, usually for sys.path manipulation such as
 # pygtk.require().

CHANGELOG.md

@@ -12,6 +12,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- `opentelemetry-sdk`: deprecate `LoggingHandler` in favor of `opentelemetry-instrumentation-logging`, see `opentelemetry-instrumentation-logging` documentation
+  ([#4919](https://github.com/open-telemetry/opentelemetry-python/pull/4919))
+- `opentelemetry-sdk`: Clarify log processor error handling expectations in documentation
+  ([#4915](https://github.com/open-telemetry/opentelemetry-python/pull/4915))
+- bump semantic-conventions to v1.40.0
+  ([#4941](https://github.com/open-telemetry/opentelemetry-python/pull/4941))
+- Add stale PR GitHub Action
+  ([#4926](https://github.com/open-telemetry/opentelemetry-python/pull/4926))
 - `opentelemetry-sdk`: Drop unused Jaeger exporter environment variables (exporter removed in 1.22.0)
   ([#4918](https://github.com/open-telemetry/opentelemetry-python/issues/4918))
 - `opentelemetry-sdk`: Clarify timeout units in environment variable documentation
@@ -52,6 +60,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4913](https://github.com/open-telemetry/opentelemetry-python/pull/4913))
 - bump semantic-conventions to v1.39.0
   ([#4914](https://github.com/open-telemetry/opentelemetry-python/pull/4914))
+- `opentelemetry-sdk`: automatically generate configuration models using OTel config JSON schema
+  ([#4879](https://github.com/open-telemetry/opentelemetry-python/pull/4879))
 
 ## Version 1.39.0/0.60b0 (2025-12-03)
 

CONTRIBUTING.md

@@ -291,6 +291,12 @@ Please fork this repo in a personal Github account instead.
 
 One of the maintainers will 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.md

@@ -116,6 +116,7 @@ For more information about the maintainer role, see the [community repository](h
 - [Héctor Hernández](https://github.com/hectorhdzg), Microsoft
 - [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
 - [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
 - [Shalev Roda](https://github.com/shalevr), Cisco

docs/examples/logs/example.py

@@ -5,7 +5,10 @@
 from opentelemetry.exporter.otlp.proto.grpc._log_exporter import (
     OTLPLogExporter,
 )
-from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
+
+# this is available in the opentelemetry-instrumentation-logging package
+from opentelemetry.instrumentation.logging.handler import LoggingHandler
+from opentelemetry.sdk._logs import LoggerProvider
 from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider

opentelemetry-api/src/opentelemetry/metrics/_internal/instrument.py

@@ -183,7 +183,14 @@ def add(
         attributes: Optional[Attributes] = None,
         context: Optional[Context] = None,
     ) -> None:
-        pass
+        """Records an increment to the counter.
+
+        Args:
+            amount: The amount to increment the counter by. Must be non-negative.
+            attributes: Optional set of attributes to associate with the measurement.
+            context: Optional context to associate with the measurement. If not
+                provided, the current context is used.
+        """
 
 
 class NoOpCounter(Counter):
@@ -234,7 +241,18 @@ def add(
         attributes: Optional[Attributes] = None,
         context: Optional[Context] = None,
     ) -> None:
-        pass
+        """Records an increment or decrement to the counter.
+
+        Unlike `Counter`, the ``amount`` may be negative, allowing the
+        instrument to track values that go up and down (e.g. number of
+        active requests, queue depth).
+
+        Args:
+            amount: The amount to add to the counter. May be positive or negative.
+            attributes: Optional set of attributes to associate with the measurement.
+            context: Optional context to associate with the measurement. If not
+                provided, the current context is used.
+        """
 
 
 class NoOpUpDownCounter(UpDownCounter):
@@ -376,7 +394,20 @@ def record(
         attributes: Optional[Attributes] = None,
         context: Optional[Context] = None,
     ) -> None:
-        pass
+        """Records a measurement.
+
+        Used to report measurements that are likely to be statistically
+        meaningful, such as request durations, payload sizes, or any value
+        for which a distribution (e.g. percentiles) is useful.
+
+        Args:
+            amount: The measurement to record. Should be non-negative in most
+                cases; negative values are only meaningful when the histogram
+                is used to track signed deltas.
+            attributes: Optional set of attributes to associate with the measurement.
+            context: Optional context to associate with the measurement. If not
+                provided, the current context is used.
+        """
 
 
 class NoOpHistogram(Histogram):
@@ -486,7 +517,18 @@ def set(
         attributes: Optional[Attributes] = None,
         context: Optional[Context] = None,
     ) -> None:
-        pass
+        """Records the current value of the gauge.
+
+        The gauge reports the last recorded value when observed. It is
+        intended for non-additive measurements where only the current
+        value matters (e.g. CPU utilisation percentage, room temperature).
+
+        Args:
+            amount: The current value to record.
+            attributes: Optional set of attributes to associate with the measurement.
+            context: Optional context to associate with the measurement. If not
+                provided, the current context is used.
+        """
 
 
 class NoOpGauge(Gauge):

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py

@@ -326,6 +326,13 @@ def _init_logging(
         set_event_logger_provider(event_logger_provider)
 
     if setup_logging_handler:
+        warnings.warn(
+            "The `OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED` environment variable "
+            "and the `LoggingHandler` in `opentelemetry-sdk` that it controls are deprecated."
+            "Install `opentelemetry-instrumentation-logging` package instead.",
+            DeprecationWarning,
+        )
+
         # Add OTel handler
         handler = LoggingHandler(
             level=logging.NOTSET, logger_provider=provider