Remove opentelemetry-instrumentation (#595)

Fixes #592
open-telemetry · Jul 19, 2021 · 2781495 · 2781495
1 parent 08daa9d
commit 2781495
Show file tree

Hide file tree

Showing 31 changed files with 17 additions and 1,812 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: c4cdffd0c8bd47b2e5c4f4a823722ca514f10db3
+  CORE_REPO_SHA: e78c9c460c1f1f062032a31f46245d7b1f9cdcd0
 
 jobs:
   build:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,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.3.0-0.22b0...HEAD)
 
+### Removed
+- Move `opentelemetry-instrumentation` to the core repo.
+  ([#595](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/595))
+
 ### Changed
 - `opentelemetry-instrumentation-tornado` properly instrument work done in tornado on_finish method.
   ([#499](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/499))

diff --git a/docs-requirements.txt b/docs-requirements.txt
@@ -6,7 +6,7 @@ sphinx-autodoc-typehints
 # doesn't work for pkg_resources.
 -e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-api&subdirectory=opentelemetry-api"
 -e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions"
--e "git+https://github.com/open-telemetry/opentelemetry-python-contrib.git#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation"
+-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation"
 -e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
 -e "git+https://github.com/open-telemetry/opentelemetry-python-contrib.git#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http"
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -25,7 +25,9 @@
 settings.configure()
 
 source_dirs = [
-    os.path.abspath("../opentelemetry-instrumentation/src/"),
+    os.path.abspath(
+        "../opentelemetry-python-core/opentelemetry-instrumentation/src/"
+    ),
 ]
 
 exp = "../exporter"

diff --git a/opentelemetry-instrumentation/MANIFEST.in b/opentelemetry-instrumentation/MANIFEST.in
diff --git a/opentelemetry-instrumentation/README.rst b/opentelemetry-instrumentation/README.rst
diff --git a/opentelemetry-instrumentation/setup.cfg b/opentelemetry-instrumentation/setup.cfg
diff --git a/opentelemetry-instrumentation/setup.py b/opentelemetry-instrumentation/setup.py
diff --git a/...emetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py b/...emetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py