Remove opentelemetry-instrumentation

Fixes #592
open-telemetry · Jul 15, 2021 · 2707134 · 2707134
1 parent 7e8b5bb
commit 2707134
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 519 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: 49da963cbb5183676e58a38afda30c7a33d479e9
 
 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)
 
+### Added
+- Remove `opentelemetry-instrumentation`
+  ([#465](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/465))
+
 ### 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
@@ -24,10 +24,6 @@
 
 settings.configure()
 
-source_dirs = [
-    os.path.abspath("../opentelemetry-instrumentation/src/"),
-]
-
 exp = "../exporter"
 exp_dirs = [
     os.path.abspath("/".join(["../exporter", f, "src"]))
@@ -49,7 +45,7 @@
     if isdir(join(sdk_ext, f))
 ]
 
-sys.path[:0] = source_dirs + exp_dirs + instr_dirs + sdk_ext_dirs
+sys.path[:0] = exp_dirs + instr_dirs + sdk_ext_dirs
 
 # -- Project information -----------------------------------------------------
 

diff --git a/docs/instrumentation/base/instrumentation.rst b/docs/instrumentation/base/instrumentation.rst
diff --git a/docs/instrumentation/base/instrumentor.rst b/docs/instrumentation/base/instrumentor.rst
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/...emetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py b/...emetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py
diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/configurator.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/configurator.py
diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/py.typed b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/py.typed
diff --git a/opentelemetry-instrumentation/tests/__init__.py b/opentelemetry-instrumentation/tests/__init__.py