Skip to content

Commit e528cde

Browse files
committed
update naming of internal metric environment variable
1 parent e065402 commit e528cde

19 files changed

Lines changed: 82 additions & 50 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
OTEL_EXPORTER_OTLP_HEADERS,
104104
OTEL_EXPORTER_OTLP_INSECURE,
105105
OTEL_EXPORTER_OTLP_TIMEOUT,
106-
OTEL_PYTHON_SDK_METRICS_ENABLED,
106+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED,
107107
)
108108
from opentelemetry.sdk.environment_variables._internal import (
109109
parse_boolean_environment_variable,
@@ -397,7 +397,7 @@ def __init__(
397397
parsed_url,
398398
meter_provider,
399399
disabled=not parse_boolean_environment_variable(
400-
OTEL_PYTHON_SDK_METRICS_ENABLED
400+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED
401401
),
402402
)
403403

exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_exporter_mixin.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
from opentelemetry.sdk.environment_variables import (
5555
_OTEL_PYTHON_EXPORTER_OTLP_GRPC_CREDENTIAL_PROVIDER,
5656
OTEL_EXPORTER_OTLP_COMPRESSION,
57-
OTEL_PYTHON_SDK_METRICS_ENABLED,
57+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED,
5858
)
5959
from opentelemetry.sdk.metrics import MeterProvider
6060
from opentelemetry.sdk.metrics.export import InMemoryMetricReader
@@ -388,7 +388,9 @@ def test_otlp_exporter_otlp_compression_envvar(
388388
),
389389
)
390390

391-
@patch.dict("os.environ", {OTEL_PYTHON_SDK_METRICS_ENABLED: "true"})
391+
@patch.dict(
392+
"os.environ", {OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED: "true"}
393+
)
392394
def test_shutdown(self):
393395
add_TraceServiceServicer_to_server(
394396
TraceServiceServicerWithExportParams(StatusCode.OK),
@@ -485,7 +487,9 @@ def test_export_over_closed_grpc_channel(self):
485487
system() == "Windows",
486488
"For gRPC + windows there's some added delay in the RPCs which breaks the assertion over amount of time passed.",
487489
)
488-
@patch.dict("os.environ", {OTEL_PYTHON_SDK_METRICS_ENABLED: "true"})
490+
@patch.dict(
491+
"os.environ", {OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED: "true"}
492+
)
489493
def test_retry_info_is_respected(self):
490494
mock_trace_service = TraceServiceServicerWithExportParams(
491495
StatusCode.UNAVAILABLE,
@@ -628,7 +632,9 @@ def test_otlp_headers_from_env(self):
628632
(),
629633
)
630634

