Skip to content

Commit c47815d

Browse files
NathanielRNNathanielRN
authored
Removes Instrumentation and Exporter Code From Core Repo (open-telemetry#1258)
1 parent e3cba02 commit c47815d

File tree

384 files changed

+60
-31214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

384 files changed

+60
-31214
lines changed

‎.flake8

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ exclude =
2222
docs/examples/opentelemetry-example-app/build/*
2323
opentelemetry-proto/build/*
2424
opentelemetry-proto/src/opentelemetry/proto/
25+
opentelemetry-python-contrib/

‎.github/workflows/test.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches-ignore:
66
- 'release/*'
77
pull_request:
8+
env:
9+
CONTRIB_REPO_SHA: 5c9e043d6921550d82668788e3758a733fb11cb8
810

911
jobs:
1012
build:
@@ -41,7 +43,14 @@ jobs:
4143
python-version: py35
4244
package: instrumentation
4345
steps:
44-
- uses: actions/checkout@v2
46+
- name: Checkout Core Repo @ SHA - ${{ github.sha }}
47+
uses: actions/checkout@v2
48+
- name: Checkout Contrib Repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
49+
uses: actions/checkout@v2
50+
with:
51+
repository: open-telemetry/opentelemetry-python-contrib
52+
ref: ${{ env.CONTRIB_REPO_SHA }}
53+
path: opentelemetry-python-contrib
4554
- name: Set up Python ${{ env[matrix.python-version] }}
4655
uses: actions/setup-python@v2
4756
with:
@@ -64,7 +73,14 @@ jobs:
6473
name: ${{ matrix.tox-environment }}
6574
runs-on: ubuntu-latest
6675
steps:
67-
- uses: actions/checkout@v2
76+
- name: Checkout Core Repo @ SHA - ${{ github.sha }}
77+
uses: actions/checkout@v2
78+
- name: Checkout Contrib Repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
79+
uses: actions/checkout@v2
80+
with:
81+
repository: open-telemetry/opentelemetry-python-contrib
82+
ref: ${{ env.CONTRIB_REPO_SHA }}
83+
path: opentelemetry-python-contrib
6884
- name: Set up Python 3.8
6985
uses: actions/setup-python@v2
7086
with:

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ lib64
2121
__pycache__
2222
venv*/
2323
.venv*/
24+
opentelemetry-python-contrib/
2425

2526
# Installer logs
2627
pip-log.txt

‎.isort.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ line_length=79
1313
; docs: https://github.com/timothycrosley/isort#multi-line-output-modes
1414
multi_line_output=3
1515
skip=target
16-
skip_glob=**/gen/*,.venv*/*,venv*/*,**/proto/*
16+
skip_glob=**/gen/*,.venv*/*,venv*/*,**/proto/*,opentelemetry-python-contrib/*
1717
known_first_party=opentelemetry,opentelemetry_example_app
1818
known_third_party=psutil,pytest,redis,redis_opentracing

‎docs/examples/django/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,4 @@ References
111111

112112
* `Django <https://djangoproject.com/>`_
113113
* `OpenTelemetry Project <https://opentelemetry.io/>`_
114-
* `OpenTelemetry Django extension <https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-django>`_
114+
* `OpenTelemetry Django extension <https://github.com/open-telemetry/opentelemetry-python-contib/tree/master/instrumentation/opentelemetry-instrumentation-django>`_

‎docs/examples/django/pages/views.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
from django.http import HttpResponse
15-
1615
from opentelemetry import trace
1716
from opentelemetry.sdk.trace import TracerProvider
1817
from opentelemetry.sdk.trace.export import (

‎docs/examples/opentelemetry-example-app/setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ include_package_data = True
4343
install_requires =
4444
opentelemetry-api == 0.16.dev0
4545
opentelemetry-sdk == 0.16.dev0
46-
opentelemetry-instrumentation-requests == 0.16.dev0
47-
opentelemetry-instrumentation-flask == 0.16.dev0
46+
opentelemetry-instrumentation-requests == 0.15.b0
47+
opentelemetry-instrumentation-flask == 0.15.b0
4848
flask
4949
requests
5050
protobuf>=3.13.0

‎docs/exporter/datadog/datadog.rst

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

‎docs/getting-started.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ The above is a great example, but it's very manual. Within the telemetry space,
150150
* Database calls
151151

152152
To help instrument common scenarios, opentelemetry also has the concept of "instrumentations": packages that are designed to interface
153-
with a specific framework or library, such as Flask and psycopg2. A list of the currently curated extension packages can be found :scm_web:`here <instrumentation/>`.
153+
with a specific framework or library, such as Flask and psycopg2. A list of the currently curated extension packages can be found `at the Contrib repo <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation>`_.
154154

155155
We will now instrument a basic Flask application that uses the requests library to send HTTP requests. First, install the instrumentation packages themselves:
156156

‎docs/index.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ In addition, there are several extension packages which can be installed separat
3030
pip install opentelemetry-instrumentation-{instrumentation}
3131

3232
These are for exporter and instrumentation packages respectively.
33-
The packages can be found in :scm_web:`instrumentation <instrumentation/>` and :scm_web:`exporter <exporter/>` directory of the repository.
33+
Some packages can be found in :scm_web:`instrumentation <instrumentation/>` and :scm_web:`exporter <exporter/>`
34+
directory of the repository. The remaining packages can be found at the
35+
`Contrib repo instrumentation <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation>`_
36+
and `Contrib repo exporter <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/exporter>`_ directories.
3437

3538
Extensions
3639
----------
@@ -53,7 +56,6 @@ install <https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs>
5356
cd opentelemetry-python
5457
pip install -e ./opentelemetry-api
5558
pip install -e ./opentelemetry-sdk
56-
pip install -e ./instrumentation/opentelemetry-instrumentation-{instrumentation}
5759
5860
5961
.. toctree::

‎docs/instrumentation/aiohttp_client/aiohttp_client.rst

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

‎docs/instrumentation/aiopg/aiopg.rst

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

‎docs/instrumentation/asgi/asgi.rst

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

‎docs/instrumentation/asyncpg/asyncpg.rst

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

‎docs/instrumentation/boto/boto.rst

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

‎docs/instrumentation/botocore/botocore.rst

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

‎docs/instrumentation/celery/celery.rst

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

‎docs/instrumentation/dbapi/dbapi.rst

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

‎docs/instrumentation/django/django.rst

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

‎docs/instrumentation/fastapi/fastapi.rst

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

‎docs/instrumentation/flask/flask.rst

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

‎docs/instrumentation/grpc/grpc.rst

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

‎docs/instrumentation/jinja2/jinja2.rst

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

‎docs/instrumentation/mysql/mysql.rst

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

‎docs/instrumentation/psycopg2/psycopg2.rst

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

‎docs/instrumentation/pymemcache/pymemcache.rst

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

‎docs/instrumentation/pymongo/pymongo.rst

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

‎docs/instrumentation/pymysql/pymysql.rst

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

‎docs/instrumentation/pyramid/pyramid.rst

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

‎docs/instrumentation/redis/redis.rst

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

‎docs/instrumentation/requests/requests.rst

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

‎docs/instrumentation/sqlalchemy/sqlalchemy.rst

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

‎docs/instrumentation/sqlite3/sqlite3.rst

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

‎docs/instrumentation/starlette/starlette.rst

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

‎docs/instrumentation/system_metrics/system_metrics.rst

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

‎docs/instrumentation/wsgi/wsgi.rst

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

‎eachdist.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# These will be sorted first in that order.
22
# All packages that are depended upon by others should be listed here.
33
[DEFAULT]
4+
ignore=
5+
opentelemetry-python-contrib
6+
47
sortfirst=
58
opentelemetry-api
69
opentelemetry-sdk

‎exporter/opentelemetry-exporter-datadog/CHANGELOG.md

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

0 commit comments

Comments
 (0)