Move opentelemetry-instrumentation to contrib (open-telemetry#1797)

Author: lzchen

.github/pull_request_template.md

@@ -23,7 +23,6 @@ Please describe the tests that you ran to verify your changes. Provide instructi
 
 Answer the following question based on these examples of changes that would require a Contrib Repo Change:
 - [The OTel specification](https://github.com/open-telemetry/opentelemetry-specification) has changed which prompted this PR to update the method interfaces of `opentelemetry-api/` or `opentelemetry-sdk/`
-- The method interfaces of `opentelemetry-instrumentation/` have changed
 - The method interfaces of `test/util` have changed
 - Scripts in `scripts/` that were copied over to the Contrib repo have changed
 - Configuration files that were copied over to the Contrib repo have changed (when consistency between repositories is applicable) such as in

.github/workflows/test.yml

@@ -10,7 +10,7 @@ env:
   # Otherwise, set variable to the commit of your branch on
   # opentelemetry-python-contrib which is compatible with these Core repo
   # changes.
-  CONTRIB_REPO_SHA: 793ddb4ed638231f387eef2e11207ffb18c6682a
+  CONTRIB_REPO_SHA: bcd337f74db582684e29fd5e0a9a2de591566c9b
 
 jobs:
   build:

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.1.0...HEAD)
 
+### Removed
+- Moved `opentelemetry-instrumentation` to contrib repository
+  ([#1797](https://github.com/open-telemetry/opentelemetry-python/pull/1797))
+
 ## [1.1.0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.1.0) - 2021-04-20
 
 ### Added

docs-requirements.txt

@@ -7,9 +7,8 @@ sphinx-autodoc-typehints
 ./opentelemetry-api
 ./opentelemetry-semantic-conventions
 ./opentelemetry-sdk
-./opentelemetry-instrumentation
 
-# Required by ext packages
+# Required by instrumentation and exporter packages
 asgiref~=3.0
 asyncpg>=0.12.0
 ddtrace>=0.34.0

docs/conf.py

@@ -23,11 +23,6 @@
 
 settings.configure()
 
-
-source_dirs = [
-    os.path.abspath("../opentelemetry-instrumentation/src/"),
-]
-
 exp = "../exporter"
 exp_dirs = [
     os.path.abspath("/".join(["../exporter", f, "src"]))
@@ -42,7 +37,7 @@
     if isdir(join(shim, f))
 ]
 
-sys.path[:0] = source_dirs + exp_dirs + shim_dirs
+sys.path[:0] = exp_dirs + shim_dirs
 
 # -- Project information -----------------------------------------------------
 

eachdist.ini

@@ -7,13 +7,10 @@ ignore=
 sortfirst=
     opentelemetry-api
     opentelemetry-sdk
-    opentelemetry-instrumentation
     opentelemetry-proto
     opentelemetry-distro
     tests/util
-    instrumentation/*
     exporter/*
-    ext/*
 
 [lintroots]
 extraroots=examples/*,scripts/

opentelemetry-distro/setup.cfg

@@ -41,6 +41,7 @@ zip_safe = False
 include_package_data = True
 install_requires =
     opentelemetry-api == 1.2.0.dev0
+    opentelemetry-instrumentation == 0.21.dev0
     opentelemetry-sdk == 1.2.0.dev0
 
 [options.packages.find]

opentelemetry-distro/src/opentelemetry/distro/__init__.py

@@ -147,6 +147,8 @@ def _initialize_components():
 
 
 class Configurator(BaseConfigurator):
+
+    # pylint: disable=no-self-use
     def _configure(self, **kwargs):
         _initialize_components()
 
@@ -157,5 +159,6 @@ class OpenTelemetryDistro(BaseDistro):
     configuration out of the box.
     """
 
+    # pylint: disable=no-self-use
     def _configure(self, **kwargs):
         os.environ.setdefault(OTEL_TRACES_EXPORTER, "otlp_proto_grpc_span")