Merge remote-tracking branch 'origin/main' into retry2

DylanRussell · DylanRussell · commit 096b9f8fd0d5 · 2025-05-22T14:26:50.000Z
diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml
@@ -66,44 +66,6 @@ jobs:
       - name: Run tests
         run: tox -e tracecontext
 
-  mypy:
-    name: mypy
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Install tox
-        run: pip install tox
-
-      - name: Run tests
-        run: tox -e mypy
-
-  mypyinstalled:
-    name: mypyinstalled
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Install tox
-        run: pip install tox
-
-      - name: Run tests
-        run: tox -e mypyinstalled
-
   typecheck:
     name: typecheck
     runs-on: ubuntu-latest
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,13 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- typecheck: add sdk/resources and drop mypy
+  ([#4578](https://github.com/open-telemetry/opentelemetry-python/pull/4578))
 - 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)).
 - Update OTLP gRPC/HTTP exporters: the export timeout is now inclusive of all retries and backoffs,
-  and an unnecessary 32 second sleep that occurred after all retries had completed/failed was removed
+  and an unnecessary 32 second sleep that occurred after all retries had completed/failed was removed.
+  Update gRPC OTLP Exporters to use official gRPC retry policy config. The `RetryInfo` proto in the error
+  response will now be ignored, and server's should now use the gRPC supported header `grpc-retry-pushback-ms`.
   ([#4564](https://github.com/open-telemetry/opentelemetry-python/pull/4564)).
-
+- 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))
 
 ## Version 1.33.0/0.54b0 (2025-05-09)
 
@@ -95,8 +104,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
diff --git a/README.md b/README.md
@@ -91,7 +91,7 @@ For additional exporter and instrumentation packages, see the
 
 For information about contributing to OpenTelemetry Python, see [CONTRIBUTING.md](CONTRIBUTING.md).
 
-We meet weekly on Thursdays at 9AM PST. The meeting is subject to change depending on contributors' availability. Check the [OpenTelemetry community calendar](https://calendar.google.com/calendar/embed?src=google.com_b79e3e90j7bbsa2n2p5an5lf60%40group.calendar.google.com) for specific dates and Zoom meeting links.
+We meet weekly on Thursdays at 9AM PST. The meeting is subject to change depending on contributors' availability. Check the [OpenTelemetry community calendar](https://calendar.google.com/calendar/embed?src=c_2bf73e3b6b530da4babd444e72b76a6ad893a5c3f43cf40467abc7a9a897f977%40group.calendar.google.com) for specific dates and Zoom meeting links.
 
 Meeting notes are available as a public [Google doc](https://docs.google.com/document/d/1CIMGoIOZ-c3-igzbd6_Pnxx1SjAkjwqoYSUWxPY8XIs/edit).
 
diff --git a/RELEASING.md b/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))
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,7 +1,6 @@
 pylint==3.3.4
 httpretty==1.1.4
 pyright==1.1.396
-mypy==1.9.0
 sphinx==7.1.2
 sphinx-rtd-theme==2.0.0rc4
 sphinx-autodoc-typehints==1.25.2
diff --git a/mypy-relaxed.ini b/mypy-relaxed.ini
diff --git a/mypy.ini b/mypy.ini
diff --git a/opentelemetry-api/pyproject.toml b/opentelemetry-api/pyproject.toml
@@ -30,7 +30,7 @@ dependencies = [
     "Deprecated >= 1.2.6",
     # FIXME This should be able to be removed after 3.12 is released if there is a reliable API
     # in importlib.metadata.
-    "importlib-metadata >= 6.0, < 8.7.0",
+    "importlib-metadata >= 6.0, < 8.8.0",
 ]
 dynamic = [
     "version",
diff --git a/opentelemetry-api/test-requirements.txt b/opentelemetry-api/test-requirements.txt
@@ -1,7 +1,7 @@
 asgiref==3.7.2
 Deprecated==1.2.14
 importlib-metadata==8.5.0 ; python_version < "3.9"
-importlib-metadata==8.6.1 ; python_version >= "3.9"
+importlib-metadata==8.7.0 ; python_version >= "3.9"
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_shared_internal/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/_shared_internal/__init__.py
@@ -167,15 +167,15 @@ def _export(self, batch_strategy: BatchExportStrategy) -> None:
                     )
                 detach(token)
 
