From 60b8e7deccf90725012cc2717dfd8f4a4707803d Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Fri, 27 May 2022 18:11:31 -0700 Subject: [PATCH 1/3] name --- CHANGELOG.md | 4 ++-- .../src/opentelemetry/sdk/_logs/export/__init__.py | 8 ++++++-- .../sdk/metrics/_internal/export/__init__.py | 8 ++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6604cccea1d..8115dd99c39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,11 +13,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#2714](https://github.com/open-telemetry/opentelemetry-python/pull/2714)) - narrow protobuf dependencies to exclude protobuf >= 4 ([#2720](https://github.com/open-telemetry/opentelemetry-python/pull/2720)) +- Specify worker thread names + ([#2720](https://github.com/open-telemetry/opentelemetry-python/pull/2720)) ## [1.12.0rc1-0.31b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0rc1-0.31b0) - 2022-05-17 - - - Fix LoggingHandler to handle LogRecord with exc_info=False ([#2690](https://github.com/open-telemetry/opentelemetry-python/pull/2690)) - Make metrics components public diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_logs/export/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/_logs/export/__init__.py index def39e32c9d..8ebca2a09aa 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/_logs/export/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/_logs/export/__init__.py @@ -147,7 +147,9 @@ def __init__( self._max_export_batch_size = max_export_batch_size self._export_timeout_millis = export_timeout_millis self._queue = collections.deque() # type: Deque[LogData] - self._worker_thread = threading.Thread(target=self.worker, daemon=True) + self._worker_thread = threading.Thread( + name="OtelBatchLogProcessor", target=self.worker, daemon=True + ) self._condition = threading.Condition(threading.Lock()) self._shutdown = False self._flush_request = None # type: Optional[_FlushRequest] @@ -164,7 +166,9 @@ def __init__( def _at_fork_reinit(self): self._condition = threading.Condition(threading.Lock()) self._queue.clear() - self._worker_thread = threading.Thread(target=self.worker, daemon=True) + self._worker_thread = threading.Thread( + name="OtelBatchLogProcessor", target=self.worker, daemon=True + ) self._worker_thread.start() def worker(self): diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py index bcaca4281ee..863b2115b39 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py @@ -373,7 +373,9 @@ def __init__( self._shutdown = False self._shutdown_event = Event() self._shutdown_once = Once() - self._daemon_thread = Thread(target=self._ticker, daemon=True) + self._daemon_thread = Thread( + name="OtelPeriodicExportingMetricReader", target=self._ticker, daemon=True + ) self._daemon_thread.start() if hasattr(os, "register_at_fork"): os.register_at_fork( @@ -381,7 +383,9 @@ def __init__( ) # pylint: disable=protected-access def _at_fork_reinit(self): - self._daemon_thread = Thread(target=self._ticker, daemon=True) + self._daemon_thread = Thread( + name="OtelPeriodicExportingMetricReader", target=self._ticker, daemon=True + ) self._daemon_thread.start() def _ticker(self) -> None: From fdd601527ae3cf36a99cfd417d3f3b143b56d287 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Fri, 27 May 2022 18:30:27 -0700 Subject: [PATCH 2/3] lint --- .../src/opentelemetry/sdk/_logs/export/__init__.py | 8 ++++++-- .../sdk/metrics/_internal/export/__init__.py | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_logs/export/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/_logs/export/__init__.py index 8ebca2a09aa..fb1fc828821 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/_logs/export/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/_logs/export/__init__.py @@ -148,7 +148,9 @@ def __init__( self._export_timeout_millis = export_timeout_millis self._queue = collections.deque() # type: Deque[LogData] self._worker_thread = threading.Thread( - name="OtelBatchLogProcessor", target=self.worker, daemon=True + name="OtelBatchLogProcessor", + target=self.worker, + daemon=True, ) self._condition = threading.Condition(threading.Lock()) self._shutdown = False @@ -167,7 +169,9 @@ def _at_fork_reinit(self): self._condition = threading.Condition(threading.Lock()) self._queue.clear() self._worker_thread = threading.Thread( - name="OtelBatchLogProcessor", target=self.worker, daemon=True + name="OtelBatchLogProcessor", + target=self.worker, + daemon=True, ) self._worker_thread.start() diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py index 863b2115b39..684cb4c5067 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py @@ -374,7 +374,9 @@ def __init__( self._shutdown_event = Event() self._shutdown_once = Once() self._daemon_thread = Thread( - name="OtelPeriodicExportingMetricReader", target=self._ticker, daemon=True + name="OtelPeriodicExportingMetricReader", + target=self._ticker, + daemon=True, ) self._daemon_thread.start() if hasattr(os, "register_at_fork"): @@ -384,7 +386,9 @@ def __init__( def _at_fork_reinit(self): self._daemon_thread = Thread( - name="OtelPeriodicExportingMetricReader", target=self._ticker, daemon=True + name="OtelPeriodicExportingMetricReader", + target=self._ticker, + daemon=True, ) self._daemon_thread.start() From 46d759b5dd3888cf81a46214ad014daef8d35d5d Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 31 May 2022 10:08:49 -0700 Subject: [PATCH 3/3] Update CHANGELOG.md Co-authored-by: Srikanth Chekuri --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8115dd99c39..e9af231dfe4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - narrow protobuf dependencies to exclude protobuf >= 4 ([#2720](https://github.com/open-telemetry/opentelemetry-python/pull/2720)) - Specify worker thread names - ([#2720](https://github.com/open-telemetry/opentelemetry-python/pull/2720)) + ([#2724](https://github.com/open-telemetry/opentelemetry-python/pull/2724)) ## [1.12.0rc1-0.31b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0rc1-0.31b0) - 2022-05-17