open-telemetry · codeboten · Nov 5, 2020 · Nov 2, 2020 · Nov 3, 2020 · Nov 4, 2020
diff --git a/.flake8 b/.flake8
@@ -22,3 +22,4 @@ exclude =
   docs/examples/opentelemetry-example-app/build/*
   opentelemetry-proto/build/*
   opentelemetry-proto/src/opentelemetry/proto/
+  opentelemetry-python-contrib/
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,6 +5,8 @@ on:
     branches-ignore:
     - 'release/*'
   pull_request:
+env:
+  CONTRIB_REPO_SHA: 5c9e043d6921550d82668788e3758a733fb11cb8
 
 jobs:
   build:
@@ -41,7 +43,14 @@ jobs:
             python-version: py35
             package: instrumentation
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout Core Repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v2
+      - name: Checkout Contrib Repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
+        uses: actions/checkout@v2
+        with:
+          repository: open-telemetry/opentelemetry-python-contrib
+          ref: ${{ env.CONTRIB_REPO_SHA }}
+          path: opentelemetry-python-contrib
       - name: Set up Python ${{ env[matrix.python-version] }}
         uses: actions/setup-python@v2
         with:
@@ -64,7 +73,14 @@ jobs:
     name: ${{ matrix.tox-environment }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout Core Repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v2
+      - name: Checkout Contrib Repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
+        uses: actions/checkout@v2
+        with:
+          repository: open-telemetry/opentelemetry-python-contrib
+          ref: ${{ env.CONTRIB_REPO_SHA }}
+          path: opentelemetry-python-contrib
       - name: Set up Python 3.8
         uses: actions/setup-python@v2
         with:

diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ lib64
 __pycache__
 venv*/
 .venv*/
+opentelemetry-python-contrib/
 
 # Installer logs
 pip-log.txt

diff --git a/.isort.cfg b/.isort.cfg
@@ -13,6 +13,6 @@ line_length=79
 ; docs: https://github.com/timothycrosley/isort#multi-line-output-modes
 multi_line_output=3
 skip=target
