Rename variables to add to spec

exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/util.py

@@ -18,8 +18,8 @@
 from grpc import ChannelCredentials, ssl_channel_credentials
 
 from opentelemetry.sdk.environment_variables import (
-    OTEL_PYTHON_EXPORTER_JAEGER_CERTIFICATE,
-    OTEL_PYTHON_EXPORTER_JAEGER_INSECURE,
+    OTEL_EXPORTER_JAEGER_CERTIFICATE,
+    OTEL_EXPORTER_JAEGER_INSECURE,
 )
 
 logger = logging.getLogger(__name__)
@@ -30,7 +30,7 @@
 def _get_insecure(param):
     if param is not None:
         return param
-    insecure_env = environ.get(OTEL_PYTHON_EXPORTER_JAEGER_INSECURE)
+    insecure_env = environ.get(OTEL_EXPORTER_JAEGER_INSECURE)
     if insecure_env is not None:
         return insecure_env.lower() == "true"
     return DEFAULT_INSECURE
@@ -49,7 +49,7 @@ def _load_credential_from_file(path) -> ChannelCredentials:
 def _get_credentials(param):
     if param is not None:
         return param
-    creds_env = environ.get(OTEL_PYTHON_EXPORTER_JAEGER_CERTIFICATE)
+    creds_env = environ.get(OTEL_EXPORTER_JAEGER_CERTIFICATE)
     if creds_env:
         return _load_credential_from_file(creds_env)
     return ssl_channel_credentials()

exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter_protobuf.py

@@ -30,8 +30,8 @@
 )
 from opentelemetry.sdk import trace
 from opentelemetry.sdk.environment_variables import (
+    OTEL_EXPORTER_JAEGER_CERTIFICATE,
     OTEL_EXPORTER_JAEGER_ENDPOINT,
-    OTEL_PYTHON_EXPORTER_JAEGER_CERTIFICATE,
 )
 from opentelemetry.sdk.trace import Resource
 from opentelemetry.sdk.util.instrumentation import InstrumentationInfo
@@ -64,9 +64,7 @@ def test_constructor_by_environment_variables(self):
             "os.environ",
             {
                 OTEL_EXPORTER_JAEGER_ENDPOINT: collector_endpoint,
-                OTEL_PYTHON_EXPORTER_JAEGER_CERTIFICATE: os.path.dirname(
-                    __file__
-                )
+                OTEL_EXPORTER_JAEGER_CERTIFICATE: os.path.dirname(__file__)
                 + "/certs/cred.cert",
             },
         )

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

@@ -42,8 +42,8 @@
     OTEL_EXPORTER_OTLP_CERTIFICATE,
     OTEL_EXPORTER_OTLP_ENDPOINT,
     OTEL_EXPORTER_OTLP_HEADERS,
+    OTEL_EXPORTER_OTLP_INSECURE,
     OTEL_EXPORTER_OTLP_TIMEOUT,
-    OTEL_PYTHON_EXPORTER_OTLP_INSECURE,
 )
 from opentelemetry.sdk.resources import Resource as SDKResource
 
@@ -171,7 +171,7 @@ def __init__(
         )
 
         if insecure is None:
-            insecure = environ.get(OTEL_PYTHON_EXPORTER_OTLP_INSECURE)
+            insecure = environ.get(OTEL_EXPORTER_OTLP_INSECURE)
         if insecure is None:
             insecure = False
 
@@ -195,7 +195,7 @@ def __init__(
         ):
             compression_algorithm = Compression.Gzip
         else:
