Merge branch 'master' into issue_242

open-telemetry · Jul 31, 2020 · d032e24 · d032e24
2 parents 17bda17 + 1112792
commit d032e24
Show file tree

Hide file tree

Showing 244 changed files with 2,946 additions and 893 deletions.
diff --git a/.flake8 b/.flake8
@@ -16,8 +16,8 @@ exclude =
   venv*/
   target
   __pycache__
-  ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/
-  ext/opentelemetry-ext-jaeger/build/*
+  exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/
+  exporter/opentelemetry-exporter-jaeger/build/*
   docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/gen/
   docs/examples/opentelemetry-example-app/build/*
   opentelemetry-proto/build/*

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,27 @@
+# Description
+
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+Fixes # (issue)
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+# How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+
+- [ ] Test A
+
+# Checklist:
+
+- [ ] Followed the style guidelines of this project
+- [ ] Changelogs have been updated
+- [ ] Unit tests have been added
+- [ ] Documentation has been updated
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -6,6 +6,7 @@ on:
     - master
     paths:
     - 'docs/**'
+    - 'exporter/**'
     - 'ext/**'
     - 'opentelemetry-python/opentelemetry-api/src/opentelemetry/**'
     - 'opentelemetry-python/opentelemetry-sdk/src/opentelemetry/sdk/**'

diff --git a/README.md b/README.md
@@ -103,12 +103,12 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
 
 Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
 
+- [Aaron Abbott](https://github.com/aabmass), Google
 - [Carlos Alberto Cortez](https://github.com/carlosalberto), Lightstep
 - [Tahir H. Butt](https://github.com/majorgreys) DataDog
 - [Chris Kleinknecht](https://github.com/c24t), Google
 - [Diego Hurtado](https://github.com/ocelotl)
 - [Hector Hernandez](https://github.com/hectorhdzg), Microsoft
-- [Mauricio Vásquez](https://github.com/mauriciovasquezbernal), Kinvolk
 - [Reiley Yang](https://github.com/reyang), Microsoft
 - [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
 

diff --git a/docs-requirements.txt b/docs-requirements.txt
@@ -7,6 +7,7 @@ asgiref~=3.0
 asyncpg>=0.12.0
 ddtrace>=0.34.0
 aiohttp~= 3.0
+aiopg>=0.13.0
 Deprecated>=1.2.6
 django>=2.2
 PyMySQL~=0.9.3

diff --git a/docs/conf.py b/docs/conf.py
@@ -30,13 +30,20 @@
     os.path.abspath("../opentelemetry-instrumentation/src/"),
 ]
 
+exp = "../exporter"
+exp_dirs = [
+    os.path.abspath("/".join(["../exporter", f, "src"]))
+    for f in listdir(exp)
+    if isdir(join(exp, f))
+]
+
 ext = "../ext"
 ext_dirs = [
     os.path.abspath("/".join(["../ext", f, "src"]))
     for f in listdir(ext)
     if isdir(join(ext, f))
 ]
-sys.path[:0] = source_dirs + ext_dirs
+sys.path[:0] = source_dirs + exp_dirs + ext_dirs
 
 # -- Project information -----------------------------------------------------
 

diff --git a/docs/examples/basic_meter/README.rst b/docs/examples/basic_meter/README.rst
@@ -5,7 +5,7 @@ These examples show how to use OpenTelemetry to capture and report metrics.
 
 There are three different examples:
 
-* basic_metrics: Shows to how create a metric instrument, how to configure an
+* basic_metrics: Shows how to create a metric instrument, how to configure an
   exporter and a controller and also how to capture data by using the direct
   calling convention.
 

diff --git a/docs/examples/cloud_monitoring/README.rst b/docs/examples/cloud_monitoring/README.rst
diff --git a/docs/examples/cloud_monitoring/basic_metrics.py b/docs/examples/cloud_monitoring/basic_metrics.py
diff --git a/docs/examples/cloud_trace_exporter/README.rst b/docs/examples/cloud_trace_exporter/README.rst
diff --git a/docs/examples/cloud_trace_exporter/basic_trace.py b/docs/examples/cloud_trace_exporter/basic_trace.py
diff --git a/docs/examples/datadog_exporter/README.rst b/docs/examples/datadog_exporter/README.rst
@@ -13,7 +13,7 @@ Basic Example
 
     pip install opentelemetry-api
     pip install opentelemetry-sdk
-    pip install opentelemetry-ext-datadog
+    pip install opentelemetry-exporter-datadog
 
 * Start Datadog Agent
 
@@ -48,7 +48,7 @@ Distributed Example
 
     pip install opentelemetry-api
     pip install opentelemetry-sdk
-    pip install opentelemetry-ext-datadog
+    pip install opentelemetry-exporter-datadog
     pip install opentelemetry-instrumentation
     pip install opentelemetry-ext-flask
     pip install flask

diff --git a/docs/examples/datadog_exporter/basic_example.py b/docs/examples/datadog_exporter/basic_example.py
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 from opentelemetry import trace
-from opentelemetry.ext.datadog import (
+from opentelemetry.exporter.datadog import (
     DatadogExportSpanProcessor,
     DatadogSpanExporter,
 )

diff --git a/docs/examples/datadog_exporter/client.py b/docs/examples/datadog_exporter/client.py
@@ -17,7 +17,7 @@
 from requests import get
 
 from opentelemetry import propagators, trace
-from opentelemetry.ext.datadog import (
+from opentelemetry.exporter.datadog import (
     DatadogExportSpanProcessor,
     DatadogSpanExporter,
 )

diff --git a/docs/examples/datadog_exporter/server.py b/docs/examples/datadog_exporter/server.py
@@ -15,11 +15,11 @@
 from flask import Flask, request
 
 from opentelemetry import propagators, trace
-from opentelemetry.ext.datadog import (
+from opentelemetry.exporter.datadog import (
     DatadogExportSpanProcessor,
     DatadogSpanExporter,
 )
-from opentelemetry.ext.datadog.propagator import DatadogFormat
+from opentelemetry.exporter.datadog.propagator import DatadogFormat
 from opentelemetry.sdk.trace import TracerProvider
 
 app = Flask(__name__)

diff --git a/docs/examples/django/README.rst b/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 --git a/docs/examples/opencensus-exporter-metrics/README.rst b/docs/examples/opencensus-exporter-metrics/README.rst
@@ -13,7 +13,7 @@ Installation
 
     pip install opentelemetry-api
     pip install opentelemetry-sdk
-    pip install opentelemetry-ext-opencensusexporter
+    pip install opentelemetry-exporter-opencensus
 
 Run the Example
 ---------------
@@ -46,7 +46,7 @@ Useful links
 - OpenTelemetry_
 - `OpenTelemetry Collector`_
 - :doc:`../../api/trace`
-- :doc:`../../ext/opencensusexporter/opencensusexporter`
+- :doc:`../../exporter/opencensus/opencensus`
 
 .. _OpenTelemetry: https://github.com/open-telemetry/opentelemetry-python/
 .. _OpenTelemetry Collector: https://github.com/open-telemetry/opentelemetry-collector
diff --git a/docs/examples/opencensus-exporter-metrics/collector.py b/docs/examples/opencensus-exporter-metrics/collector.py
@@ -17,7 +17,7 @@
 """
 
 from opentelemetry import metrics
-from opentelemetry.ext.opencensusexporter.metrics_exporter import (
+from opentelemetry.exporter.opencensus.metrics_exporter import (
     OpenCensusMetricsExporter,
 )
 from opentelemetry.sdk.metrics import Counter, MeterProvider

diff --git a/docs/examples/opencensus-exporter-tracer/README.rst b/docs/examples/opencensus-exporter-tracer/README.rst
@@ -13,7 +13,7 @@ Installation
 
     pip install opentelemetry-api
     pip install opentelemetry-sdk
-    pip install opentelemetry-ext-opencensusexporter
+    pip install opentelemetry-exporter-opencensus
 
 Run the Example
 ---------------
@@ -45,7 +45,7 @@ Useful links
 - OpenTelemetry_
 - `OpenTelemetry Collector`_
 - :doc:`../../api/trace`
-- :doc:`../../ext/opencensusexporter/opencensusexporter`
+- :doc:`../../exporter/opencensus/opencensus`
 
 .. _OpenTelemetry: https://github.com/open-telemetry/opentelemetry-python/
 .. _OpenTelemetry Collector: https://github.com/open-telemetry/opentelemetry-collector