+    # Do not add any logging.log statements to this function, they can be being routed back to this `emit` function,
+    # resulting in endless recursive calls that crash the program.
+    # See https://github.com/open-telemetry/opentelemetry-python/issues/4261
     def emit(self, data: Telemetry) -> None:
         if self._shutdown:
-            self._logger.info("Shutdown called, ignoring %s.", self._exporting)
             return
         if self._pid != os.getpid():
             self._bsp_reset_once.do_once(self._at_fork_reinit)
-
-        if len(self._queue) == self._max_queue_size:
-            self._logger.warning("Queue full, dropping %s.", self._exporting)
+        # This will drop a log from the right side if the queue is at _max_queue_length.
         self._queue.appendleft(data)
         if len(self._queue) >= self._max_export_batch_size:
             self._worker_awaken.set()
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py
@@ -67,7 +67,7 @@
 from json import dumps
 from os import environ
 from types import ModuleType
-from typing import List, MutableMapping, Optional, cast
+from typing import List, Optional, cast
 from urllib import parse
 
 from opentelemetry.attributes import BoundedAttributes
@@ -77,7 +77,10 @@
     OTEL_SERVICE_NAME,
 )
 from opentelemetry.semconv.resource import ResourceAttributes
-from opentelemetry.util._importlib_metadata import entry_points, version
+from opentelemetry.util._importlib_metadata import (
+    entry_points,  # type: ignore[reportUnknownVariableType]
+    version,
+)
 from opentelemetry.util.types import AttributeValue
 
 psutil: Optional[ModuleType] = None
@@ -210,7 +213,7 @@ def create(
                             entry_points(
                                 group="opentelemetry_resource_detector",
                                 name=resource_detector.strip(),
-                            )  # type: ignore
+                            )  # type: ignore[reportUnknownArgumentType]
                         )
                     ).load()()
                 )