631-
@patch.dict("os.environ", {OTEL_PYTHON_SDK_METRICS_ENABLED: "true"})
635+
@patch.dict(
636+
"os.environ", {OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED: "true"}
637+
)
632638
def test_permanent_failure(self):
633639
exporter = OTLPSpanExporterForTesting(
634640
insecure=True, meter_provider=self.meter_provider

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/_log_exporter/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
OTEL_EXPORTER_OTLP_LOGS_HEADERS,
6262
OTEL_EXPORTER_OTLP_LOGS_TIMEOUT,
6363
OTEL_EXPORTER_OTLP_TIMEOUT,
64-
OTEL_PYTHON_SDK_METRICS_ENABLED,
64+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED,
6565
)
6666
from opentelemetry.sdk.environment_variables._internal import (
6767
parse_boolean_environment_variable,
@@ -162,7 +162,7 @@ def __init__(
162162
urlparse(self._endpoint),
163163
meter_provider,
164164
disabled=not parse_boolean_environment_variable(
165-
OTEL_PYTHON_SDK_METRICS_ENABLED
165+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED
166166
),
167167
)
168168

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
OTEL_EXPORTER_OTLP_METRICS_HEADERS,
8787
OTEL_EXPORTER_OTLP_METRICS_TIMEOUT,
8888
OTEL_EXPORTER_OTLP_TIMEOUT,
89-
OTEL_PYTHON_SDK_METRICS_ENABLED,
89+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED,
9090
)
9191
from opentelemetry.sdk.environment_variables._internal import (
9292
parse_boolean_environment_variable,
@@ -227,7 +227,7 @@ def __init__(
227227
urlparse(self._endpoint),
228228
meter_provider,
229229
disabled=not parse_boolean_environment_variable(
230-
OTEL_PYTHON_SDK_METRICS_ENABLED
230+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED
231231
),
232232
)
233233

@@ -412,7 +412,7 @@ def set_meter_provider(self, meter_provider: MeterProvider) -> None:
412412
urlparse(self._endpoint),
413413
meter_provider,
414414
disabled=not parse_boolean_environment_variable(
415-
OTEL_PYTHON_SDK_METRICS_ENABLED
415+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED
416416
),
417417
)
418418

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/trace_exporter/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT,
5858
OTEL_EXPORTER_OTLP_TRACES_HEADERS,
5959
OTEL_EXPORTER_OTLP_TRACES_TIMEOUT,
60-
OTEL_PYTHON_SDK_METRICS_ENABLED,
60+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED,
6161
)
6262
from opentelemetry.sdk.environment_variables._internal import (
6363
parse_boolean_environment_variable,
@@ -157,7 +157,7 @@ def __init__(
157157
urlparse(self._endpoint),
158158
meter_provider,
159159
disabled=not parse_boolean_environment_variable(
160-
OTEL_PYTHON_SDK_METRICS_ENABLED
160+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED
161161
),
162162
)
163163

exporter/opentelemetry-exporter-otlp-proto-http/tests/metrics/test_otlp_metrics_exporter.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE,
7070
OTEL_EXPORTER_OTLP_METRICS_TIMEOUT,
7171
OTEL_EXPORTER_OTLP_TIMEOUT,
72-
OTEL_PYTHON_SDK_METRICS_ENABLED,
72+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED,
7373
)
7474
from opentelemetry.sdk.metrics import (
7575
Counter,
@@ -335,7 +335,9 @@ def test_headers_parse_from_env(self):
335335
),
336336
)
337337

338-
@patch.dict("os.environ", {OTEL_PYTHON_SDK_METRICS_ENABLED: "true"})
338+
@patch.dict(
339+
"os.environ", {OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED: "true"}
340+
)
339341
@patch.object(Session, "post")
340342
def test_success(self, mock_post):
341343
resp = Response()
@@ -374,7 +376,9 @@ def test_success(self, mock_post):
374376
metrics[2].data.data_points[0].attributes
375377
)
376378

377-
@patch.dict("os.environ", {OTEL_PYTHON_SDK_METRICS_ENABLED: "true"})
379+
@patch.dict(
380+
"os.environ", {OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED: "true"}
381+
)
378382
@patch.object(Session, "post")
379383
def test_failure(self, mock_post):
380384
resp = Response()
@@ -1294,7 +1298,9 @@ def test_preferred_aggregation_override(self):
12941298
exporter._preferred_aggregation[Histogram], histogram_aggregation
12951299
)
12961300

1297-
@patch.dict("os.environ", {OTEL_PYTHON_SDK_METRICS_ENABLED: "true"})
1301+
@patch.dict(
1302+
"os.environ", {OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED: "true"}
1303+
)
12981304
@patch.object(Session, "post")
12991305
def test_retry_timeout(self, mock_post):
13001306
exporter = OTLPMetricExporter(

exporter/opentelemetry-exporter-otlp-proto-http/tests/test_proto_log_exporter.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
OTEL_EXPORTER_OTLP_LOGS_HEADERS,
5959
OTEL_EXPORTER_OTLP_LOGS_TIMEOUT,
6060
OTEL_EXPORTER_OTLP_TIMEOUT,
61-
OTEL_PYTHON_SDK_METRICS_ENABLED,
61+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED,
6262
)
6363
from opentelemetry.sdk.metrics import MeterProvider
6464
from opentelemetry.sdk.metrics.export import InMemoryMetricReader
@@ -468,7 +468,9 @@ def test_2xx_status_code(self, mock_otlp_metric_exporter):
468468
LogRecordExportResult.SUCCESS,
469469
)
470470

