Skip to content

Commit 3ef7cb5

Browse files
authored
Move instrumentation and distro to contrib (open-telemetry#2196)
Now that SDK does not depend on opentelemetry-instrumentation anymore and opentelemetry-instrumentation has actual build time dependencies on the contrib repo, it makes maintanence a lot easier if we move opentelemetry-instrumentation to contrib repo. opentelemetry-distro depends on opentelemetry-instrumentation and is being moved as well. Neither of the two packages are really part of "core" Otel python anyway.
1 parent 3bf379d commit 3ef7cb5

39 files changed

+7
-2080
lines changed

.github/pull_request_template.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Please describe the tests that you ran to verify your changes. Provide instructi
2323

2424
Answer the following question based on these examples of changes that would require a Contrib Repo Change:
2525
- [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/`
26-
- The method interfaces of `opentelemetry-instrumentation/` have changed
2726
- The method interfaces of `test/util` have changed
2827
- Scripts in `scripts/` that were copied over to the Contrib repo have changed
2928
- 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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
# Otherwise, set variable to the commit of your branch on
1111
# opentelemetry-python-contrib which is compatible with these Core repo
1212
# changes.
13-
CONTRIB_REPO_SHA: 4a4d889b1876323d7f70507b5e4d079f454fe0d6
13+
CONTRIB_REPO_SHA: c2e674983a265e54c5eb14e376459a992498aae6
1414
# This is needed because we do not clone the core repo in contrib builds anymore.
1515
# When running contrib builds as part of core builds, we use actions/checkout@v2 which
1616
# does not set an environment variable (simply just runs tox), which is different when
@@ -34,7 +34,7 @@ jobs:
3434
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
3535
matrix:
3636
python-version: [ py36, py37, py38, py39, pypy3 ]
37-
package: ["api", "sdk", "instrumentation", "semantic", "getting", "distro" , "shim", "exporter", "protobuf", "propagator"]
37+
package: ["api", "sdk", "semantic", "getting", "shim", "exporter", "protobuf", "propagator"]
3838
os: [ ubuntu-20.04, windows-2019 ]
3939
steps:
4040
- name: Checkout Core Repo @ SHA - ${{ github.sha }}

docs-requirements.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ sphinx-jekyll-builder
88
# doesn't work for pkg_resources.
99
./opentelemetry-api
1010
./opentelemetry-semantic-conventions
11-
./opentelemetry-instrumentation
1211
./opentelemetry-sdk
13-
./opentelemetry-instrumentation
1412

1513
# Required by instrumentation and exporter packages
1614
ddtrace>=0.34.0

eachdist.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
sortfirst=
66
opentelemetry-api
77
opentelemetry-sdk
8-
opentelemetry-instrumentation
98
opentelemetry-proto
109
opentelemetry-distro
1110
tests/util
@@ -39,7 +38,6 @@ packages=
3938
opentelemetry-distro
4039
opentelemetry-semantic-conventions
4140
opentelemetry-test
42-
opentelemetry-instrumentation
4341
tests
4442

4543
[experimental]

opentelemetry-distro/MANIFEST.in

Lines changed: 0 additions & 7 deletions
This file was deleted.

opentelemetry-distro/README.rst

Lines changed: 0 additions & 23 deletions
This file was deleted.

opentelemetry-distro/setup.cfg

Lines changed: 0 additions & 60 deletions
This file was deleted.

opentelemetry-distro/setup.py

Lines changed: 0 additions & 29 deletions
This file was deleted.

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

Lines changed: 0 additions & 34 deletions
This file was deleted.

opentelemetry-distro/src/opentelemetry/distro/py.typed

Whitespace-only changes.

0 commit comments

Comments
 (0)