Merge branch 'main' into add-docs-example-sqlcommenter

Author: xrmx

.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,3 @@
+[rstcheck]
+ignore_directives = automodule
+ignore_roles = scm_web,scm_raw_web

CHANGELOG.md

@@ -12,6 +12,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## Version 1.38.0/0.59b0 (2025-10-16)
+
+- Add `rstcheck` to pre-commit to stop introducing invalid RST
+  ([#4755](https://github.com/open-telemetry/opentelemetry-python/pull/4755))
+- logs: extend Logger.emit to accept separated keyword arguments
+  ([#4737](https://github.com/open-telemetry/opentelemetry-python/pull/4737))
+- logs: add warnings for classes that would be deprecated and renamed in 1.39.0
+  ([#4771](https://github.com/open-telemetry/opentelemetry-python/pull/4771))
+
 ## Version 1.37.0/0.58b0 (2025-09-11)
 
 - Add experimental composite samplers

CONTRIBUTING.md

@@ -72,7 +72,7 @@ You can run `tox` with the following arguments:
 - `tox -e tracecontext` to run integration tests for tracecontext.
 - `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

dev-requirements.txt

@@ -1,6 +1,6 @@
 pylint==3.3.4
 httpretty==1.1.4
-pyright==1.1.396
+pyright==1.1.405
 sphinx==7.1.2
 sphinx-rtd-theme==2.0.0rc4
 sphinx-autodoc-typehints==1.25.2

docs/conf.py

@@ -100,6 +100,7 @@
     ("py:class", "CarrierT"),
     ("py:obj", "opentelemetry.propagators.textmap.CarrierT"),
     ("py:obj", "Union"),
+    ("py:data", "typing.Union"),
     (
         "py:class",
         "opentelemetry.sdk.metrics._internal.instrument._Synchronous",
@@ -115,6 +116,18 @@
         "py:class",
         "opentelemetry.trace._LinkBase",
     ),
+    (
+        "py:class",
+        "opentelemetry.proto.collector.trace.v1.trace_service_pb2_grpc.TraceServiceStub",
+    ),
+    (
+        "py:class",
+        "opentelemetry.proto.collector.metrics.v1.metrics_service_pb2_grpc.MetricsServiceStub",
+    ),
+    (
+        "py:class",
+        "opentelemetry.proto.collector.logs.v1.logs_service_pb2_grpc.LogsServiceStub",
+    ),
     (
         "py:class",
         "opentelemetry.exporter.otlp.proto.grpc.exporter.OTLPExporterMixin",

docs/examples/logs/README.rst

@@ -23,18 +23,13 @@ Start the Collector locally to see data being exported. Write the following file
       debug:
         verbosity: detailed
 
-    processors:
-      batch:
-
     service:
         pipelines:
             logs:
                 receivers: [otlp]
-                processors: [batch]
                 exporters: [debug]
             traces:
                 receivers: [otlp]
-                processors: [batch]
                 exporters: [debug]
 
 Then start the Docker container:

docs/examples/logs/otel-collector-config.yaml

@@ -8,16 +8,12 @@ exporters:
   debug:
     verbosity: detailed
 
-processors:
-  batch:
 
 service:
     pipelines:
         logs:
             receivers: [otlp]
-            processors: [batch]
             exporters: [debug]
         traces: 
             receivers: [otlp]
-            processors: [batch]
             exporters: [debug]

docs/examples/metrics/instruments/README.rst

@@ -17,8 +17,6 @@ Start the Collector locally to see data being exported. Write the following file
     exporters:
         debug:
 
-    processors:
-        batch:
 
     service:
         pipelines:

docs/examples/metrics/instruments/otel-collector-config.yaml

@@ -7,9 +7,6 @@ receivers:
 exporters:
     debug:
 
-processors:
-    batch:
-
 service:
     pipelines:
         metrics: