fix merge conflicts

Author: MitchellDumovic

Diff for: docs/examples/django/README.rst

@@ -36,7 +36,7 @@ Execution of the Django app
 
 Set these environment variables first:
 
-#. ``export OPENTELEMETRY_PYTHON_DJANGO_INSTRUMENT=True``
+#. ``export OTEL_PYTHON_DJANGO_INSTRUMENT=True``
 #. ``export DJANGO_SETTINGS_MODULE=instrumentation_example.settings``
 
 The way to achieve OpenTelemetry instrumentation for your Django app is to use

Diff for: exporter/opentelemetry-exporter-zipkin/CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - Change package name to opentelemetry-exporter-zipkin
   ([#953](https://github.com/open-telemetry/opentelemetry-python/pull/953))
+- Add proper length zero padding to hex strings of traceId, spanId, parentId sent on the wire, for compatibility with jaeger-collector
+  ([#908](https://github.com/open-telemetry/opentelemetry-python/pull/908))
 
 ## 0.8b0
 
@@ -23,4 +25,4 @@ Released 2020-05-12
 
 Released 2020-02-21
 
-- Initial release
+- Initial release

Diff for: exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py

@@ -168,8 +168,9 @@ def _translate_to_zipkin(self, spans: Sequence[Span]):
             duration_mus = _nsec_to_usec_round(span.end_time - span.start_time)
 
             zipkin_span = {
-                "traceId": format(trace_id, "x"),
-                "id": format(span_id, "x"),
+                # Ensure left-zero-padding of traceId, spanId, parentId
+                "traceId": format(trace_id, "032x"),
+                "id": format(span_id, "016x"),
                 "name": span.name,
                 "timestamp": start_timestamp_mus,
                 "duration": duration_mus,
@@ -184,10 +185,10 @@ def _translate_to_zipkin(self, spans: Sequence[Span]):
 
             if isinstance(span.parent, Span):
                 zipkin_span["parentId"] = format(
-                    span.parent.get_context().span_id, "x"
+                    span.parent.get_context().span_id, "016x"
                 )
             elif isinstance(span.parent, SpanContext):
-                zipkin_span["parentId"] = format(span.parent.span_id, "x")
+                zipkin_span["parentId"] = format(span.parent.span_id, "016x")
 
             zipkin_spans.append(zipkin_span)
         return zipkin_spans

Diff for: exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py

@@ -264,6 +264,72 @@ def test_export(self):
             headers={"Content-Type": "application/json"},
         )
 
+    # pylint: disable=too-many-locals
+    def test_zero_padding(self):
+        """test that hex ids starting with 0
+        are properly padded to 16 or 32 hex chars
+        when exported
+        """
+
+        span_names = "testZeroes"
+        trace_id = 0x0E0C63257DE34C926F9EFCD03927272E
+        span_id = 0x04BF92DEEFC58C92
+        parent_id = 0x0AAAAAAAAAAAAAAA
+
+        start_time = 683647322 * 10 ** 9  # in ns
+        duration = 50 * 10 ** 6
+        end_time = start_time + duration
+
+        span_context = trace_api.SpanContext(
+            trace_id,
+            span_id,
+            is_remote=False,
+            trace_flags=TraceFlags(TraceFlags.SAMPLED),
+        )
+        parent_context = trace_api.SpanContext(
+            trace_id, parent_id, is_remote=False
+        )
+
+        otel_span = trace.Span(
+            name=span_names[0], context=span_context, parent=parent_context,
+        )
+
+        otel_span.start(start_time=start_time)
+        otel_span.end(end_time=end_time)
+
+        service_name = "test-service"
+        local_endpoint = {"serviceName": service_name, "port": 9411}
+
+        exporter = ZipkinSpanExporter(service_name)
+        # Check traceId are properly lowercase 16 or 32 hex
+        expected = [
+            {
+                "traceId": "0e0c63257de34c926f9efcd03927272e",
+                "id": "04bf92deefc58c92",
+                "name": span_names[0],
+                "timestamp": start_time // 10 ** 3,
+                "duration": duration // 10 ** 3,
+                "localEndpoint": local_endpoint,
+                "kind": None,
+                "tags": {},
+                "annotations": None,
+                "debug": True,
+                "parentId": "0aaaaaaaaaaaaaaa",
+            }
+        ]
+
+        mock_post = MagicMock()
+        with patch("requests.post", mock_post):
+            mock_post.return_value = MockResponse(200)
+            status = exporter.export([otel_span])
+            self.assertEqual(SpanExportResult.SUCCESS, status)
+
+        mock_post.assert_called_with(
+            url="http://localhost:9411/api/v2/spans",
+            data=json.dumps(expected),
+            headers={"Content-Type": "application/json"},
+        )
+
     @patch("requests.post")
     def test_invalid_response(self, mock_post):
         mock_post.return_value = MockResponse(404)

Diff for: ext/opentelemetry-ext-django/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Update environment variable names, prefix changed from `OPENTELEMETRY` to `OTEL` ([#904](https://github.com/open-telemetry/opentelemetry-python/pull/904))
+
 ## Version 0.11b0
 
 Released 2020-07-28

Diff for: ext/opentelemetry-ext-django/README.rst

@@ -20,13 +20,13 @@ Configuration
 
 Exclude lists
 *************
-To exclude certain URLs from being tracked, set the environment variable ``OPENTELEMETRY_PYTHON_DJANGO_EXCLUDED_URLS`` with comma delimited regexes representing which URLs to exclude.
+To exclude certain URLs from being tracked, set the environment variable ``OTEL_PYTHON_DJANGO_EXCLUDED_URLS`` with comma delimited regexes representing which URLs to exclude.
 
 For example,
 
 ::
 
-    export OPENTELEMETRY_PYTHON_DJANGO_EXCLUDED_URLS="client/.*/info,healthcheck"
+    export OTEL_PYTHON_DJANGO_EXCLUDED_URLS="client/.*/info,healthcheck"
 
 will exclude requests such as ``https://site/client/123/info`` and ``https://site/xyz/healthcheck``.
 

Diff for: ext/opentelemetry-ext-django/tests/conftest.py

@@ -16,4 +16,4 @@
 
 
 def pytest_sessionstart(session):  # pylint: disable=unused-argument
-    environ.setdefault("OPENTELEMETRY_PYTHON_DJANGO_INSTRUMENT", "True")
+    environ.setdefault("OTEL_PYTHON_DJANGO_INSTRUMENT", "True")

Diff for: ext/opentelemetry-ext-elasticsearch/CHANGELOG.md

@@ -2,8 +2,10 @@
 
 ## Unreleased
 
+- Update environment variable names, prefix changed from `OPENTELEMETRY` to `OTEL` ([#904](https://github.com/open-telemetry/opentelemetry-python/pull/904))
+
 ## Version 0.10b0
 
 Released 2020-06-23
 
-- Initial release
+- Initial release

Diff for: ext/opentelemetry-ext-elasticsearch/src/opentelemetry/ext/elasticsearch/__init__.py

@@ -40,7 +40,7 @@
 ---
 
 Elasticsearch instrumentation prefixes operation names with the string "Elasticsearch". This
-can be changed to a different string by either setting the `OPENTELEMETRY_PYTHON_ELASTICSEARCH_NAME_PREFIX`
+can be changed to a different string by either setting the `OTEL_PYTHON_ELASTICSEARCH_NAME_PREFIX`
 environment variable or by passing the prefix as an argument to the instrumentor. For example,
 
 
@@ -88,8 +88,7 @@ class ElasticsearchInstrumentor(BaseInstrumentor):
     def __init__(self, span_name_prefix=None):
         if not span_name_prefix:
             span_name_prefix = environ.get(
-                "OPENTELEMETRY_PYTHON_ELASTICSEARCH_NAME_PREFIX",
-                "Elasticsearch",
+                "OTEL_PYTHON_ELASTICSEARCH_NAME_PREFIX", "Elasticsearch",
             )
         self._span_name_prefix = span_name_prefix.strip()
         super().__init__()

Diff for: ext/opentelemetry-ext-elasticsearch/tests/test_elasticsearch.py

@@ -95,7 +95,7 @@ def test_prefix_arg(self, request_mock):
 
     def test_prefix_env(self, request_mock):
         prefix = "prefix-from-args"
-        env_var = "OPENTELEMETRY_PYTHON_ELASTICSEARCH_NAME_PREFIX"
+        env_var = "OTEL_PYTHON_ELASTICSEARCH_NAME_PREFIX"
         os.environ[env_var] = prefix
         ElasticsearchInstrumentor().uninstrument()
         ElasticsearchInstrumentor().instrument()

Diff for: ext/opentelemetry-ext-flask/CHANGELOG.md

@@ -2,9 +2,9 @@
 
 ## Unreleased
 
-## Version 0.11b0
+- Update environment variable names, prefix changed from `OPENTELEMETRY` to `OTEL` ([#904](https://github.com/open-telemetry/opentelemetry-python/pull/904))
 
-Released 2020-07-28
+## Version 0.11b0
 
 - Use one general exclude list instead of two ([#872](https://github.com/open-telemetry/opentelemetry-python/pull/872))
 

Diff for: ext/opentelemetry-ext-flask/README.rst

@@ -21,13 +21,13 @@ Configuration
 
 Exclude lists
 *************
-To exclude certain URLs from being tracked, set the environment variable ``OPENTELEMETRY_PYTHON_FLASK_EXCLUDED_URLS`` with comma delimited regexes representing which URLs to exclude.
+To exclude certain URLs from being tracked, set the environment variable ``OTEL_PYTHON_FLASK_EXCLUDED_URLS`` with comma delimited regexes representing which URLs to exclude.
 
 For example,
 
 ::
 
-    export OPENTELEMETRY_PYTHON_FLASK_EXCLUDED_URLS="client/.*/info,healthcheck"
+    export OTEL_PYTHON_FLASK_EXCLUDED_URLS="client/.*/info,healthcheck"
 
 will exclude requests such as ``https://site/client/123/info`` and ``https://site/xyz/healthcheck``.
 

Diff for: ext/opentelemetry-ext-pyramid/CHANGELOG.md

@@ -2,14 +2,14 @@
 
 ## Unreleased
 
-## Version 0.11b0
+- Update environment variable names, prefix changed from `OPENTELEMETRY` to `OTEL` ([#904](https://github.com/open-telemetry/opentelemetry-python/pull/904))
 
-Released 2020-07-28
+## Version 0.11b0
 
 - Use one general exclude list instead of two ([#872](https://github.com/open-telemetry/opentelemetry-python/pull/872))
 
 ## 0.9b0
 
 Released 2020-06-10
 
-- Initial release
+- Initial release

Diff for: ext/opentelemetry-ext-pyramid/README.rst

@@ -15,13 +15,13 @@ Installation
 
 Exclude lists
 *************
-To exclude certain URLs from being tracked, set the environment variable ``OPENTELEMETRY_PYTHON_PYRAMID_EXCLUDED_URLS`` with comma delimited regexes representing which URLs to exclude.
+To exclude certain URLs from being tracked, set the environment variable ``OTEL_PYTHON_PYRAMID_EXCLUDED_URLS`` with comma delimited regexes representing which URLs to exclude.
 
 For example, 
 
 ::
 
-    export OPENTELEMETRY_PYTHON_PYRAMID_EXCLUDED_URLS="client/.*/info,healthcheck"
+    export OTEL_PYTHON_PYRAMID_EXCLUDED_URLS="client/.*/info,healthcheck"
 
 will exclude requests such as ``https://site/client/123/info`` and ``https://site/xyz/healthcheck``.
 

Diff for: opentelemetry-api/CHANGELOG.md

@@ -2,9 +2,10 @@
 
 ## Unreleased
 
-## Version 0.11b0
+- Update environment variable names, prefix changed from `OPENTELEMETRY` to `OTEL`
+  ([#904](https://github.com/open-telemetry/opentelemetry-python/pull/904))
 
-Released 2020-07-28
+## Version 0.11b0
 
 - Return INVALID_SPAN if no TracerProvider set for get_current_span
   ([#751](https://github.com/open-telemetry/opentelemetry-python/pull/751))

Diff for: opentelemetry-api/src/opentelemetry/configuration/__init__.py

@@ -16,30 +16,33 @@
 Simple configuration manager
 
 This is a configuration manager for OpenTelemetry. It reads configuration
-values from environment variables prefixed with ``OPENTELEMETRY_PYTHON_`` whose
-characters are only alphanumeric characters and unserscores, except for the
-first character after ``OPENTELEMETRY_PYTHON_`` which must not be a number.
+values from environment variables prefixed with ``OTEL_`` (for environment
+variables that apply to any OpenTelemetry implementation) or with
+``OTEL_PYTHON_`` (for environment variables that are specific to the Python
+implementation of OpenTelemetry) whose characters are only alphanumeric
+characters and unserscores, except for the first character after ``OTEL_`` or
+``OTEL_PYTHON_`` which must not be a number.
 
 For example, these environment variables will be read:
 
-1. ``OPENTELEMETRY_PYTHON_SOMETHING``
-2. ``OPENTELEMETRY_PYTHON_SOMETHING_ELSE_``
-3. ``OPENTELEMETRY_PYTHON_SOMETHING_ELSE_AND__ELSE``
-4. ``OPENTELEMETRY_PYTHON_SOMETHING_ELSE_AND_else``
-5. ``OPENTELEMETRY_PYTHON_SOMETHING_ELSE_AND_else2``
+1. ``OTEL_SOMETHING``
+2. ``OTEL_SOMETHING_ELSE_``
+3. ``OTEL_SOMETHING_ELSE_AND__ELSE``
+4. ``OTEL_SOMETHING_ELSE_AND_else``
+5. ``OTEL_SOMETHING_ELSE_AND_else2``
 
 These won't:
 
 1. ``OPENTELEMETRY_PYTH_SOMETHING``
-2. ``OPENTELEMETRY_PYTHON_2_SOMETHING_AND__ELSE``
-3. ``OPENTELEMETRY_PYTHON_SOMETHING_%_ELSE``
+2. ``OTEL_2_SOMETHING_AND__ELSE``
+3. ``OTEL_SOMETHING_%_ELSE``
 
 The values stored in the environment variables can be found in an instance of
 ``opentelemetry.configuration.Configuration``. This class can be instantiated
 freely because instantiating it returns always the same object.
 
 For example, if the environment variable
-``OPENTELEMETRY_PYTHON_METER_PROVIDER`` value is ``my_meter_provider``, then
+``OTEL_PYTHON_METER_PROVIDER`` value is ``my_meter_provider``, then
 ``Configuration().meter_provider == "my_meter_provider"`` would be ``True``.
 
 Non defined attributes will always return ``None``. This is intended to make it
@@ -49,8 +52,8 @@
 Environment variables used by OpenTelemetry
 -------------------------------------------
 
-1. OPENTELEMETRY_PYTHON_METER_PROVIDER
-2. OPENTELEMETRY_PYTHON_TRACER_PROVIDER
+1. OTEL_PYTHON_METER_PROVIDER
+2. OTEL_PYTHON_TRACER_PROVIDER
 
 The value of these environment variables should be the name of the entry point
 that points to the class that implements either provider. This OpenTelemetry
@@ -70,7 +73,7 @@
     }
 
 To use the meter provider above, then the
-``OPENTELEMETRY_PYTHON_METER_PROVIDER`` should be set to
+``OTEL_PYTHON_METER_PROVIDER`` should be set to
 ``"default_meter_provider"`` (this is not actually necessary since the
 OpenTelemetry API provided providers are the default ones used if no
 configuration is found in the environment variables).
@@ -110,13 +113,11 @@ def __new__(cls) -> "Configuration":
             instance = super().__new__(cls)
             for key, value_str in environ.items():
 
-                match = fullmatch(
-                    r"OPENTELEMETRY_PYTHON_([A-Za-z_][\w_]*)", key
-                )
+                match = fullmatch(r"OTEL_(PYTHON_)?([A-Za-z_][\w_]*)", key)
 
                 if match is not None:
 
-                    key = match.group(1)
+                    key = match.group(2)
                     value = value_str  # type: ConfigValue
 
                     if value_str == "True":

Diff for: opentelemetry-api/src/opentelemetry/context/__init__.py

@@ -55,7 +55,7 @@ def wrapper(
                     default_context = "contextvars_context"
 
                 configured_context = environ.get(
-                    "OPENTELEMETRY_CONTEXT", default_context
+                    "OTEL_CONTEXT", default_context
                 )  # type: str
                 try:
                     _RUNTIME_CONTEXT = next(