Merge branch 'main' into logs-api-accept-whole-context

Author: tammy-baylis-swi

.github/workflows/fossa.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: fossas/fossa-action@c0a7d013f84c8ee5e910593186598625513cc1e4 # v1.6.0
+      - uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
         with:
           api-key: ${{secrets.FOSSA_API_KEY}}
           team: OpenTelemetry

CHANGELOG.md

@@ -12,6 +12,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactor `BatchLogRecordProcessor` to simplify code and make the control flow more
   clear ([#4562](https://github.com/open-telemetry/opentelemetry-python/pull/4562/)
   and [#4535](https://github.com/open-telemetry/opentelemetry-python/pull/4535)).
+- Use PEP702 for marking deprecations
+  ([#4522](https://github.com/open-telemetry/opentelemetry-python/pull/4522))
+- Refactor `BatchLogRecordProcessor` and `BatchSpanProcessor` to simplify code
+  and make the control flow more clear ([#4562](https://github.com/open-telemetry/opentelemetry-python/pull/4562/)
+  [#4535](https://github.com/open-telemetry/opentelemetry-python/pull/4535), and
+  [#4580](https://github.com/open-telemetry/opentelemetry-python/pull/4580)).
+- Remove log messages from `BatchLogRecordProcessor.emit`, this caused the program
+  to crash at shutdown with a max recursion error ([#4586](https://github.com/open-telemetry/opentelemetry-python/pull/4586)).
+- Configurable max retry timeout for grpc exporter
+  ([#4333](https://github.com/open-telemetry/opentelemetry-python/pull/4333))
+- opentelemetry-api: allow importlib-metadata 8.7.0
+  ([#4593](https://github.com/open-telemetry/opentelemetry-python/pull/4593))
+- opentelemetry-test-utils: assert explicit bucket boundaries in histogram metrics
+  ([#4595](https://github.com/open-telemetry/opentelemetry-python/pull/4595))
 - Logging API and Events API accept SpanContext instead of trace_id, span_id, trace_flags
   ([#4584](https://github.com/open-telemetry/opentelemetry-python/pull/4584))
 
@@ -95,8 +109,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4353](https://github.com/open-telemetry/opentelemetry-python/pull/4353))
 - sdk: don't log or print warnings when the SDK has been disabled
   ([#4371](https://github.com/open-telemetry/opentelemetry-python/pull/4371))
-- Configurable max retry timeout for grpc exporter
-  ([#4333](https://github.com/open-telemetry/opentelemetry-python/pull/4333))
 - Fix span context manager typing by using ParamSpec from typing_extensions
   ([#4389](https://github.com/open-telemetry/opentelemetry-python/pull/4389))
 - Fix serialization of None values in logs body to match 1.31.0+ data model

RELEASING.md

@@ -9,9 +9,8 @@
       (otherwise the workflow will pick up the version from `main` and just remove the `.dev` suffix).
   * Review the two pull requests that it creates.
     (one is targeted to the release branch and one is targeted to `main`).
-    * The builds will fail for both the `main` and release pr because of validation rules. Follow the [release workflow](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/RELEASING.md) for the contrib repo up until this same point.
-    * Change the CONTRIB_REPO_SHA of core PRs to point to their counterpart in contrib.
-    * Change the CORE_REPO_SHA of contrib PRs to point to their counterpart in core.
+    * The builds will fail for the release PR because of validation rules. Follow the [release workflow](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/RELEASING.md) for the contrib repo up until this same point.
+    * Close and reopen the PR so that the workflow will take into account the label automation we have in place
     * Release builds now should pass.
   * Merge the release PR.
   * Merge the PR to main (this can be done separately from [making the release](#making-the-release))
@@ -23,13 +22,16 @@
   * Press the "Run workflow" button, then select the release branch from the dropdown list,
     e.g. `release/v1.9.x`, then enter the pull request number that you want to backport,
     then click the "Run workflow" button below that.
+  * Add the label `backport` to the generated pull request.
+  * In case label automation doesn't work, just close and reopen the PR so that the workflow will take into account the label automation we have in place.
   * Review and merge the backport pull request that it generates.
 * Merge a pull request to the release branch updating the `CHANGELOG.md`.
   * The heading for the unreleased entries should be `## Unreleased`.
 * Run the [Prepare patch release workflow](https://github.com/open-telemetry/opentelemetry-python/actions/workflows/prepare-patch-release.yml).
   * Press the "Run workflow" button, then select the release branch from the dropdown list,
     e.g. `release/v1.9.x`, and click the "Run workflow" button below that.
   * Review and merge the pull request that it creates for updating the version.
+* Note: If you are doing a patch release in `-core` repo, you should also do an equivalent patch release in `-contrib` repo (even if there's no fix to release), otherwise tests in CI will fail.
 
 ## Making the release
 

docs/examples/metrics/reader/requirements.txt

@@ -1,6 +1,5 @@
-Deprecated==1.2.13
 opentelemetry-api==1.15.0
 opentelemetry-sdk==1.15.0
 opentelemetry-semantic-conventions==0.36b0
-typing_extensions==4.3.0
+typing_extensions==4.5.0
 wrapt==1.14.1

docs/examples/metrics/views/requirements.txt

@@ -1,6 +1,5 @@
-Deprecated==1.2.13
 opentelemetry-api==1.12.0
 opentelemetry-sdk==1.12.0
 opentelemetry-semantic-conventions==0.33b0
-typing_extensions==4.3.0
+typing_extensions==4.5.0
 wrapt==1.14.1

docs/getting_started/tests/requirements.txt

@@ -3,7 +3,6 @@ attrs==23.1.0
 certifi==2024.7.4
 charset-normalizer==2.0.12
 click==8.1.7
-Deprecated==1.2.14
 Flask==2.3.3
 idna==3.7
 importlib-metadata==6.8.0

exporter/opentelemetry-exporter-opencensus/test-requirements.txt

@@ -1,5 +1,4 @@
 asgiref==3.7.2
-Deprecated==1.2.14
 grpcio==1.66.2
 importlib-metadata==6.11.0
 iniconfig==2.0.0

exporter/opentelemetry-exporter-otlp-proto-common/test-requirements.txt

@@ -1,5 +1,4 @@
 asgiref==3.7.2
-Deprecated==1.2.14
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0

exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml

@@ -28,14 +28,14 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-  "Deprecated >= 1.2.6",
   "googleapis-common-protos ~= 1.52",
   "grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
   "grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
   "opentelemetry-api ~= 1.15",
   "opentelemetry-proto == 1.34.0.dev",
   "opentelemetry-sdk ~= 1.34.0.dev",
   "opentelemetry-exporter-otlp-proto-common == 1.34.0.dev",
+  "typing-extensions >= 4.5.0",
 ]
 
 [project.entry-points.opentelemetry_logs_exporter]

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py

@@ -34,8 +34,8 @@
 from typing import Sequence as TypingSequence
 from urllib.parse import urlparse
 
-from deprecated import deprecated
 from google.rpc.error_details_pb2 import RetryInfo
+from typing_extensions import deprecated
 
 from grpc import (
     ChannelCredentials,
@@ -108,8 +108,7 @@ def environ_to_compression(environ_key: str) -> Optional[Compression]:
 
 
 @deprecated(
-    version="1.18.0",
-    reason="Use one of the encoders from opentelemetry-exporter-otlp-proto-common instead",
+    "Use one of the encoders from opentelemetry-exporter-otlp-proto-common instead. Deprecated since version 1.18.0.",
 )
 def get_resource_data(
     sdk_resource_scope_data: Dict[SDKResource, ResourceDataT],