Rename remaining framework packages from "ext" to "instrumentation" (#969)
This commit is contained in:
Leighton Chen
GitHub
parent
81595475af
commit
8ca32f0ba5
|
|
@ -10,7 +10,7 @@ sortfirst=
|
||||||
instrumentation/opentelemetry-instrumentation-wsgi
|
instrumentation/opentelemetry-instrumentation-wsgi
|
||||||
instrumentation/opentelemetry-instrumentation-dbapi
|
instrumentation/opentelemetry-instrumentation-dbapi
|
||||||
instrumentation/opentelemetry-instrumentation-asgi
|
instrumentation/opentelemetry-instrumentation-asgi
|
||||||
ext/opentelemetry-ext-botocore
|
instrumentation/opentelemetry-instrumentation-botocore
|
||||||
instrumentation/*
|
instrumentation/*
|
||||||
exporter/*
|
exporter/*
|
||||||
ext/*
|
ext/*
|
||||||
|
|
|
||||||
56
tox.ini
56
tox.ini
|
|
@ -36,7 +36,7 @@ envlist =
|
||||||
py3{5,6,7,8}-test-instrumentation-aiopg
|
py3{5,6,7,8}-test-instrumentation-aiopg
|
||||||
; instrumentation-aiopg intentionally excluded from pypy3
|
; instrumentation-aiopg intentionally excluded from pypy3
|
||||||
|
|
||||||
; opentelemetry-ext-botocore
|
; opentelemetry-instrumentation-botocore
|
||||||
py3{6,7,8}-test-instrumentation-botocore
|
py3{6,7,8}-test-instrumentation-botocore
|
||||||
pypy3-test-instrumentation-botocore
|
pypy3-test-instrumentation-botocore
|
||||||
|
|
||||||
|
|
@ -48,7 +48,7 @@ envlist =
|
||||||
py3{4,5,6,7,8}-test-instrumentation-dbapi
|
py3{4,5,6,7,8}-test-instrumentation-dbapi
|
||||||
pypy3-test-instrumentation-dbapi
|
pypy3-test-instrumentation-dbapi
|
||||||
|
|
||||||
; opentelemetry-ext-boto
|
; opentelemetry-instrumentation-boto
|
||||||
py3{5,6,7,8}-test-instrumentation-boto
|
py3{5,6,7,8}-test-instrumentation-boto
|
||||||
pypy3-test-instrumentation-boto
|
pypy3-test-instrumentation-boto
|
||||||
|
|
||||||
|
|
@ -74,7 +74,7 @@ envlist =
|
||||||
py3{6,7,8}-test-instrumentation-starlette
|
py3{6,7,8}-test-instrumentation-starlette
|
||||||
pypy3-test-instrumentation-starlette
|
pypy3-test-instrumentation-starlette
|
||||||
|
|
||||||
; opentelemetry-ext-jinja2
|
; opentelemetry-instrumentation-jinja2
|
||||||
py3{4,5,6,7,8}-test-instrumentation-jinja2
|
py3{4,5,6,7,8}-test-instrumentation-jinja2
|
||||||
pypy3-test-instrumentation-jinja2
|
pypy3-test-instrumentation-jinja2
|
||||||
|
|
||||||
|
|
@ -145,7 +145,7 @@ envlist =
|
||||||
py3{4,5,6,7,8}-test-core-opentracing-shim
|
py3{4,5,6,7,8}-test-core-opentracing-shim
|
||||||
pypy3-test-core-opentracing-shim
|
pypy3-test-core-opentracing-shim
|
||||||
|
|
||||||
; opentelemetry-ext-grpc
|
; opentelemetry-instrumentation-grpc
|
||||||
py3{5,6,7,8}-test-instrumentation-grpc
|
py3{5,6,7,8}-test-instrumentation-grpc
|
||||||
|
|
||||||
; opentelemetry-instrumentation-sqlalchemy
|
; opentelemetry-instrumentation-sqlalchemy
|
||||||
|
|
@ -156,13 +156,13 @@ envlist =
|
||||||
py3{4,5,6,7,8}-test-instrumentation-redis
|
py3{4,5,6,7,8}-test-instrumentation-redis
|
||||||
pypy3-test-instrumentation-redis
|
pypy3-test-instrumentation-redis
|
||||||
|
|
||||||
; opentelemetry-ext-celery
|
; opentelemetry-instrumentation-celery
|
||||||
py3{5,6,7,8}-test-instrumentation-celery
|
py3{5,6,7,8}-test-instrumentation-celery
|
||||||
pypy3-test-instrumentation-celery
|
pypy3-test-instrumentation-celery
|
||||||
|
|
||||||
; opentelemetry-ext-system-metrics
|
; opentelemetry-instrumentation-system-metrics
|
||||||
py3{4,5,6,7,8}-test-instrumentation-system-metrics
|
py3{4,5,6,7,8}-test-instrumentation-system-metrics
|
||||||
; ext-system-metrics intentionally excluded from pypy3
|
; instrumentation-system-metrics intentionally excluded from pypy3
|
||||||
; known limitation: gc.get_count won't work under pypy
|
; known limitation: gc.get_count won't work under pypy
|
||||||
|
|
||||||
lint
|
lint
|
||||||
|
|
@ -195,23 +195,23 @@ changedir =
|
||||||
test-core-proto: opentelemetry-proto/tests
|
test-core-proto: opentelemetry-proto/tests
|
||||||
test-core-instrumentation: opentelemetry-instrumentation/tests
|
test-core-instrumentation: opentelemetry-instrumentation/tests
|
||||||
test-core-getting-started: docs/getting_started/tests
|
test-core-getting-started: docs/getting_started/tests
|
||||||
test-core-opentracing-shim: ext/opentelemetry-ext-opentracing-shim/tests
|
test-core-opentracing-shim: instrumentation/opentelemetry-instrumentation-opentracing-shim/tests
|
||||||
|
|
||||||
test-instrumentation-aiohttp-client: instrumentation/opentelemetry-instrumentation-aiohttp-client/tests
|
test-instrumentation-aiohttp-client: instrumentation/opentelemetry-instrumentation-aiohttp-client/tests
|
||||||
test-instrumentation-aiopg: instrumentation/opentelemetry-instrumentation-aiopg/tests
|
test-instrumentation-aiopg: instrumentation/opentelemetry-instrumentation-aiopg/tests
|
||||||
test-instrumentation-asgi: instrumentation/opentelemetry-instrumentation-asgi/tests
|
test-instrumentation-asgi: instrumentation/opentelemetry-instrumentation-asgi/tests
|
||||||
test-instrumentation-asyncpg: instrumentation/opentelemetry-instrumentation-asyncpg/tests
|
test-instrumentation-asyncpg: instrumentation/opentelemetry-instrumentation-asyncpg/tests
|
||||||
test-instrumentation-boto: ext/opentelemetry-ext-boto/tests
|
test-instrumentation-boto: instrumentation/opentelemetry-instrumentation-boto/tests
|
||||||
test-instrumentation-botocore: ext/opentelemetry-ext-botocore/tests
|
test-instrumentation-botocore: instrumentation/opentelemetry-instrumentation-botocore/tests
|
||||||
test-instrumentation-celery: ext/opentelemetry-ext-celery/tests
|
test-instrumentation-celery: instrumentation/opentelemetry-instrumentation-celery/tests
|
||||||
test-instrumentation-dbapi: instrumentation/opentelemetry-instrumentation-dbapi/tests
|
test-instrumentation-dbapi: instrumentation/opentelemetry-instrumentation-dbapi/tests
|
||||||
test-instrumentation-django: instrumentation/opentelemetry-instrumentation-django/tests
|
test-instrumentation-django: instrumentation/opentelemetry-instrumentation-django/tests
|
||||||
test-instrumentation-example-app: docs/examples/opentelemetry-example-app/tests
|
test-instrumentation-example-app: docs/examples/opentelemetry-example-app/tests
|
||||||
test-instrumentation-elasticsearch{2,5,6,7}: ext/opentelemetry-ext-elasticsearch/tests
|
test-instrumentation-elasticsearch{2,5,6,7}: instrumentation/opentelemetry-instrumentation-elasticsearch/tests
|
||||||
test-instrumentation-fastapi: instrumentation/opentelemetry-instrumentation-fastapi/tests
|
test-instrumentation-fastapi: instrumentation/opentelemetry-instrumentation-fastapi/tests
|
||||||
test-instrumentation-flask: instrumentation/opentelemetry-instrumentation-flask/tests
|
test-instrumentation-flask: instrumentation/opentelemetry-instrumentation-flask/tests
|
||||||
test-instrumentation-grpc: ext/opentelemetry-ext-grpc/tests
|
test-instrumentation-grpc: instrumentation/opentelemetry-instrumentation-grpc/tests
|
||||||
test-instrumentation-jinja2: ext/opentelemetry-ext-jinja2/tests
|
test-instrumentation-jinja2: instrumentation/opentelemetry-instrumentation-jinja2/tests
|
||||||
test-instrumentation-mysql: instrumentation/opentelemetry-instrumentation-mysql/tests
|
test-instrumentation-mysql: instrumentation/opentelemetry-instrumentation-mysql/tests
|
||||||
test-instrumentation-psycopg2: instrumentation/opentelemetry-instrumentation-psycopg2/tests
|
test-instrumentation-psycopg2: instrumentation/opentelemetry-instrumentation-psycopg2/tests
|
||||||
test-instrumentation-pymemcache: instrumentation/opentelemetry-instrumentation-pymemcache/tests
|
test-instrumentation-pymemcache: instrumentation/opentelemetry-instrumentation-pymemcache/tests
|
||||||
|
|
@ -223,7 +223,7 @@ changedir =
|
||||||
test-instrumentation-sqlalchemy: instrumentation/opentelemetry-instrumentation-sqlalchemy/tests
|
test-instrumentation-sqlalchemy: instrumentation/opentelemetry-instrumentation-sqlalchemy/tests
|
||||||
test-instrumentation-sqlite3: instrumentation/opentelemetry-instrumentation-sqlite3/tests
|
test-instrumentation-sqlite3: instrumentation/opentelemetry-instrumentation-sqlite3/tests
|
||||||
test-instrumentation-starlette: instrumentation/opentelemetry-instrumentation-starlette/tests
|
test-instrumentation-starlette: instrumentation/opentelemetry-instrumentation-starlette/tests
|
||||||
test-instrumentation-system-metrics: ext/opentelemetry-ext-system-metrics/tests
|
test-instrumentation-system-metrics: instrumentation/opentelemetry-instrumentation-system-metrics/tests
|
||||||
test-instrumentation-wsgi: instrumentation/opentelemetry-instrumentation-wsgi/tests
|
test-instrumentation-wsgi: instrumentation/opentelemetry-instrumentation-wsgi/tests
|
||||||
|
|
||||||
test-exporter-jaeger: exporter/opentelemetry-exporter-jaeger/tests
|
test-exporter-jaeger: exporter/opentelemetry-exporter-jaeger/tests
|
||||||
|
|
@ -241,27 +241,27 @@ commands_pre =
|
||||||
test: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-sdk {toxinidir}/tests/util
|
test: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-sdk {toxinidir}/tests/util
|
||||||
|
|
||||||
test-core-proto: pip install {toxinidir}/opentelemetry-proto
|
test-core-proto: pip install {toxinidir}/opentelemetry-proto
|
||||||
ext,instrumentation: pip install {toxinidir}/opentelemetry-instrumentation
|
instrumentation: pip install {toxinidir}/opentelemetry-instrumentation
|
||||||
|
|
||||||
example-app: pip install {toxinidir}/opentelemetry-instrumentation {toxinidir}/instrumentation/opentelemetry-instrumentation-requests {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi {toxinidir}/instrumentation/opentelemetry-instrumentation-flask {toxinidir}/docs/examples/opentelemetry-example-app
|
example-app: pip install {toxinidir}/opentelemetry-instrumentation {toxinidir}/instrumentation/opentelemetry-instrumentation-requests {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi {toxinidir}/instrumentation/opentelemetry-instrumentation-flask {toxinidir}/docs/examples/opentelemetry-example-app
|
||||||
|
|
||||||
getting-started: pip install -e {toxinidir}/opentelemetry-instrumentation -e {toxinidir}/instrumentation/opentelemetry-instrumentation-requests -e {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi -e {toxinidir}/instrumentation/opentelemetry-instrumentation-flask
|
getting-started: pip install -e {toxinidir}/opentelemetry-instrumentation -e {toxinidir}/instrumentation/opentelemetry-instrumentation-requests -e {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi -e {toxinidir}/instrumentation/opentelemetry-instrumentation-flask
|
||||||
|
|
||||||
celery: pip install {toxinidir}/ext/opentelemetry-ext-celery[test]
|
celery: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]
|
||||||
|
|
||||||
grpc: pip install {toxinidir}/ext/opentelemetry-ext-grpc[test]
|
grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
|
||||||
|
|
||||||
wsgi,flask,django,pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi
|
wsgi,flask,django,pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi
|
||||||
asgi,starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi
|
asgi,starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi
|
||||||
|
|
||||||
asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg
|
asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg
|
||||||
|
|
||||||
boto: pip install {toxinidir}/ext/opentelemetry-ext-botocore[test]
|
boto: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test]
|
||||||
boto: pip install {toxinidir}/ext/opentelemetry-ext-boto[test]
|
boto: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test]
|
||||||
|
|
||||||
flask: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]
|
flask: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]
|
||||||
|
|
||||||
botocore: pip install {toxinidir}/ext/opentelemetry-ext-botocore[test]
|
botocore: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test]
|
||||||
|
|
||||||
dbapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi[test]
|
dbapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi[test]
|
||||||
|
|
||||||
|
|
@ -296,7 +296,7 @@ commands_pre =
|
||||||
|
|
||||||
starlette: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette[test]
|
starlette: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette[test]
|
||||||
|
|
||||||
jinja2: pip install {toxinidir}/ext/opentelemetry-ext-jinja2[test]
|
jinja2: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2[test]
|
||||||
|
|
||||||
aiohttp-client: pip install {toxinidir}/opentelemetry-sdk {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client
|
aiohttp-client: pip install {toxinidir}/opentelemetry-sdk {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client
|
||||||
|
|
||||||
|
|
@ -305,7 +305,7 @@ commands_pre =
|
||||||
jaeger: pip install {toxinidir}/exporter/opentelemetry-exporter-jaeger
|
jaeger: pip install {toxinidir}/exporter/opentelemetry-exporter-jaeger
|
||||||
|
|
||||||
opentracing-shim: pip install {toxinidir}/opentelemetry-sdk
|
opentracing-shim: pip install {toxinidir}/opentelemetry-sdk
|
||||||
opentracing-shim: pip install {toxinidir}/ext/opentelemetry-ext-opentracing-shim
|
opentracing-shim: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-opentracing-shim
|
||||||
|
|
||||||
datadog: pip install {toxinidir}/opentelemetry-sdk {toxinidir}/exporter/opentelemetry-exporter-datadog
|
datadog: pip install {toxinidir}/opentelemetry-sdk {toxinidir}/exporter/opentelemetry-exporter-datadog
|
||||||
|
|
||||||
|
|
@ -313,9 +313,9 @@ commands_pre =
|
||||||
|
|
||||||
sqlalchemy: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy
|
sqlalchemy: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy
|
||||||
|
|
||||||
system-metrics: pip install {toxinidir}/ext/opentelemetry-ext-system-metrics[test]
|
system-metrics: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics[test]
|
||||||
|
|
||||||
elasticsearch{2,5,6,7}: pip install {toxinidir}/opentelemetry-instrumentation {toxinidir}/ext/opentelemetry-ext-elasticsearch[test]
|
elasticsearch{2,5,6,7}: pip install {toxinidir}/opentelemetry-instrumentation {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch[test]
|
||||||
|
|
||||||
; In order to get a healthy coverage report,
|
; In order to get a healthy coverage report,
|
||||||
; we have to install packages in editable mode.
|
; we have to install packages in editable mode.
|
||||||
|
|
@ -405,7 +405,7 @@ deps =
|
||||||
celery ~= 4.0, != 4.4.4
|
celery ~= 4.0, != 4.4.4
|
||||||
|
|
||||||
changedir =
|
changedir =
|
||||||
ext/opentelemetry-ext-docker-tests/tests
|
tests/opentelemetry-docker-tests/tests
|
||||||
|
|
||||||
commands_pre =
|
commands_pre =
|
||||||
pip install -e {toxinidir}/opentelemetry-api \
|
pip install -e {toxinidir}/opentelemetry-api \
|
||||||
|
|
@ -413,7 +413,7 @@ commands_pre =
|
||||||
-e {toxinidir}/opentelemetry-instrumentation \
|
-e {toxinidir}/opentelemetry-instrumentation \
|
||||||
-e {toxinidir}/tests/util \
|
-e {toxinidir}/tests/util \
|
||||||
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg \
|
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg \
|
||||||
-e {toxinidir}/ext/opentelemetry-ext-celery \
|
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery \
|
||||||
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi \
|
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi \
|
||||||
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql \
|
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql \
|
||||||
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2 \
|
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2 \
|
||||||
|
|
@ -422,7 +422,7 @@ commands_pre =
|
||||||
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy \
|
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy \
|
||||||
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg \
|
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg \
|
||||||
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-redis \
|
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-redis \
|
||||||
-e {toxinidir}/ext/opentelemetry-ext-system-metrics \
|
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics \
|
||||||
-e {toxinidir}/exporter/opentelemetry-exporter-opencensus
|
-e {toxinidir}/exporter/opentelemetry-exporter-opencensus
|
||||||
docker-compose up -d
|
docker-compose up -d
|
||||||
python check_availability.py
|
python check_availability.py
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue