Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disconnect gRPC client stub when shutting down OTLPSpanExporter #4370

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+7 −7
Open

Disconnect gRPC client stub when shutting down OTLPSpanExporter #4370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0322bf7
Disconnect gRPC client stub when shutting down OTLPSpanExporter
xmakro Dec 21, 2024
9d4e316
Update CHANGELOG.md
xmakro Dec 23, 2024
3881da6
Close channel instead of destroying client
xmakro Dec 24, 2024
361966c
Merge branch 'main' into patch-1
xmakro Dec 24, 2024
d71bd27
Merge branch 'main' into patch-1
xrmx Feb 14, 2025
f90d38f
Merge branch 'main' into patch-1
xmakro Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Tolerates exceptions when loading resource detectors via `OTEL_EXPERIMENTAL_RESOURCE_DETECTORS`
([#4373](https://github.com/open-telemetry/opentelemetry-python/pull/4373))
- Disconnect gRPC client stub when shutting down `OTLPSpanExporter`
([#4370](https://github.com/open-telemetry/opentelemetry-python/pull/4370))
- opentelemetry-sdk: fix OTLP exporting of Histograms with explicit buckets advisory
([#4434](https://github.com/open-telemetry/opentelemetry-python/pull/4434))

Expand Down
12 changes: 5 additions & 7 deletions ...telemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,21 +243,18 @@ def __init__(
) or Compression.NoCompression

if insecure:
self._client = self._stub(
insecure_channel(self._endpoint, compression=compression)
)
self._channel = insecure_channel(self._endpoint, compression=compression)
else:
credentials = _get_credentials(
credentials,
OTEL_EXPORTER_OTLP_CERTIFICATE,
OTEL_EXPORTER_OTLP_CLIENT_KEY,
OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE,
)
self._client = self._stub(
secure_channel(
self._endpoint, credentials, compression=compression
)
self._channel = secure_channel(
self._endpoint, credentials, compression=compression
)
self._client = self._stub(self._channel)

self._export_lock = threading.Lock()
self._shutdown = False
Expand Down Expand Up @@ -360,6 +357,7 @@ def shutdown(self, timeout_millis: float = 30_000, **kwargs) -> None:
# wait for the last export if any
self._export_lock.acquire(timeout=timeout_millis / 1e3)
self._shutdown = True
self._channel.close()
self._export_lock.release()

@property
Expand Down
Loading