@@ -266,8 +269,8 @@ def merge(self, other: "Resource") -> "Resource":
         Returns:
             The newly-created Resource.
         """
-        merged_attributes = self.attributes.copy()  # type: ignore
-        merged_attributes.update(other.attributes)  # type: ignore
+        merged_attributes = dict(self.attributes).copy()
+        merged_attributes.update(other.attributes)
 
         if self.schema_url == "":
             schema_url = other.schema_url
@@ -282,7 +285,7 @@ def merge(self, other: "Resource") -> "Resource":
                 other.schema_url,
             )
             return self
-        return Resource(merged_attributes, schema_url)  # type: ignore
+        return Resource(merged_attributes, schema_url)
 
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, Resource):
@@ -294,16 +297,13 @@ def __eq__(self, other: object) -> bool:
 
     def __hash__(self) -> int:
         return hash(
-            f"{dumps(self._attributes.copy(), sort_keys=True)}|{self._schema_url}"  # type: ignore
+            f"{dumps(self._attributes.copy(), sort_keys=True)}|{self._schema_url}"
         )
 
     def to_json(self, indent: Optional[int] = 4) -> str:
-        attributes: MutableMapping[str, AttributeValue] = dict(
-            self._attributes
-        )
         return dumps(
             {
-                "attributes": attributes,  # type: ignore
+                "attributes": dict(self.attributes),
                 "schema_url": self._schema_url,
             },
             indent=indent,
@@ -334,7 +334,7 @@ class OTELResourceDetector(ResourceDetector):
     # pylint: disable=no-self-use
     def detect(self) -> "Resource":
         env_resources_items = environ.get(OTEL_RESOURCE_ATTRIBUTES)
-        env_resource_map = {}
+        env_resource_map: dict[str, AttributeValue] = {}
 
         if env_resources_items:
             for item in env_resources_items.split(","):
@@ -392,7 +392,7 @@ def detect(self) -> "Resource":
             resource_info[PROCESS_PARENT_PID] = os.getppid()
 
         if psutil is not None:
-            process: psutil_module.Process = psutil.Process()
+            process = psutil.Process()
             username = process.username()
             resource_info[PROCESS_OWNER] = username
 
@@ -483,7 +483,7 @@ def detect(self) -> "Resource":
         )
 
 
-class _HostResourceDetector(ResourceDetector):
+class _HostResourceDetector(ResourceDetector):  # type: ignore[reportUnusedClass]
     """
     The HostResourceDetector detects the hostname and architecture attributes.
     """
diff --git a/opentelemetry-sdk/tests/logs/test_export.py b/opentelemetry-sdk/tests/logs/test_export.py
@@ -17,8 +17,11 @@
 import os
 import time
 import unittest
+from sys import version_info
 from unittest.mock import Mock, patch
 
+from pytest import mark
+
 from opentelemetry._logs import SeverityNumber
 from opentelemetry.sdk import trace
 from opentelemetry.sdk._logs import (
@@ -342,6 +345,39 @@ def test_emit_call_log_record(self):
         logger.error("error")
         self.assertEqual(log_record_processor.emit.call_count, 1)
 
+    @mark.skipif(
+        version_info < (3, 10),
+        reason="assertNoLogs only exists in python 3.10+.",
+    )
+    def test_logging_lib_not_invoked_in_batch_log_record_emit(self):  # pylint: disable=no-self-use
+        # See https://github.com/open-telemetry/opentelemetry-python/issues/4261
+        exporter = Mock()
+        processor = BatchLogRecordProcessor(exporter)
+        logger_provider = LoggerProvider(
+            resource=SDKResource.create(
+                {
+                    "service.name": "shoppingcart",
+                    "service.instance.id": "instance-12",
+                }
+            ),
+        )
+        logger_provider.add_log_record_processor(processor)
+        handler = LoggingHandler(
+            level=logging.INFO, logger_provider=logger_provider
+        )
+        sdk_logger = logging.getLogger("opentelemetry.sdk")
+        # Attach OTLP handler to SDK logger
+        sdk_logger.addHandler(handler)
+        # If `emit` calls logging.log then this test will throw a maximum recursion depth exceeded exception and fail.
+        try:
+            with self.assertNoLogs(sdk_logger, logging.NOTSET):
+                processor.emit(EMPTY_LOG)
+            processor.shutdown()
+            with self.assertNoLogs(sdk_logger, logging.NOTSET):
+                processor.emit(EMPTY_LOG)
+        finally:
+            sdk_logger.removeHandler(handler)
+
     def test_args(self):
         exporter = InMemoryLogExporter()
         log_record_processor = BatchLogRecordProcessor(
diff --git a/opentelemetry-sdk/tests/shared_internal/test_batch_processor.py b/opentelemetry-sdk/tests/shared_internal/test_batch_processor.py
@@ -88,7 +88,7 @@ def test_telemetry_exported_once_schedule_delay_reached(
         exporter.export.assert_called_once_with([telemetry])
 
     def test_telemetry_flushed_before_shutdown_and_dropped_after_shutdown(
-        self, batch_processor_class, telemetry, caplog
+        self, batch_processor_class, telemetry
     ):
         exporter = Mock()
         batch_processor = batch_processor_class(
@@ -107,8 +107,6 @@ def test_telemetry_flushed_before_shutdown_and_dropped_after_shutdown(
 
         # This should not be flushed.
         batch_processor.emit(telemetry)
-        assert len(caplog.records) == 1
-        assert "Shutdown called, ignoring" in caplog.text
         exporter.export.assert_called_once()
 
     # pylint: disable=no-self-use
diff --git a/pyproject.toml b/pyproject.toml
@@ -113,7 +113,6 @@ exclude = [
   "opentelemetry-sdk/src/opentelemetry/sdk/_events",
   "opentelemetry-sdk/src/opentelemetry/sdk/_logs",
   "opentelemetry-sdk/src/opentelemetry/sdk/error_handler",
-  "opentelemetry-sdk/src/opentelemetry/sdk/resources",
   "opentelemetry-sdk/src/opentelemetry/sdk/metrics",
   "opentelemetry-sdk/src/opentelemetry/sdk/trace",
   "opentelemetry-sdk/src/opentelemetry/sdk/util",
@@ -124,4 +123,5 @@ exclude = [
 strict = [
   "opentelemetry-semantic-conventions",
   "opentelemetry-sdk/src/opentelemetry/sdk/environment_variables",
+  "opentelemetry-sdk/src/opentelemetry/sdk/resources",
 ]
diff --git a/tox.ini b/tox.ini
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ dependencies = [`
`30`	`30`	`"Deprecated >= 1.2.6",`
`31`	`31`	`# FIXME This should be able to be removed after 3.12 is released if there is a reliable API`
`32`	`32`	`# in importlib.metadata.`
`33`		`- "importlib-metadata >= 6.0, < 8.7.0",`
	`33`	`+ "importlib-metadata >= 6.0, < 8.8.0",`
`34`	`34`	`]`
`35`	`35`	`dynamic = [`
`36`	`36`	`"version",`