-            compression_str = environ.get(OTEL_PYTHON_EXPORTER_OTLP_INSECURE)
+            compression_str = environ.get(OTEL_EXPORTER_OTLP_INSECURE)
             if compression_str is None:
                 compression_algorithm = Compression.NoCompression
             elif (

exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/metrics_exporter/__init__.py

@@ -48,8 +48,8 @@
     OTEL_EXPORTER_OTLP_METRIC_CERTIFICATE,
     OTEL_EXPORTER_OTLP_METRIC_ENDPOINT,
     OTEL_EXPORTER_OTLP_METRIC_HEADERS,
+    OTEL_EXPORTER_OTLP_METRIC_INSECURE,
     OTEL_EXPORTER_OTLP_METRIC_TIMEOUT,
-    OTEL_PYTHON_EXPORTER_OTLP_METRIC_INSECURE,
 )
 from opentelemetry.sdk.metrics import (
     Counter,
@@ -150,7 +150,7 @@ def __init__(
         timeout: Optional[int] = None,
     ):
         if insecure is None:
-            insecure = environ.get(OTEL_PYTHON_EXPORTER_OTLP_METRIC_INSECURE)
+            insecure = environ.get(OTEL_EXPORTER_OTLP_METRIC_INSECURE)
 
         if (
             not insecure

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

@@ -42,8 +42,8 @@
     OTEL_EXPORTER_OTLP_SPAN_CERTIFICATE,
     OTEL_EXPORTER_OTLP_SPAN_ENDPOINT,
     OTEL_EXPORTER_OTLP_SPAN_HEADERS,
+    OTEL_EXPORTER_OTLP_SPAN_INSECURE,
     OTEL_EXPORTER_OTLP_SPAN_TIMEOUT,
-    OTEL_PYTHON_EXPORTER_OTLP_SPAN_INSECURE,
 )
 from opentelemetry.sdk.trace import Span as SDKSpan
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
@@ -80,7 +80,7 @@ def __init__(
         timeout: Optional[int] = None,
     ):
         if insecure is None:
-            insecure = environ.get(OTEL_PYTHON_EXPORTER_OTLP_SPAN_INSECURE)
+            insecure = environ.get(OTEL_EXPORTER_OTLP_SPAN_INSECURE)
 
         if (
             not insecure

exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py

@@ -27,7 +27,7 @@
 .. _Specification: https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/sdk-environment-variables.md#zipkin-exporter
 
 .. envvar:: OTEL_EXPORTER_ZIPKIN_ENDPOINT
-.. envvar:: OTEL_PYTHON_EXPORTER_ZIPKIN_TRANSPORT_FORMAT
+.. envvar:: OTEL_EXPORTER_ZIPKIN_TRANSPORT_FORMAT
 
 .. code:: python
 
@@ -63,7 +63,7 @@
 :envvar:`OTEL_EXPORTER_ZIPKIN_ENDPOINT`: target to which the exporter will
 send data. This may include a path (e.g. http://example.com:9411/api/v2/spans).
 
-:envvar:`OTEL_PYTHON_EXPORTER_ZIPKIN_TRANSPORT_FORMAT`: transport interchange format
+:envvar:`OTEL_EXPORTER_ZIPKIN_TRANSPORT_FORMAT`: transport interchange format
 to use when sending data. Currently only Zipkin's v2 json and protobuf formats
 are supported, with v2 json being the default.
 
@@ -82,7 +82,7 @@
 from opentelemetry.exporter.zipkin.gen import zipkin_pb2
 from opentelemetry.sdk.environment_variables import (
     OTEL_EXPORTER_ZIPKIN_ENDPOINT,
-    OTEL_PYTHON_EXPORTER_ZIPKIN_TRANSPORT_FORMAT,
+    OTEL_EXPORTER_ZIPKIN_TRANSPORT_FORMAT,
 )
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
 from opentelemetry.trace import Span, SpanContext, SpanKind
@@ -161,7 +161,7 @@ def __init__(
 
         if transport_format is None:
             self.transport_format = (
-                environ.get(OTEL_PYTHON_EXPORTER_ZIPKIN_TRANSPORT_FORMAT)
+                environ.get(OTEL_EXPORTER_ZIPKIN_TRANSPORT_FORMAT)
                 or TRANSPORT_FORMAT_JSON
             )
         else:

exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py

@@ -32,7 +32,7 @@
 from opentelemetry.sdk import trace
 from opentelemetry.sdk.environment_variables import (
     OTEL_EXPORTER_ZIPKIN_ENDPOINT,
-    OTEL_PYTHON_EXPORTER_ZIPKIN_TRANSPORT_FORMAT,
+    OTEL_EXPORTER_ZIPKIN_TRANSPORT_FORMAT,
 )
 from opentelemetry.sdk.trace import Resource
 from opentelemetry.sdk.trace.export import SpanExportResult
@@ -63,15 +63,15 @@ def setUp(self):
     def tearDown(self):
         if OTEL_EXPORTER_ZIPKIN_ENDPOINT in os.environ:
             del os.environ[OTEL_EXPORTER_ZIPKIN_ENDPOINT]
-        if OTEL_PYTHON_EXPORTER_ZIPKIN_TRANSPORT_FORMAT in os.environ:
-            del os.environ[OTEL_PYTHON_EXPORTER_ZIPKIN_TRANSPORT_FORMAT]
+        if OTEL_EXPORTER_ZIPKIN_TRANSPORT_FORMAT in os.environ:
+            del os.environ[OTEL_EXPORTER_ZIPKIN_TRANSPORT_FORMAT]
 
     def test_constructor_env_var(self):
         """Test the default values assigned by constructor."""
         url = "https://foo:9911/path"
         os.environ[OTEL_EXPORTER_ZIPKIN_ENDPOINT] = url
         os.environ[
-            OTEL_PYTHON_EXPORTER_ZIPKIN_TRANSPORT_FORMAT
+            OTEL_EXPORTER_ZIPKIN_TRANSPORT_FORMAT
         ] = TRANSPORT_FORMAT_PROTOBUF
         service_name = "my-service-name"
         port = 9911

opentelemetry-sdk/src/opentelemetry/sdk/environment_variables/__init__.py

@@ -52,17 +52,9 @@
 OTEL_EXPORTER_OTLP_METRIC_COMPRESSION = "OTEL_EXPORTER_OTLP_METRIC_COMPRESSION"
 OTEL_EXPORTER_OTLP_SPAN_TIMEOUT = "OTEL_EXPORTER_OTLP_SPAN_TIMEOUT"
 OTEL_EXPORTER_OTLP_METRIC_TIMEOUT = "OTEL_EXPORTER_OTLP_METRIC_TIMEOUT"
-OTEL_PYTHON_EXPORTER_JAEGER_INSECURE = "OTEL_PYTHON_EXPORTER_JAEGER_INSECURE"
-OTEL_PYTHON_EXPORTER_JAEGER_CERTIFICATE = (
-    "OTEL_PYTHON_EXPORTER_JAEGER_CERTIFICATE"
-)
-OTEL_PYTHON_EXPORTER_OTLP_INSECURE = "OTEL_PYTHON_EXPORTER_OTLP_INSECURE"
-OTEL_PYTHON_EXPORTER_OTLP_SPAN_INSECURE = (
-    "OTEL_PYTHON_EXPORTER_OTLP_SPAN_INSECURE"
-)
-OTEL_PYTHON_EXPORTER_OTLP_METRIC_INSECURE = (
-    "OTEL_PYTHON_EXPORTER_OTLP_METRIC_INSECURE"
-)
-OTEL_PYTHON_EXPORTER_ZIPKIN_TRANSPORT_FORMAT = (
-    "OTEL_PYTHON_EXPORTER_ZIPKIN_TRANSPORT_FORMAT"
-)
+OTEL_EXPORTER_JAEGER_INSECURE = "OTEL_EXPORTER_JAEGER_INSECURE"
+OTEL_EXPORTER_JAEGER_CERTIFICATE = "OTEL_EXPORTER_JAEGER_CERTIFICATE"
+OTEL_EXPORTER_OTLP_INSECURE = "OTEL_EXPORTER_OTLP_INSECURE"
+OTEL_EXPORTER_OTLP_SPAN_INSECURE = "OTEL_EXPORTER_OTLP_SPAN_INSECURE"
+OTEL_EXPORTER_OTLP_METRIC_INSECURE = "OTEL_EXPORTER_OTLP_METRIC_INSECURE"
+OTEL_EXPORTER_ZIPKIN_TRANSPORT_FORMAT = "OTEL_EXPORTER_ZIPKIN_TRANSPORT_FORMAT"