Merge remote-tracking branch 'upstream/master' into feature/ext_asgi

Author: Skeen

.travis.yml

@@ -8,7 +8,7 @@ python:
   - '3.6'
   - '3.7'
   - '3.8'
-  - 'pypy3.5'
+  - 'pypy3'
 
 #matrix:
 #  allow_failures:

README.md

@@ -51,7 +51,6 @@ pip install -e ./ext/opentelemetry-ext-{integration}
 
 ```python
 from opentelemetry import trace
-from opentelemetry.context import Context
 from opentelemetry.sdk.trace import TracerSource
 from opentelemetry.sdk.trace.export import ConsoleSpanExporter
 from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor
@@ -60,11 +59,11 @@ trace.set_preferred_tracer_source_implementation(lambda T: TracerSource())
 trace.tracer_source().add_span_processor(
     SimpleExportSpanProcessor(ConsoleSpanExporter())
 )
-tracer = trace.tracer_source().get_tracer(__name__)
+tracer = trace.get_tracer(__name__)
 with tracer.start_as_current_span('foo'):
     with tracer.start_as_current_span('bar'):
         with tracer.start_as_current_span('baz'):
-            print(Context)
+            print("Hello world from OpenTelemetry Python!")
 ```
 
 ### Metrics

…s/opentelemetry.context.base_context.rst docs/opentelemetry.context.context.rstdocs/opentelemetry.context.base_context.rst renamed to docs/opentelemetry.context.context.rst docs/opentelemetry.context.base_context.rst renamed to docs/opentelemetry.context.context.rst

@@ -1,7 +1,7 @@
 opentelemetry.context.base\_context module
 ==========================================
 
-.. automodule:: opentelemetry.context.base_context
+.. automodule:: opentelemetry.context.context
     :members:
     :undoc-members:
     :show-inheritance:

docs/opentelemetry.context.rst

@@ -6,7 +6,7 @@ Submodules
 
 .. toctree::
 
-   opentelemetry.context.base_context
+   opentelemetry.context.context
 
 Module contents
 ---------------

docs/opentelemetry.sdk.metrics.export.aggregate.rst

@@ -0,0 +1,7 @@
+opentelemetry.sdk.metrics.export.aggregate
+==========================================
+
+.. automodule:: opentelemetry.sdk.metrics.export.aggregate
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/opentelemetry.sdk.metrics.export.batcher.rst

@@ -0,0 +1,11 @@
+opentelemetry.sdk.metrics.export.batcher
+==========================================
+
+.. toctree::
+
+   opentelemetry.sdk.metrics.export
+
+.. automodule:: opentelemetry.sdk.metrics.export.batcher
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/opentelemetry.sdk.metrics.export.rst

@@ -0,0 +1,7 @@
+opentelemetry.sdk.metrics.export
+==========================================
+
+.. automodule:: opentelemetry.sdk.metrics.export
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/opentelemetry.sdk.metrics.rst

@@ -1,6 +1,14 @@
 opentelemetry.sdk.metrics package
 ==========================================
 
+Submodules
+----------
+
+.. toctree::
+
+   opentelemetry.sdk.metrics.export.aggregate
+   opentelemetry.sdk.metrics.export.batcher
+
 .. automodule:: opentelemetry.sdk.metrics
     :members:
     :undoc-members:

examples/basic_tracer/tracer.py

@@ -17,7 +17,6 @@
 import os
 
 from opentelemetry import trace
-from opentelemetry.context import Context
 from opentelemetry.sdk.trace import TracerSource
 from opentelemetry.sdk.trace.export import (
     BatchExportSpanProcessor,
@@ -42,7 +41,7 @@
 # We tell OpenTelemetry who it is that is creating spans. In this case, we have
 # no real name (no setup.py), so we make one up. If we had a version, we would
 # also specify it here.
-tracer = trace.tracer_source().get_tracer(__name__)
+tracer = trace.get_tracer(__name__)
 
 # SpanExporter receives the spans and send them to the target location.
 span_processor = BatchExportSpanProcessor(exporter)
@@ -51,4 +50,4 @@
 with tracer.start_as_current_span("foo"):
     with tracer.start_as_current_span("bar"):
         with tracer.start_as_current_span("baz"):
-            print(Context)
+            print("Hello world from OpenTelemetry Python!")

examples/http/server.py

@@ -42,7 +42,7 @@
 # The preferred tracer implementation must be set, as the opentelemetry-api
 # defines the interface with a no-op implementation.
 trace.set_preferred_tracer_source_implementation(lambda T: TracerSource())
-tracer = trace.tracer_source().get_tracer(__name__)
+tracer = trace.get_tracer(__name__)
 
 # SpanExporter receives the spans and send them to the target location.
 span_processor = BatchExportSpanProcessor(exporter)