update to OT master (#22)

* update to OT master

* lint

* update commit hash

* remove extraneous files

Author: AndrewAXue

opentelemetry-exporter-cloud-trace/src/opentelemetry/exporter/cloud_trace/__init__.py

@@ -44,13 +44,13 @@
 from typing import Any, Dict, List, Optional, Sequence, Tuple
 
 import google.auth
+import opentelemetry.trace as trace_api
 import pkg_resources
 from google.cloud.trace_v2 import TraceServiceClient
 from google.cloud.trace_v2.proto.trace_pb2 import AttributeValue
 from google.cloud.trace_v2.proto.trace_pb2 import Span as ProtoSpan
 from google.cloud.trace_v2.proto.trace_pb2 import TruncatableString
 from google.rpc.status_pb2 import Status
-from opentelemetry import trace as trace_api
 from opentelemetry.exporter.cloud_trace.version import (
     __version__ as cloud_trace_version,
 )

opentelemetry-exporter-cloud-trace/src/opentelemetry/exporter/cloud_trace/cloud_trace_propagator.py

@@ -16,7 +16,7 @@
 import re
 import typing
 
-from opentelemetry import trace
+import opentelemetry.trace as trace
 from opentelemetry.context.context import Context
 from opentelemetry.trace.propagation import httptextformat
 from opentelemetry.trace.span import (
@@ -27,8 +27,6 @@
 
 _TRACE_CONTEXT_HEADER_NAME = "X-Cloud-Trace-Context"
 _TRACE_CONTEXT_HEADER_FORMAT = r"(?P<trace_id>[0-9a-f]{32})\/(?P<span_id>[\d]{1,20});o=(?P<trace_flags>\d+)"
-
-
 _TRACE_CONTEXT_HEADER_RE = re.compile(_TRACE_CONTEXT_HEADER_FORMAT)
 
 
@@ -79,8 +77,6 @@ def inject(
         context: typing.Optional[Context] = None,
     ) -> None:
         span = trace.get_current_span(context)
-        if span is None:
-            return
         span_context = span.get_context()
         if span_context == trace.INVALID_SPAN_CONTEXT:
             return

opentelemetry-exporter-cloud-trace/tests/test_cloud_trace_exporter.py

@@ -304,8 +304,10 @@ def test_extract_links(self):
             ),
         )
 
-    def test_extract_resources(self):
+    def test_extract_empty_resources(self):
         self.assertEqual(_extract_resources(Resource.create_empty()), {})
+
+    def test_extract_well_formed_resources(self):
         resource = Resource(
             labels={
                 "cloud.account.id": 123,
@@ -324,19 +326,19 @@ def test_extract_resources(self):
         }
         self.assertEqual(_extract_resources(resource), expected_extract)
 
+    def test_extract_malformed_resources(self):
+        # This resource doesn't have all the fields required for a gce_instance
+        # Specifically its missing "host.id", "cloud.zone", "cloud.account.id"
         resource = Resource(
             labels={
-                "cloud.account.id": "123",
-                "host.id": "host",
-                "extra_info": "extra",
-                "not_gcp_resource": "value",
                 "gcp.resource_type": "gce_instance",
                 "cloud.provider": "gcp",
             }
         )
         # Should throw when passed a malformed GCP resource dict
         self.assertRaises(KeyError, _extract_resources, resource)
 
+    def test_extract_unsupported_gcp_resources(self):
         resource = Resource(
             labels={
                 "cloud.account.id": "123",
@@ -349,6 +351,8 @@ def test_extract_resources(self):
         )
         self.assertEqual(_extract_resources(resource), {})
 
+    def test_extract_unsupported_provider_resources(self):
+        # Resources with currently unsupported providers will be ignored
         resource = Resource(
             labels={
                 "cloud.account.id": "123",

opentelemetry-exporter-cloud-trace/tests/test_cloud_trace_propagator.py

@@ -15,7 +15,7 @@
 import typing
 import unittest
 
-from opentelemetry import trace
+import opentelemetry.trace as trace
 from opentelemetry.context import get_current
 from opentelemetry.exporter.cloud_trace.cloud_trace_propagator import (
     _TRACE_CONTEXT_HEADER_NAME,

opentelemetry-exporter-cloud-trace/tests/test_gcp_resource_detector.py

@@ -67,6 +67,7 @@ def test_finding_resources(self, getter):
         )
         self.assertEqual(getter.call_count, 1)
 
+        # Found resources should be cached and not require another network call
         found_resources = resource_finder.detect()
         self.assertEqual(getter.call_count, 1)
         self.assertEqual(

tox.ini

@@ -22,7 +22,7 @@ envlist =
 ; against releases and remove this. For now, bump this frequently with every PR
 ; to develop as closely with that repo as possible while still tracking the
 ; actual hash.
-opentelemetry_python_commit = 8cbd9d4db04f0cd0b5a32c8c8c80299b4a44f9bd
+opentelemetry_python_commit = 545068d6eb61beaab031af45b1572d70e6652bc3
 opentelemetry_api_dep =
   git+https://github.com/open-telemetry/opentelemetry-python.git@{[constants]opentelemetry_python_commit}#egg=opentelemetry-api&subdirectory=opentelemetry-api
 opentelemetry_sdk_dep =