Migrate instrumentation and disro to contrib

.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: 4a4d889b1876323d7f70507b5e4d079f454fe0d6
+  CONTRIB_REPO_SHA: c2e674983a265e54c5eb14e376459a992498aae6
   # This is needed because we do not clone the core repo in contrib builds anymore.
   # When running contrib builds as part of core builds, we use actions/checkout@v2 which
   # does not set an environment variable (simply just runs tox), which is different when
@@ -34,7 +34,7 @@ jobs:
       fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
       matrix:
         python-version: [ py36, py37, py38, py39, pypy3 ]
-        package: ["api", "sdk", "instrumentation", "semantic", "getting", "distro" , "shim", "exporter", "protobuf", "propagator"]
+        package: ["api", "sdk", "semantic", "getting", "shim", "exporter", "protobuf", "propagator"]
         os: [ ubuntu-20.04, windows-2019 ]
     steps:
       - name: Checkout Core Repo @ SHA - ${{ github.sha }}

docs-requirements.txt

@@ -8,9 +8,7 @@ sphinx-jekyll-builder
 # doesn't work for pkg_resources.
 ./opentelemetry-api
 ./opentelemetry-semantic-conventions
-./opentelemetry-instrumentation
 ./opentelemetry-sdk
-./opentelemetry-instrumentation
 
 # Required by instrumentation and exporter packages
 ddtrace>=0.34.0

eachdist.ini

@@ -5,7 +5,6 @@
 sortfirst=
     opentelemetry-api
     opentelemetry-sdk
-    opentelemetry-instrumentation
     opentelemetry-proto
     opentelemetry-distro
     tests/util
@@ -39,7 +38,6 @@ packages=
     opentelemetry-distro
     opentelemetry-semantic-conventions
     opentelemetry-test
-    opentelemetry-instrumentation
     tests
 
 [experimental]