-skip_glob=**/gen/*,.venv*/*,venv*/*,**/proto/*
+skip_glob=**/gen/*,.venv*/*,venv*/*,**/proto/*,opentelemetry-python-contrib/*
 known_first_party=opentelemetry,opentelemetry_example_app
 known_third_party=psutil,pytest,redis,redis_opentracing
diff --git a/docs/examples/django/README.rst b/docs/examples/django/README.rst
@@ -111,4 +111,4 @@ References
 
 * `Django <https://djangoproject.com/>`_
 * `OpenTelemetry Project <https://opentelemetry.io/>`_
-* `OpenTelemetry Django extension <https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-django>`_
+* `OpenTelemetry Django extension <https://github.com/open-telemetry/opentelemetry-python-contib/tree/master/instrumentation/opentelemetry-instrumentation-django>`_
diff --git a/docs/examples/django/pages/views.py b/docs/examples/django/pages/views.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from django.http import HttpResponse
-
 from opentelemetry import trace
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (

diff --git a/docs/examples/opentelemetry-example-app/setup.cfg b/docs/examples/opentelemetry-example-app/setup.cfg
@@ -43,8 +43,8 @@ include_package_data = True
 install_requires = 
     opentelemetry-api == 0.16.dev0
     opentelemetry-sdk == 0.16.dev0
-    opentelemetry-instrumentation-requests == 0.16.dev0
-    opentelemetry-instrumentation-flask == 0.16.dev0
+    opentelemetry-instrumentation-requests == 0.15.b0
+    opentelemetry-instrumentation-flask == 0.15.b0
     flask
     requests
     protobuf>=3.13.0

diff --git a/docs/exporter/datadog/datadog.rst b/docs/exporter/datadog/datadog.rst
diff --git a/docs/getting-started.rst b/docs/getting-started.rst
@@ -150,7 +150,7 @@ The above is a great example, but it's very manual. Within the telemetry space,
 * Database calls
 
 To help instrument common scenarios, opentelemetry also has the concept of "instrumentations": packages that are designed to interface
-with a specific framework or library, such as Flask and psycopg2. A list of the currently curated extension packages can be found :scm_web:`here <instrumentation/>`.
+with a specific framework or library, such as Flask and psycopg2. A list of the currently curated extension packages can be found `at the Contrib repo <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation>`_.
 
 We will now instrument a basic Flask application that uses the requests library to send HTTP requests. First, install the instrumentation packages themselves:
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -30,7 +30,10 @@ In addition, there are several extension packages which can be installed separat
     pip install opentelemetry-instrumentation-{instrumentation}
 
 These are for exporter and instrumentation packages respectively.
-The packages can be found in :scm_web:`instrumentation <instrumentation/>` and :scm_web:`exporter <exporter/>` directory of the repository.
+Some packages can be found in :scm_web:`instrumentation <instrumentation/>` and :scm_web:`exporter <exporter/>`
+directory of the repository. The remaining packages can be found at the 
+`Contrib repo instrumentation <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation>`_
+and `Contrib repo exporter <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/exporter>`_ directories.
 
 Extensions
 ----------
@@ -53,7 +56,6 @@ install <https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs>
     cd opentelemetry-python
     pip install -e ./opentelemetry-api
     pip install -e ./opentelemetry-sdk
-    pip install -e ./instrumentation/opentelemetry-instrumentation-{instrumentation}
 
 
 .. toctree::

diff --git a/docs/instrumentation/aiohttp_client/aiohttp_client.rst b/docs/instrumentation/aiohttp_client/aiohttp_client.rst
diff --git a/docs/instrumentation/aiopg/aiopg.rst b/docs/instrumentation/aiopg/aiopg.rst
diff --git a/docs/instrumentation/asgi/asgi.rst b/docs/instrumentation/asgi/asgi.rst
diff --git a/docs/instrumentation/asyncpg/asyncpg.rst b/docs/instrumentation/asyncpg/asyncpg.rst
diff --git a/docs/instrumentation/boto/boto.rst b/docs/instrumentation/boto/boto.rst
diff --git a/docs/instrumentation/botocore/botocore.rst b/docs/instrumentation/botocore/botocore.rst
diff --git a/docs/instrumentation/celery/celery.rst b/docs/instrumentation/celery/celery.rst
diff --git a/docs/instrumentation/dbapi/dbapi.rst b/docs/instrumentation/dbapi/dbapi.rst
diff --git a/docs/instrumentation/django/django.rst b/docs/instrumentation/django/django.rst
diff --git a/docs/instrumentation/fastapi/fastapi.rst b/docs/instrumentation/fastapi/fastapi.rst
diff --git a/docs/instrumentation/flask/flask.rst b/docs/instrumentation/flask/flask.rst
diff --git a/docs/instrumentation/grpc/grpc.rst b/docs/instrumentation/grpc/grpc.rst
diff --git a/docs/instrumentation/jinja2/jinja2.rst b/docs/instrumentation/jinja2/jinja2.rst
diff --git a/docs/instrumentation/mysql/mysql.rst b/docs/instrumentation/mysql/mysql.rst
diff --git a/docs/instrumentation/psycopg2/psycopg2.rst b/docs/instrumentation/psycopg2/psycopg2.rst
diff --git a/docs/instrumentation/pymemcache/pymemcache.rst b/docs/instrumentation/pymemcache/pymemcache.rst
diff --git a/docs/instrumentation/pymongo/pymongo.rst b/docs/instrumentation/pymongo/pymongo.rst
diff --git a/docs/instrumentation/pymysql/pymysql.rst b/docs/instrumentation/pymysql/pymysql.rst
diff --git a/docs/instrumentation/pyramid/pyramid.rst b/docs/instrumentation/pyramid/pyramid.rst
diff --git a/docs/instrumentation/redis/redis.rst b/docs/instrumentation/redis/redis.rst
diff --git a/docs/instrumentation/requests/requests.rst b/docs/instrumentation/requests/requests.rst
diff --git a/docs/instrumentation/sqlalchemy/sqlalchemy.rst b/docs/instrumentation/sqlalchemy/sqlalchemy.rst
diff --git a/docs/instrumentation/sqlite3/sqlite3.rst b/docs/instrumentation/sqlite3/sqlite3.rst
diff --git a/docs/instrumentation/starlette/starlette.rst b/docs/instrumentation/starlette/starlette.rst
diff --git a/docs/instrumentation/system_metrics/system_metrics.rst b/docs/instrumentation/system_metrics/system_metrics.rst
diff --git a/docs/instrumentation/wsgi/wsgi.rst b/docs/instrumentation/wsgi/wsgi.rst
diff --git a/eachdist.ini b/eachdist.ini
@@ -1,6 +1,9 @@
 # These will be sorted first in that order.
 # All packages that are depended upon by others should be listed here.
 [DEFAULT]
+ignore=
+    opentelemetry-python-contrib
+
 sortfirst=
     opentelemetry-api
     opentelemetry-sdk

diff --git a/exporter/opentelemetry-exporter-datadog/CHANGELOG.md b/exporter/opentelemetry-exporter-datadog/CHANGELOG.md