471-
@patch.dict("os.environ", {OTEL_PYTHON_SDK_METRICS_ENABLED: "true"})
471+
@patch.dict(
472+
"os.environ", {OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED: "true"}
473+
)
472474
@patch.object(Session, "post")
473475
def test_retry_timeout(self, mock_post):
474476
exporter = OTLPLogExporter(
@@ -557,7 +559,9 @@ def test_export_no_collector_available_retryable(self, mock_post):
557559
warning.records[0].message,
558560
)
559561

560-
@patch.dict("os.environ", {OTEL_PYTHON_SDK_METRICS_ENABLED: "true"})
562+
@patch.dict(
563+
"os.environ", {OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED: "true"}
564+
)
561565
@patch.object(Session, "post")
562566
def test_export_no_collector_available(self, mock_post):
563567
exporter = OTLPLogExporter(

exporter/opentelemetry-exporter-otlp-proto-http/tests/test_proto_span_exporter.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT,
4949
OTEL_EXPORTER_OTLP_TRACES_HEADERS,
5050
OTEL_EXPORTER_OTLP_TRACES_TIMEOUT,
51-
OTEL_PYTHON_SDK_METRICS_ENABLED,
51+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED,
5252
)
5353
from opentelemetry.sdk.metrics import MeterProvider
5454
from opentelemetry.sdk.metrics.export import InMemoryMetricReader
@@ -299,7 +299,9 @@ def test_exporter_metrics_disabled_by_default(self, _mock_export):
299299

300300
self.assertIsNone(self.metric_reader.get_metrics_data())
301301

302-
@patch.dict("os.environ", {OTEL_PYTHON_SDK_METRICS_ENABLED: "true"})
302+
@patch.dict(
303+
"os.environ", {OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED: "true"}
304+
)
303305
@patch.object(Session, "post")
304306
def test_retry_timeout(self, mock_post):
305307
exporter = OTLPSpanExporter(
@@ -388,7 +390,9 @@ def test_export_no_collector_available_retryable(self, mock_post):
388390
warning.records[0].message,
389391
)
390392

391-
@patch.dict("os.environ", {OTEL_PYTHON_SDK_METRICS_ENABLED: "true"})
393+
@patch.dict(
394+
"os.environ", {OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED: "true"}
395+
)
392396
@patch.object(Session, "post")
393397
def test_export_no_collector_available(self, mock_post):
394398
exporter = OTLPSpanExporter(

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/_logger_metrics.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
from opentelemetry import metrics as metrics_api
1616
from opentelemetry.sdk.environment_variables import (
17-
OTEL_PYTHON_SDK_METRICS_ENABLED,
17+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED,
1818
)
1919
from opentelemetry.sdk.environment_variables._internal import (
2020
parse_boolean_environment_variable,
@@ -29,7 +29,7 @@ def __init__(self, meter_provider: metrics_api.MeterProvider) -> None:
2929
meter = meter_provider.get_meter("opentelemetry-sdk")
3030
self._created_logs = create_otel_sdk_log_created(meter)
3131
self._disabled = not parse_boolean_environment_variable(
32-
OTEL_PYTHON_SDK_METRICS_ENABLED
32+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED
3333
)
3434

3535
def emit_log(self) -> None:

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
OTEL_BLRP_MAX_EXPORT_BATCH_SIZE,
4747
OTEL_BLRP_MAX_QUEUE_SIZE,
4848
OTEL_BLRP_SCHEDULE_DELAY,
49-
OTEL_PYTHON_SDK_METRICS_ENABLED,
49+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED,
5050
)
5151
from opentelemetry.sdk.environment_variables._internal import (
5252
parse_boolean_environment_variable,
@@ -195,7 +195,7 @@ def __init__(
195195
OtelComponentTypeValues.SIMPLE_LOG_PROCESSOR,
196196
meter_provider or get_meter_provider(),
197197
disabled=not parse_boolean_environment_variable(
198-
OTEL_PYTHON_SDK_METRICS_ENABLED
198+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED
199199
),
200200
)
201201

@@ -312,7 +312,7 @@ def __init__(
312312
meter_provider or get_meter_provider(),
313313
capacity=max_queue_size,
314314
disabled=not parse_boolean_environment_variable(
315-
OTEL_PYTHON_SDK_METRICS_ENABLED
315+
OTEL_PYTHON_SDK_INTERNAL_METRICS_ENABLED
316316
),
317317
),
318318
)

0 commit comments

Comments
 (0)