Skip to content

Commit fe924ee

Browse files
committed
update OTLPMetricExporter to respect timeout
1 parent 35b5586 commit fe924ee

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

  • exporter/opentelemetry-exporter-otlp-json-http/src/opentelemetry/exporter/otlp/json/http

exporter/opentelemetry-exporter-otlp-json-http/src/opentelemetry/exporter/otlp/json/http/_internal/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def __init__(
7575
if certificate is False:
7676
pool_kwargs["cert_reqs"] = "CERT_NONE"
7777
elif certificate and isinstance(certificate, str):
78-
pool_kwargs["cert_file"] = certificate
78+
pool_kwargs["ca_certs"] = certificate
7979

8080
self._http = urllib3.PoolManager(
8181
**pool_kwargs,

exporter/opentelemetry-exporter-otlp-json-http/src/opentelemetry/exporter/otlp/json/http/metric_exporter/__init__.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,20 @@ def __init__(
117117
def export(
118118
self,
119119
metrics_data: MetricsData,
120-
timeout_millis: float | None = 10000,
120+
timeout_millis: float | None = 10_000,
121121
**kwargs,
122122
) -> MetricExportResult:
123123
if self._shutdown:
124124
_logger.warning("Exporter already shutdown, ignoring batch")
125125
return MetricExportResult.FAILURE
126126

127127
export_request = encode_metrics(metrics_data)
128-
deadline = time.time() + self._timeout
128+
timeout = (
129+
self._timeout
130+
if timeout_millis is None
131+
else min(self._timeout, timeout_millis / 1000)
132+
)
133+
deadline = time.time() + timeout
129134
for batch in split_metrics_data(
130135
export_request, self._max_export_batch_size
131136
):

0 commit comments

Comments
 (0)