diff --git a/docs/ext/asyncpg/asyncpg.rst b/docs/ext/asyncpg/asyncpg.rst
deleted file mode 100644
index 3a4a9b3c4e..0000000000
--- a/docs/ext/asyncpg/asyncpg.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-opentelemetry.ext.asyncpg package
-=================================
-
-Module contents
----------------
-
-.. automodule:: opentelemetry.ext.asyncpg
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/docs/ext/dbapi/dbapi.rst b/docs/ext/dbapi/dbapi.rst
deleted file mode 100644
index d87d968b4b..0000000000
--- a/docs/ext/dbapi/dbapi.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-OpenTelemetry Database API Integration
-======================================
-
-.. automodule:: opentelemetry.ext.dbapi
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/docs/ext/mysql/mysql.rst b/docs/ext/mysql/mysql.rst
deleted file mode 100644
index 4fd4749731..0000000000
--- a/docs/ext/mysql/mysql.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-OpenTelemetry MySQL Integration
-===============================
-
-.. automodule:: opentelemetry.ext.mysql
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/docs/ext/psycopg2/psycopg2.rst b/docs/ext/psycopg2/psycopg2.rst
deleted file mode 100644
index c9c0037546..0000000000
--- a/docs/ext/psycopg2/psycopg2.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-OpenTelemetry Psycopg Integration
-=================================
-
-.. automodule:: opentelemetry.ext.psycopg2
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/docs/ext/pymemcache/pymemcache.rst b/docs/ext/pymemcache/pymemcache.rst
deleted file mode 100644
index c64e00cb59..0000000000
--- a/docs/ext/pymemcache/pymemcache.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-OpenTelemetry pymemcache Integration
-====================================
-
-.. automodule:: opentelemetry.ext.pymemcache
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/docs/ext/pymongo/pymongo.rst b/docs/ext/pymongo/pymongo.rst
deleted file mode 100644
index e75f4f4168..0000000000
--- a/docs/ext/pymongo/pymongo.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-OpenTelemetry pymongo Integration
-=================================
-
-.. automodule:: opentelemetry.ext.pymongo
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/docs/ext/pymysql/pymysql.rst b/docs/ext/pymysql/pymysql.rst
deleted file mode 100644
index 23dca80c4f..0000000000
--- a/docs/ext/pymysql/pymysql.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-OpenTelemetry PyMySQL Integration
-=================================
-
-.. automodule:: opentelemetry.ext.pymysql
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/docs/ext/sqlite3/sqlite3.rst b/docs/ext/sqlite3/sqlite3.rst
deleted file mode 100644
index 9537ff58bf..0000000000
--- a/docs/ext/sqlite3/sqlite3.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-OpenTelemetry SQLite3 Integration
-=================================
-
-.. automodule:: opentelemetry.ext.sqlite3
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/docs/instrumentation/asyncpg/asyncpg.rst b/docs/instrumentation/asyncpg/asyncpg.rst
new file mode 100644
index 0000000000..745e83f51d
--- /dev/null
+++ b/docs/instrumentation/asyncpg/asyncpg.rst
@@ -0,0 +1,10 @@
+Opentelemetry asyncpg Instrumentation
+=====================================
+
+Module contents
+---------------
+
+.. automodule:: opentelemetry.instrumentation.asyncpg
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/docs/instrumentation/dbapi/dbapi.rst b/docs/instrumentation/dbapi/dbapi.rst
new file mode 100644
index 0000000000..a20be63097
--- /dev/null
+++ b/docs/instrumentation/dbapi/dbapi.rst
@@ -0,0 +1,7 @@
+OpenTelemetry Database API Instrumentation
+==========================================
+
+.. automodule:: opentelemetry.instrumentation.dbapi
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/docs/instrumentation/mysql/mysql.rst b/docs/instrumentation/mysql/mysql.rst
new file mode 100644
index 0000000000..3a4a41542a
--- /dev/null
+++ b/docs/instrumentation/mysql/mysql.rst
@@ -0,0 +1,7 @@
+OpenTelemetry MySQL Instrumentation
+===================================
+
+.. automodule:: opentelemetry.instrumentation.mysql
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/docs/instrumentation/psycopg2/psycopg2.rst b/docs/instrumentation/psycopg2/psycopg2.rst
new file mode 100644
index 0000000000..69be31b2d1
--- /dev/null
+++ b/docs/instrumentation/psycopg2/psycopg2.rst
@@ -0,0 +1,7 @@
+OpenTelemetry Psycopg Instrumentation
+=====================================
+
+.. automodule:: opentelemetry.instrumentation.psycopg2
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/docs/instrumentation/pymemcache/pymemcache.rst b/docs/instrumentation/pymemcache/pymemcache.rst
new file mode 100644
index 0000000000..2a77b829d9
--- /dev/null
+++ b/docs/instrumentation/pymemcache/pymemcache.rst
@@ -0,0 +1,7 @@
+OpenTelemetry pymemcache Instrumentation
+========================================
+
+.. automodule:: opentelemetry.instrumentation.pymemcache
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/docs/instrumentation/pymongo/pymongo.rst b/docs/instrumentation/pymongo/pymongo.rst
new file mode 100644
index 0000000000..4eb68be27b
--- /dev/null
+++ b/docs/instrumentation/pymongo/pymongo.rst
@@ -0,0 +1,7 @@
+OpenTelemetry pymongo Instrumentation
+=====================================
+
+.. automodule:: opentelemetry.instrumentation.pymongo
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/docs/instrumentation/pymysql/pymysql.rst b/docs/instrumentation/pymysql/pymysql.rst
new file mode 100644
index 0000000000..26482292fe
--- /dev/null
+++ b/docs/instrumentation/pymysql/pymysql.rst
@@ -0,0 +1,7 @@
+OpenTelemetry PyMySQL Instrumentation
+=====================================
+
+.. automodule:: opentelemetry.instrumentation.pymysql
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/docs/ext/redis/redis.rst b/docs/instrumentation/redis/redis.rst
similarity index 71%
rename from docs/ext/redis/redis.rst
rename to docs/instrumentation/redis/redis.rst
index 38a72ad52f..4e21bce24b 100644
--- a/docs/ext/redis/redis.rst
+++ b/docs/instrumentation/redis/redis.rst
@@ -1,7 +1,7 @@
OpenTelemetry Redis Instrumentation
===================================
-.. automodule:: opentelemetry.ext.redis
+.. automodule:: opentelemetry.instrumentation.redis
:members:
:undoc-members:
:show-inheritance:
diff --git a/docs/ext/sqlalchemy/sqlalchemy.rst b/docs/instrumentation/sqlalchemy/sqlalchemy.rst
similarity index 71%
rename from docs/ext/sqlalchemy/sqlalchemy.rst
rename to docs/instrumentation/sqlalchemy/sqlalchemy.rst
index 5a3afbb3bb..1a1895ea6b 100644
--- a/docs/ext/sqlalchemy/sqlalchemy.rst
+++ b/docs/instrumentation/sqlalchemy/sqlalchemy.rst
@@ -1,7 +1,7 @@
OpenTelemetry SQLAlchemy Instrumentation
========================================
-.. automodule:: opentelemetry.ext.sqlalchemy
+.. automodule:: opentelemetry.instrumentation.sqlalchemy
:members:
:undoc-members:
:show-inheritance:
diff --git a/docs/instrumentation/sqlite3/sqlite3.rst b/docs/instrumentation/sqlite3/sqlite3.rst
new file mode 100644
index 0000000000..36b541ccd1
--- /dev/null
+++ b/docs/instrumentation/sqlite3/sqlite3.rst
@@ -0,0 +1,7 @@
+OpenTelemetry SQLite3 Instrumentation
+=====================================
+
+.. automodule:: opentelemetry.instrumentation.sqlite3
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/eachdist.ini b/eachdist.ini
index 06d940378c..abf9e620aa 100644
--- a/eachdist.ini
+++ b/eachdist.ini
@@ -8,7 +8,7 @@ sortfirst=
opentelemetry-proto
tests/util
instrumentation/opentelemetry-instrumentation-wsgi
- ext/opentelemetry-ext-dbapi
+ instrumentation/opentelemetry-instrumentation-dbapi
instrumentation/opentelemetry-instrumentation-asgi
ext/opentelemetry-ext-botocore
instrumentation/*
diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py
index 785bccccce..7c94e173f7 100644
--- a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py
+++ b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py
@@ -34,19 +34,19 @@
_INSTRUMENTATION_SPAN_TYPES = {
"opentelemetry.instrumentation.aiohttp-client": DatadogSpanTypes.HTTP,
"opentelemetry.instrumentation.asgi": DatadogSpanTypes.WEB,
- "opentelemetry.ext.dbapi": DatadogSpanTypes.SQL,
+ "opentelemetry.instrumentation.dbapi": DatadogSpanTypes.SQL,
"opentelemetry.instrumentation.django": DatadogSpanTypes.WEB,
"opentelemetry.instrumentation.flask": DatadogSpanTypes.WEB,
"opentelemetry.ext.grpc": DatadogSpanTypes.GRPC,
"opentelemetry.ext.jinja2": DatadogSpanTypes.TEMPLATE,
- "opentelemetry.ext.mysql": DatadogSpanTypes.SQL,
- "opentelemetry.ext.psycopg2": DatadogSpanTypes.SQL,
- "opentelemetry.ext.pymemcache": DatadogSpanTypes.CACHE,
- "opentelemetry.ext.pymongo": DatadogSpanTypes.MONGODB,
- "opentelemetry.ext.pymysql": DatadogSpanTypes.SQL,
- "opentelemetry.ext.redis": DatadogSpanTypes.REDIS,
+ "opentelemetry.instrumentation.mysql": DatadogSpanTypes.SQL,
+ "opentelemetry.instrumentation.psycopg2": DatadogSpanTypes.SQL,
+ "opentelemetry.instrumentation.pymemcache": DatadogSpanTypes.CACHE,
+ "opentelemetry.instrumentation.pymongo": DatadogSpanTypes.MONGODB,
+ "opentelemetry.instrumentation.pymysql": DatadogSpanTypes.SQL,
+ "opentelemetry.instrumentation.redis": DatadogSpanTypes.REDIS,
"opentelemetry.instrumentation.requests": DatadogSpanTypes.HTTP,
- "opentelemetry.ext.sqlalchemy": DatadogSpanTypes.SQL,
+ "opentelemetry.instrumentation.sqlalchemy": DatadogSpanTypes.SQL,
"opentelemetry.instrumentation.wsgi": DatadogSpanTypes.WEB,
}
diff --git a/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py
index cf3c3c7256..4b7d2391bc 100644
--- a/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py
+++ b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py
@@ -291,18 +291,18 @@ def test_resources(self):
def test_span_types(self):
test_instrumentations = [
"opentelemetry.instrumentation.aiohttp-client",
- "opentelemetry.ext.dbapi",
+ "opentelemetry.instrumentation.dbapi",
"opentelemetry.instrumentation.django",
"opentelemetry.instrumentation.flask",
"opentelemetry.ext.grpc",
"opentelemetry.ext.jinja2",
- "opentelemetry.ext.mysql",
- "opentelemetry.ext.psycopg2",
- "opentelemetry.ext.pymongo",
- "opentelemetry.ext.pymysql",
- "opentelemetry.ext.redis",
+ "opentelemetry.instrumentation.mysql",
+ "opentelemetry.instrumentation.psycopg2",
+ "opentelemetry.instrumentation.pymongo",
+ "opentelemetry.instrumentation.pymysql",
+ "opentelemetry.instrumentation.redis",
"opentelemetry.instrumentation.requests",
- "opentelemetry.ext.sqlalchemy",
+ "opentelemetry.instrumentation.sqlalchemy",
"opentelemetry.instrumentation.wsgi",
]
diff --git a/ext/opentelemetry-ext-asyncpg/README.rst b/ext/opentelemetry-ext-asyncpg/README.rst
deleted file mode 100644
index f852bfdbb2..0000000000
--- a/ext/opentelemetry-ext-asyncpg/README.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-OpenTelemetry asyncpg Integration
-=================================
-
-|pypi|
-
-.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-asyncpg.svg
- :target: https://pypi.org/project/opentelemetry-ext-asyncpg/
-
-This library allows tracing PostgreSQL queries made by the
-`asyncpg `_ library.
-
-Installation
-------------
-
-::
-
- pip install opentelemetry-ext-asyncpg
-
-References
-----------
-
-* `OpenTelemetry asyncpg Integration `_
-* `OpenTelemetry Project `_
diff --git a/ext/opentelemetry-ext-dbapi/README.rst b/ext/opentelemetry-ext-dbapi/README.rst
deleted file mode 100644
index 1ff464cb48..0000000000
--- a/ext/opentelemetry-ext-dbapi/README.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-OpenTelemetry Database API integration
-======================================
-
-|pypi|
-
-.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-dbapi.svg
- :target: https://pypi.org/project/opentelemetry-ext-dbapi/
-
-Installation
-------------
-
-::
-
- pip install opentelemetry-ext-dbapi
-
-
-References
-----------
-
-* `OpenTelemetry Database API integration `_
-* `OpenTelemetry Project `_
diff --git a/ext/opentelemetry-ext-docker-tests/tests/asyncpg/test_asyncpg_functional.py b/ext/opentelemetry-ext-docker-tests/tests/asyncpg/test_asyncpg_functional.py
index d3060592a6..87382702f2 100644
--- a/ext/opentelemetry-ext-docker-tests/tests/asyncpg/test_asyncpg_functional.py
+++ b/ext/opentelemetry-ext-docker-tests/tests/asyncpg/test_asyncpg_functional.py
@@ -3,7 +3,7 @@
import asyncpg
-from opentelemetry.ext.asyncpg import AsyncPGInstrumentor
+from opentelemetry.instrumentation.asyncpg import AsyncPGInstrumentor
from opentelemetry.test.test_base import TestBase
from opentelemetry.trace.status import StatusCanonicalCode
diff --git a/ext/opentelemetry-ext-docker-tests/tests/mysql/test_mysql_functional.py b/ext/opentelemetry-ext-docker-tests/tests/mysql/test_mysql_functional.py
index d1f4c689f9..f2b07293bf 100644
--- a/ext/opentelemetry-ext-docker-tests/tests/mysql/test_mysql_functional.py
+++ b/ext/opentelemetry-ext-docker-tests/tests/mysql/test_mysql_functional.py
@@ -18,7 +18,7 @@
import mysql.connector
from opentelemetry import trace as trace_api
-from opentelemetry.ext.mysql import MySQLInstrumentor
+from opentelemetry.instrumentation.mysql import MySQLInstrumentor
from opentelemetry.test.test_base import TestBase
MYSQL_USER = os.getenv("MYSQL_USER ", "testuser")
diff --git a/ext/opentelemetry-ext-docker-tests/tests/postgres/test_psycopg_functional.py b/ext/opentelemetry-ext-docker-tests/tests/postgres/test_psycopg_functional.py
index d0bdd685f4..a8e07ddb27 100644
--- a/ext/opentelemetry-ext-docker-tests/tests/postgres/test_psycopg_functional.py
+++ b/ext/opentelemetry-ext-docker-tests/tests/postgres/test_psycopg_functional.py
@@ -18,7 +18,7 @@
import psycopg2
from opentelemetry import trace as trace_api
-from opentelemetry.ext.psycopg2 import Psycopg2Instrumentor
+from opentelemetry.instrumentation.psycopg2 import Psycopg2Instrumentor
from opentelemetry.test.test_base import TestBase
POSTGRES_HOST = os.getenv("POSTGRESQL_HOST ", "localhost")
diff --git a/ext/opentelemetry-ext-docker-tests/tests/pymongo/test_pymongo_functional.py b/ext/opentelemetry-ext-docker-tests/tests/pymongo/test_pymongo_functional.py
index f85a32d450..8c52ad0656 100644
--- a/ext/opentelemetry-ext-docker-tests/tests/pymongo/test_pymongo_functional.py
+++ b/ext/opentelemetry-ext-docker-tests/tests/pymongo/test_pymongo_functional.py
@@ -17,7 +17,7 @@
from pymongo import MongoClient
from opentelemetry import trace as trace_api
-from opentelemetry.ext.pymongo import PymongoInstrumentor
+from opentelemetry.instrumentation.pymongo import PymongoInstrumentor
from opentelemetry.test.test_base import TestBase
MONGODB_HOST = os.getenv("MONGODB_HOST ", "localhost")
diff --git a/ext/opentelemetry-ext-docker-tests/tests/pymysql/test_pymysql_functional.py b/ext/opentelemetry-ext-docker-tests/tests/pymysql/test_pymysql_functional.py
index 5b004fe18f..1636f85fba 100644
--- a/ext/opentelemetry-ext-docker-tests/tests/pymysql/test_pymysql_functional.py
+++ b/ext/opentelemetry-ext-docker-tests/tests/pymysql/test_pymysql_functional.py
@@ -17,7 +17,7 @@
import pymysql as pymy
from opentelemetry import trace as trace_api
-from opentelemetry.ext.pymysql import PyMySQLInstrumentor
+from opentelemetry.instrumentation.pymysql import PyMySQLInstrumentor
from opentelemetry.test.test_base import TestBase
MYSQL_USER = os.getenv("MYSQL_USER ", "testuser")
diff --git a/ext/opentelemetry-ext-docker-tests/tests/redis/test_redis_functional.py b/ext/opentelemetry-ext-docker-tests/tests/redis/test_redis_functional.py
index 45283c442c..7e6ea2e044 100644
--- a/ext/opentelemetry-ext-docker-tests/tests/redis/test_redis_functional.py
+++ b/ext/opentelemetry-ext-docker-tests/tests/redis/test_redis_functional.py
@@ -15,7 +15,7 @@
import redis
from opentelemetry import trace
-from opentelemetry.ext.redis import RedisInstrumentor
+from opentelemetry.instrumentation.redis import RedisInstrumentor
from opentelemetry.test.test_base import TestBase
diff --git a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/mixins.py b/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/mixins.py
index 84c6fd05f9..a438f58eb9 100644
--- a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/mixins.py
+++ b/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/mixins.py
@@ -19,8 +19,8 @@
from sqlalchemy.orm import sessionmaker
from opentelemetry import trace
-from opentelemetry.ext.sqlalchemy import SQLAlchemyInstrumentor
-from opentelemetry.ext.sqlalchemy.engine import _DB, _ROWS, _STMT
+from opentelemetry.instrumentation.sqlalchemy import SQLAlchemyInstrumentor
+from opentelemetry.instrumentation.sqlalchemy.engine import _DB, _ROWS, _STMT
from opentelemetry.test.test_base import TestBase
Base = declarative_base()
diff --git a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_instrument.py b/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_instrument.py
index 845bf26cfa..20c837c03b 100644
--- a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_instrument.py
+++ b/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_instrument.py
@@ -18,7 +18,7 @@
import sqlalchemy
from opentelemetry import trace
-from opentelemetry.ext.sqlalchemy import SQLAlchemyInstrumentor
+from opentelemetry.instrumentation.sqlalchemy import SQLAlchemyInstrumentor
from opentelemetry.test.test_base import TestBase
POSTGRES_CONFIG = {
diff --git a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_mysql.py b/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_mysql.py
index 3b8adc8c62..44c3501b1d 100644
--- a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_mysql.py
+++ b/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_mysql.py
@@ -19,7 +19,13 @@
from sqlalchemy.exc import ProgrammingError
from opentelemetry import trace
-from opentelemetry.ext.sqlalchemy.engine import _DB, _HOST, _PORT, _ROWS, _STMT
+from opentelemetry.instrumentation.sqlalchemy.engine import (
+ _DB,
+ _HOST,
+ _PORT,
+ _ROWS,
+ _STMT,
+)
from .mixins import SQLAlchemyTestMixin
diff --git a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_postgres.py b/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_postgres.py
index 125c925209..615a196f5b 100644
--- a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_postgres.py
+++ b/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_postgres.py
@@ -20,7 +20,13 @@
from sqlalchemy.exc import ProgrammingError
from opentelemetry import trace
-from opentelemetry.ext.sqlalchemy.engine import _DB, _HOST, _PORT, _ROWS, _STMT
+from opentelemetry.instrumentation.sqlalchemy.engine import (
+ _DB,
+ _HOST,
+ _PORT,
+ _ROWS,
+ _STMT,
+)
from .mixins import SQLAlchemyTestMixin
diff --git a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_sqlite.py b/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_sqlite.py
index 7d8a54368f..4295fc045c 100644
--- a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_sqlite.py
+++ b/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_sqlite.py
@@ -18,7 +18,7 @@
from sqlalchemy.exc import OperationalError
from opentelemetry import trace
-from opentelemetry.ext.sqlalchemy.engine import _DB, _ROWS, _STMT
+from opentelemetry.instrumentation.sqlalchemy.engine import _DB, _ROWS, _STMT
from .mixins import SQLAlchemyTestMixin
diff --git a/ext/opentelemetry-ext-mysql/README.rst b/ext/opentelemetry-ext-mysql/README.rst
deleted file mode 100644
index 0a8577e867..0000000000
--- a/ext/opentelemetry-ext-mysql/README.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-OpenTelemetry MySQL Integration
-===============================
-
-|pypi|
-
-.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-mysql.svg
- :target: https://pypi.org/project/opentelemetry-ext-mysql/
-
-Integration with MySQL that supports the mysql-connector library and is
-specified to trace_integration using 'MySQL'.
-
-
-Installation
-------------
-
-::
-
- pip install opentelemetry-ext-mysql
-
-
-References
-----------
-* `OpenTelemetry MySQL Integration `_
-* `OpenTelemetry Project `_
-
diff --git a/ext/opentelemetry-ext-psycopg2/README.rst b/ext/opentelemetry-ext-psycopg2/README.rst
deleted file mode 100644
index 18cee0c2b2..0000000000
--- a/ext/opentelemetry-ext-psycopg2/README.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-OpenTelemetry Psycopg Integration
-=================================
-
-|pypi|
-
-.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-psycopg2.svg
- :target: https://pypi.org/project/opentelemetry-ext-psycopg2/
-
-Installation
-------------
-
-::
-
- pip install opentelemetry-ext-psycopg2
-
-
-References
-----------
-* `OpenTelemetry Psycopg Integration `_
-* `OpenTelemetry Project `_
diff --git a/ext/opentelemetry-ext-pymemcache/CHANGELOG.md b/ext/opentelemetry-ext-pymemcache/CHANGELOG.md
deleted file mode 100644
index 7425aa5e1e..0000000000
--- a/ext/opentelemetry-ext-pymemcache/CHANGELOG.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Changelog
-
-## Unreleased
-
-## Version 0.10b0
-
-Released 2020-06-23
-
-- Initial release
\ No newline at end of file
diff --git a/ext/opentelemetry-ext-pymemcache/README.rst b/ext/opentelemetry-ext-pymemcache/README.rst
deleted file mode 100644
index 6328ff5f01..0000000000
--- a/ext/opentelemetry-ext-pymemcache/README.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-OpenTelemetry pymemcache Integration
-====================================
-
-|pypi|
-
-.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-pymemcache.svg
- :target: https://pypi.org/project/opentelemetry-ext-pymemcache/
-
-Installation
-------------
-
-::
-
- pip install opentelemetry-ext-pymemcache
-
-
-References
-----------
-* `OpenTelemetry Pymemcache Integration `_
-* `OpenTelemetry Project `_
diff --git a/ext/opentelemetry-ext-pymongo/README.rst b/ext/opentelemetry-ext-pymongo/README.rst
deleted file mode 100644
index ada56efed9..0000000000
--- a/ext/opentelemetry-ext-pymongo/README.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-OpenTelemetry pymongo Integration
-=================================
-
-|pypi|
-
-.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-pymongo.svg
- :target: https://pypi.org/project/opentelemetry-ext-pymongo/
-
-Installation
-------------
-
-::
-
- pip install opentelemetry-ext-pymongo
-
-
-References
-----------
-* `OpenTelemetry pymongo Integration `_
-* `OpenTelemetry Project `_
-
diff --git a/ext/opentelemetry-ext-pymongo/setup.py b/ext/opentelemetry-ext-pymongo/setup.py
deleted file mode 100644
index 301aded338..0000000000
--- a/ext/opentelemetry-ext-pymongo/setup.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The OpenTelemetry Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import os
-
-import setuptools
-
-BASE_DIR = os.path.dirname(__file__)
-VERSION_FILENAME = os.path.join(
- BASE_DIR, "src", "opentelemetry", "ext", "pymongo", "version.py"
-)
-PACKAGE_INFO = {}
-with open(VERSION_FILENAME) as f:
- exec(f.read(), PACKAGE_INFO)
-
-setuptools.setup(version=PACKAGE_INFO["__version__"])
diff --git a/ext/opentelemetry-ext-pymysql/CHANGELOG.md b/ext/opentelemetry-ext-pymysql/CHANGELOG.md
deleted file mode 100644
index 654146fece..0000000000
--- a/ext/opentelemetry-ext-pymysql/CHANGELOG.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Changelog
-
-## Unreleased
-
-## 0.7b1
-
-Released 2020-05-12
-
-- Initial release
\ No newline at end of file
diff --git a/ext/opentelemetry-ext-pymysql/README.rst b/ext/opentelemetry-ext-pymysql/README.rst
deleted file mode 100644
index 455d8fa7bd..0000000000
--- a/ext/opentelemetry-ext-pymysql/README.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-OpenTelemetry PyMySQL integration
-=================================
-
-|pypi|
-
-.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-pymysql.svg
- :target: https://pypi.org/project/opentelemetry-ext-pymysql/
-
-Installation
-------------
-
-::
-
- pip install opentelemetry-ext-pymysql
-
-
-References
-----------
-* `OpenTelemetry PyMySQL Integration `_
-* `OpenTelemetry Project `_
diff --git a/ext/opentelemetry-ext-pymysql/setup.py b/ext/opentelemetry-ext-pymysql/setup.py
deleted file mode 100644
index a3f057b310..0000000000
--- a/ext/opentelemetry-ext-pymysql/setup.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The OpenTelemetry Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import os
-
-import setuptools
-
-BASE_DIR = os.path.dirname(__file__)
-VERSION_FILENAME = os.path.join(
- BASE_DIR, "src", "opentelemetry", "ext", "pymysql", "version.py"
-)
-PACKAGE_INFO = {}
-with open(VERSION_FILENAME) as f:
- exec(f.read(), PACKAGE_INFO)
-
-setuptools.setup(version=PACKAGE_INFO["__version__"])
diff --git a/ext/opentelemetry-ext-redis/CHANGELOG.md b/ext/opentelemetry-ext-redis/CHANGELOG.md
deleted file mode 100644
index 654146fece..0000000000
--- a/ext/opentelemetry-ext-redis/CHANGELOG.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Changelog
-
-## Unreleased
-
-## 0.7b1
-
-Released 2020-05-12
-
-- Initial release
\ No newline at end of file
diff --git a/ext/opentelemetry-ext-redis/README.rst b/ext/opentelemetry-ext-redis/README.rst
deleted file mode 100644
index 49cc95f6b1..0000000000
--- a/ext/opentelemetry-ext-redis/README.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-OpenTelemetry Redis Instrumentation
-===================================
-
-|pypi|
-
-.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-redis.svg
- :target: https://pypi.org/project/opentelemetry-ext-redis/
-
-This library allows tracing requests made by the Redis library.
-
-Installation
-------------
-
-::
-
- pip install opentelemetry-ext-redis
-
-
-References
-----------
-
-* `OpenTelemetry Redis Instrumentation `_
-* `OpenTelemetry Project `_
diff --git a/ext/opentelemetry-ext-redis/setup.py b/ext/opentelemetry-ext-redis/setup.py
deleted file mode 100644
index d09847efd8..0000000000
--- a/ext/opentelemetry-ext-redis/setup.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The OpenTelemetry Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import os
-
-import setuptools
-
-BASE_DIR = os.path.dirname(__file__)
-VERSION_FILENAME = os.path.join(
- BASE_DIR, "src", "opentelemetry", "ext", "redis", "version.py"
-)
-PACKAGE_INFO = {}
-with open(VERSION_FILENAME) as f:
- exec(f.read(), PACKAGE_INFO)
-
-setuptools.setup(version=PACKAGE_INFO["__version__"])
diff --git a/ext/opentelemetry-ext-sqlalchemy/CHANGELOG.md b/ext/opentelemetry-ext-sqlalchemy/CHANGELOG.md
deleted file mode 100644
index 654146fece..0000000000
--- a/ext/opentelemetry-ext-sqlalchemy/CHANGELOG.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Changelog
-
-## Unreleased
-
-## 0.7b1
-
-Released 2020-05-12
-
-- Initial release
\ No newline at end of file
diff --git a/ext/opentelemetry-ext-sqlalchemy/README.rst b/ext/opentelemetry-ext-sqlalchemy/README.rst
deleted file mode 100644
index 2485c96a58..0000000000
--- a/ext/opentelemetry-ext-sqlalchemy/README.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-OpenTelemetry SQLAlchemy Tracing
-================================
-
-|pypi|
-
-.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-sqlalchemy.svg
- :target: https://pypi.org/project/opentelemetry-ext-sqlalchemy/
-
-This library allows tracing requests made by the SQLAlchemy library.
-
-Installation
-------------
-
-::
-
- pip install opentelemetry-ext-sqlalchemy
-
-
-References
-----------
-
-* `SQLAlchemy Project `_
-* `OpenTelemetry SQLAlchemy Tracing `_
-* `OpenTelemetry Project `_
\ No newline at end of file
diff --git a/ext/opentelemetry-ext-sqlalchemy/setup.py b/ext/opentelemetry-ext-sqlalchemy/setup.py
deleted file mode 100644
index d776a90e82..0000000000
--- a/ext/opentelemetry-ext-sqlalchemy/setup.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The OpenTelemetry Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import os
-
-import setuptools
-
-BASE_DIR = os.path.dirname(__file__)
-VERSION_FILENAME = os.path.join(
- BASE_DIR, "src", "opentelemetry", "ext", "sqlalchemy", "version.py",
-)
-PACKAGE_INFO = {}
-with open(VERSION_FILENAME) as f:
- exec(f.read(), PACKAGE_INFO)
-
-setuptools.setup(version=PACKAGE_INFO["__version__"])
diff --git a/ext/opentelemetry-ext-sqlite3/CHANGELOG.md b/ext/opentelemetry-ext-sqlite3/CHANGELOG.md
deleted file mode 100644
index c2ac2d3e02..0000000000
--- a/ext/opentelemetry-ext-sqlite3/CHANGELOG.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Changelog
-
-## Unreleased
-
-## 0.8b0
-
-Released 2020-05-27
-
-- Initial release
\ No newline at end of file
diff --git a/ext/opentelemetry-ext-sqlite3/README.rst b/ext/opentelemetry-ext-sqlite3/README.rst
deleted file mode 100644
index 3620434b20..0000000000
--- a/ext/opentelemetry-ext-sqlite3/README.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-OpenTelemetry SQLite3 Integration
-=================================
-
-|pypi|
-
-.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-sqlite3.svg
- :target: https://pypi.org/project/opentelemetry-ext-sqlite3/
-
-Installation
-------------
-
-::
-
- pip install opentelemetry-ext-sqlite3
-
-
-References
-----------
-* `OpenTelemetry SQLite3 Integration `_
-* `OpenTelemetry Project `_
-
diff --git a/ext/opentelemetry-ext-sqlite3/setup.py b/ext/opentelemetry-ext-sqlite3/setup.py
deleted file mode 100644
index dd89f058db..0000000000
--- a/ext/opentelemetry-ext-sqlite3/setup.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The OpenTelemetry Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import os
-
-import setuptools
-
-BASE_DIR = os.path.dirname(__file__)
-VERSION_FILENAME = os.path.join(
- BASE_DIR, "src", "opentelemetry", "ext", "sqlite3", "version.py"
-)
-PACKAGE_INFO = {}
-with open(VERSION_FILENAME) as f:
- exec(f.read(), PACKAGE_INFO)
-
-setuptools.setup(version=PACKAGE_INFO["__version__"])
diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg
index bd9a06c524..58c9b38496 100644
--- a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg
+++ b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg
@@ -40,7 +40,7 @@ package_dir=
packages=find_namespace:
install_requires =
opentelemetry-api == 0.12.dev0
- opentelemetry-ext-dbapi == 0.12.dev0
+ opentelemetry-instrumentation-dbapi == 0.12.dev0
opentelemetry-instrumentation == 0.12.dev0
aiopg >= 0.13.0
wrapt >= 1.0.0, < 2.0.0
diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py b/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py
index def4a72c3d..b6992120f3 100644
--- a/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py
+++ b/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py
@@ -3,7 +3,10 @@
import wrapt
from aiopg.utils import _ContextManager, _PoolAcquireContextManager
-from opentelemetry.ext.dbapi import DatabaseApiIntegration, TracedCursor
+from opentelemetry.instrumentation.dbapi import (
+ DatabaseApiIntegration,
+ TracedCursor,
+)
from opentelemetry.trace import SpanKind
from opentelemetry.trace.status import Status, StatusCanonicalCode
diff --git a/ext/opentelemetry-ext-asyncpg/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-asyncpg/CHANGELOG.md
similarity index 69%
rename from ext/opentelemetry-ext-asyncpg/CHANGELOG.md
rename to instrumentation/opentelemetry-instrumentation-asyncpg/CHANGELOG.md
index 2dc9ad6f04..08464e8cd9 100644
--- a/ext/opentelemetry-ext-asyncpg/CHANGELOG.md
+++ b/instrumentation/opentelemetry-instrumentation-asyncpg/CHANGELOG.md
@@ -2,6 +2,9 @@
## Unreleased
+- Change package name to opentelemetry-instrumentation-asyncpg
+ ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999))
+
## Version 0.11b0
Released 2020-07-28
diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/README.rst b/instrumentation/opentelemetry-instrumentation-asyncpg/README.rst
new file mode 100644
index 0000000000..33c60852cd
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-asyncpg/README.rst
@@ -0,0 +1,23 @@
+OpenTelemetry asyncpg Instrumentation
+=====================================
+
+|pypi|
+
+.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-asyncpg.svg
+ :target: https://pypi.org/project/opentelemetry-instrumentation-asyncpg/
+
+This library allows tracing PostgreSQL queries made by the
+`asyncpg `_ library.
+
+Installation
+------------
+
+::
+
+ pip install opentelemetry-instrumentation-asyncpg
+
+References
+----------
+
+* `OpenTelemetry asyncpg Instrumentation `_
+* `OpenTelemetry Project `_
diff --git a/ext/opentelemetry-ext-asyncpg/setup.cfg b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg
similarity index 87%
rename from ext/opentelemetry-ext-asyncpg/setup.cfg
rename to instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg
index bf1670172b..1cc707df1c 100644
--- a/ext/opentelemetry-ext-asyncpg/setup.cfg
+++ b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg
@@ -13,13 +13,13 @@
# limitations under the License.
#
[metadata]
-name = opentelemetry-ext-asyncpg
+name = opentelemetry-instrumentation-asyncpg
description = OpenTelemetry instrumentation for AsyncPG
long_description = file: README.rst
long_description_content_type = text/x-rst
author = OpenTelemetry Authors
author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/ext/opentelemetry-ext-asyncpg
+url = https://github.com/open-telemetry/opentelemetry-python/instrumentation/opentelemetry-instrumentation-asyncpg
platforms = any
license = Apache-2.0
classifiers =
@@ -52,4 +52,4 @@ where = src
[options.entry_points]
opentelemetry_instrumentor =
- asyncpg = opentelemetry.ext.asyncpg:AsyncPGInstrumentor
+ asyncpg = opentelemetry.instrumentation.asyncpg:AsyncPGInstrumentor
diff --git a/ext/opentelemetry-ext-dbapi/setup.py b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.py
similarity index 89%
rename from ext/opentelemetry-ext-dbapi/setup.py
rename to instrumentation/opentelemetry-instrumentation-asyncpg/setup.py
index f5c1b3fa81..2ad47ac9d9 100644
--- a/ext/opentelemetry-ext-dbapi/setup.py
+++ b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.py
@@ -17,7 +17,12 @@
BASE_DIR = os.path.dirname(__file__)
VERSION_FILENAME = os.path.join(
- BASE_DIR, "src", "opentelemetry", "ext", "dbapi", "version.py"
+ BASE_DIR,
+ "src",
+ "opentelemetry",
+ "instrumentation",
+ "asyncpg",
+ "version.py",
)
PACKAGE_INFO = {}
with open(VERSION_FILENAME) as f:
diff --git a/ext/opentelemetry-ext-asyncpg/src/opentelemetry/ext/asyncpg/__init__.py b/instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/__init__.py
similarity index 96%
rename from ext/opentelemetry-ext-asyncpg/src/opentelemetry/ext/asyncpg/__init__.py
rename to instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/__init__.py
index 4a3a51ac08..189809809d 100644
--- a/ext/opentelemetry-ext-asyncpg/src/opentelemetry/ext/asyncpg/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/__init__.py
@@ -22,7 +22,7 @@
.. code-block:: python
import asyncpg
- from opentelemetry.ext.asyncpg import AsyncPGInstrumentor
+ from opentelemetry.instrumentation.asyncpg import AsyncPGInstrumentor
# You can optionally pass a custom TracerProvider to AsyncPGInstrumentor.instrument()
AsyncPGInstrumentor().instrument()
@@ -39,7 +39,7 @@
from asyncpg import exceptions
from opentelemetry import trace
-from opentelemetry.ext.asyncpg.version import __version__
+from opentelemetry.instrumentation.asyncpg.version import __version__
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
from opentelemetry.instrumentation.utils import unwrap
from opentelemetry.trace import SpanKind
diff --git a/ext/opentelemetry-ext-asyncpg/src/opentelemetry/ext/asyncpg/version.py b/instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py
similarity index 100%
rename from ext/opentelemetry-ext-asyncpg/src/opentelemetry/ext/asyncpg/version.py
rename to instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py
diff --git a/ext/opentelemetry-ext-asyncpg/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-asyncpg/tests/__init__.py
similarity index 100%
rename from ext/opentelemetry-ext-asyncpg/tests/__init__.py
rename to instrumentation/opentelemetry-instrumentation-asyncpg/tests/__init__.py
diff --git a/ext/opentelemetry-ext-asyncpg/tests/test_asyncpg_wrapper.py b/instrumentation/opentelemetry-instrumentation-asyncpg/tests/test_asyncpg_wrapper.py
similarity index 94%
rename from ext/opentelemetry-ext-asyncpg/tests/test_asyncpg_wrapper.py
rename to instrumentation/opentelemetry-instrumentation-asyncpg/tests/test_asyncpg_wrapper.py
index cd0d8e35f0..33b121ce53 100644
--- a/ext/opentelemetry-ext-asyncpg/tests/test_asyncpg_wrapper.py
+++ b/instrumentation/opentelemetry-instrumentation-asyncpg/tests/test_asyncpg_wrapper.py
@@ -1,7 +1,7 @@
import asyncpg
from asyncpg import Connection
-from opentelemetry.ext.asyncpg import AsyncPGInstrumentor
+from opentelemetry.instrumentation.asyncpg import AsyncPGInstrumentor
from opentelemetry.test.test_base import TestBase
diff --git a/ext/opentelemetry-ext-dbapi/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-dbapi/CHANGELOG.md
similarity index 63%
rename from ext/opentelemetry-ext-dbapi/CHANGELOG.md
rename to instrumentation/opentelemetry-instrumentation-dbapi/CHANGELOG.md
index 288334d6ba..c0a38d855f 100644
--- a/ext/opentelemetry-ext-dbapi/CHANGELOG.md
+++ b/instrumentation/opentelemetry-instrumentation-dbapi/CHANGELOG.md
@@ -2,6 +2,9 @@
## Unreleased
+- Change package name to opentelemetry-instrumentation-dbapi
+ ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999))
+
## 0.7b1
Released 2020-05-12
diff --git a/ext/opentelemetry-ext-dbapi/LICENSE b/instrumentation/opentelemetry-instrumentation-dbapi/LICENSE
similarity index 100%
rename from ext/opentelemetry-ext-dbapi/LICENSE
rename to instrumentation/opentelemetry-instrumentation-dbapi/LICENSE
diff --git a/ext/opentelemetry-ext-dbapi/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-dbapi/MANIFEST.in
similarity index 100%
rename from ext/opentelemetry-ext-dbapi/MANIFEST.in
rename to instrumentation/opentelemetry-instrumentation-dbapi/MANIFEST.in
diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/README.rst b/instrumentation/opentelemetry-instrumentation-dbapi/README.rst
new file mode 100644
index 0000000000..5137a1c1ff
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-dbapi/README.rst
@@ -0,0 +1,21 @@
+OpenTelemetry Database API instrumentation
+==========================================
+
+|pypi|
+
+.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-dbapi.svg
+ :target: https://pypi.org/project/opentelemetry-instrumentation-dbapi/
+
+Installation
+------------
+
+::
+
+ pip install opentelemetry-instrumentation-dbapi
+
+
+References
+----------
+
+* `OpenTelemetry Database API Instrumentation `_
+* `OpenTelemetry Project `_
diff --git a/ext/opentelemetry-ext-dbapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg
similarity index 90%
rename from ext/opentelemetry-ext-dbapi/setup.cfg
rename to instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg
index 34542525dd..29044f3ba6 100644
--- a/ext/opentelemetry-ext-dbapi/setup.cfg
+++ b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg
@@ -13,13 +13,13 @@
# limitations under the License.
#
[metadata]
-name = opentelemetry-ext-dbapi
-description = OpenTelemetry Database API integration
+name = opentelemetry-instrumentation-dbapi
+description = OpenTelemetry Database API instrumentation
long_description = file: README.rst
long_description_content_type = text/x-rst
author = OpenTelemetry Authors
author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-dbapi
+url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-dbapi
platforms = any
license = Apache-2.0
classifiers =
diff --git a/ext/opentelemetry-ext-psycopg2/setup.py b/instrumentation/opentelemetry-instrumentation-dbapi/setup.py
similarity index 91%
rename from ext/opentelemetry-ext-psycopg2/setup.py
rename to instrumentation/opentelemetry-instrumentation-dbapi/setup.py
index df7f7c2128..cfe98f3895 100644
--- a/ext/opentelemetry-ext-psycopg2/setup.py
+++ b/instrumentation/opentelemetry-instrumentation-dbapi/setup.py
@@ -17,7 +17,7 @@
BASE_DIR = os.path.dirname(__file__)
VERSION_FILENAME = os.path.join(
- BASE_DIR, "src", "opentelemetry", "ext", "psycopg2", "version.py"
+ BASE_DIR, "src", "opentelemetry", "instrumentation", "dbapi", "version.py"
)
PACKAGE_INFO = {}
with open(VERSION_FILENAME) as f:
diff --git a/ext/opentelemetry-ext-dbapi/src/opentelemetry/ext/dbapi/__init__.py b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py
similarity index 98%
rename from ext/opentelemetry-ext-dbapi/src/opentelemetry/ext/dbapi/__init__.py
rename to instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py
index 3838dc1b15..035c823bcf 100644
--- a/ext/opentelemetry-ext-dbapi/src/opentelemetry/ext/dbapi/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py
@@ -26,7 +26,7 @@
import pyodbc
from opentelemetry import trace
- from opentelemetry.ext.dbapi import trace_integration
+ from opentelemetry.instrumentation.dbapi import trace_integration
from opentelemetry.trace import TracerProvider
trace.set_tracer_provider(TracerProvider())
@@ -47,7 +47,7 @@
import wrapt
from opentelemetry import trace as trace_api
-from opentelemetry.ext.dbapi.version import __version__
+from opentelemetry.instrumentation.dbapi.version import __version__
from opentelemetry.instrumentation.utils import unwrap
from opentelemetry.trace import SpanKind, TracerProvider, get_tracer
from opentelemetry.trace.status import Status, StatusCanonicalCode
diff --git a/ext/opentelemetry-ext-dbapi/src/opentelemetry/ext/dbapi/version.py b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py
similarity index 100%
rename from ext/opentelemetry-ext-dbapi/src/opentelemetry/ext/dbapi/version.py
rename to instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py
diff --git a/ext/opentelemetry-ext-dbapi/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-dbapi/tests/__init__.py
similarity index 100%
rename from ext/opentelemetry-ext-dbapi/tests/__init__.py
rename to instrumentation/opentelemetry-instrumentation-dbapi/tests/__init__.py
diff --git a/ext/opentelemetry-ext-dbapi/tests/test_dbapi_integration.py b/instrumentation/opentelemetry-instrumentation-dbapi/tests/test_dbapi_integration.py
similarity index 97%
rename from ext/opentelemetry-ext-dbapi/tests/test_dbapi_integration.py
rename to instrumentation/opentelemetry-instrumentation-dbapi/tests/test_dbapi_integration.py
index a2ba9f7d89..2991570333 100644
--- a/ext/opentelemetry-ext-dbapi/tests/test_dbapi_integration.py
+++ b/instrumentation/opentelemetry-instrumentation-dbapi/tests/test_dbapi_integration.py
@@ -17,7 +17,7 @@
from unittest import mock
from opentelemetry import trace as trace_api
-from opentelemetry.ext import dbapi
+from opentelemetry.instrumentation import dbapi
from opentelemetry.test.test_base import TestBase
@@ -120,14 +120,14 @@ def test_callproc(self):
span.attributes["db.statement"], "Test stored procedure"
)
- @mock.patch("opentelemetry.ext.dbapi")
+ @mock.patch("opentelemetry.instrumentation.dbapi")
def test_wrap_connect(self, mock_dbapi):
dbapi.wrap_connect(self.tracer, mock_dbapi, "connect", "-")
connection = mock_dbapi.connect()
self.assertEqual(mock_dbapi.connect.call_count, 1)
self.assertIsInstance(connection.__wrapped__, mock.Mock)
- @mock.patch("opentelemetry.ext.dbapi")
+ @mock.patch("opentelemetry.instrumentation.dbapi")
def test_unwrap_connect(self, mock_dbapi):
dbapi.wrap_connect(self.tracer, mock_dbapi, "connect", "-")
connection = mock_dbapi.connect()
diff --git a/ext/opentelemetry-ext-mysql/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-mysql/CHANGELOG.md
similarity index 73%
rename from ext/opentelemetry-ext-mysql/CHANGELOG.md
rename to instrumentation/opentelemetry-instrumentation-mysql/CHANGELOG.md
index 46b9d327dd..434a612abc 100644
--- a/ext/opentelemetry-ext-mysql/CHANGELOG.md
+++ b/instrumentation/opentelemetry-instrumentation-mysql/CHANGELOG.md
@@ -2,6 +2,9 @@
## Unreleased
+- Change package name to opentelemetry-instrumentation-mysql
+ ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999))
+
## Version 0.11b0
Released 2020-07-28
diff --git a/ext/opentelemetry-ext-mysql/LICENSE b/instrumentation/opentelemetry-instrumentation-mysql/LICENSE
similarity index 100%
rename from ext/opentelemetry-ext-mysql/LICENSE
rename to instrumentation/opentelemetry-instrumentation-mysql/LICENSE
diff --git a/ext/opentelemetry-ext-mysql/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-mysql/MANIFEST.in
similarity index 100%
rename from ext/opentelemetry-ext-mysql/MANIFEST.in
rename to instrumentation/opentelemetry-instrumentation-mysql/MANIFEST.in
diff --git a/instrumentation/opentelemetry-instrumentation-mysql/README.rst b/instrumentation/opentelemetry-instrumentation-mysql/README.rst
new file mode 100644
index 0000000000..9558f64bd9
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-mysql/README.rst
@@ -0,0 +1,25 @@
+OpenTelemetry MySQL Instrumentation
+===================================
+
+|pypi|
+
+.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-mysql.svg
+ :target: https://pypi.org/project/opentelemetry-instrumentation-mysql/
+
+Instrumentation with MySQL that supports the mysql-connector library and is
+specified to trace_integration using 'MySQL'.
+
+
+Installation
+------------
+
+::
+
+ pip install opentelemetry-instrumentation-mysql
+
+
+References
+----------
+* `OpenTelemetry MySQL Instrumentation `_
+* `OpenTelemetry Project `_
+
diff --git a/ext/opentelemetry-ext-mysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg
similarity index 86%
rename from ext/opentelemetry-ext-mysql/setup.cfg
rename to instrumentation/opentelemetry-instrumentation-mysql/setup.cfg
index e114ae1dbe..2242709dab 100644
--- a/ext/opentelemetry-ext-mysql/setup.cfg
+++ b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg
@@ -13,13 +13,13 @@
# limitations under the License.
#
[metadata]
-name = opentelemetry-ext-mysql
-description = OpenTelemetry MySQL integration
+name = opentelemetry-instrumentation-mysql
+description = OpenTelemetry MySQL instrumentation
long_description = file: README.rst
long_description_content_type = text/x-rst
author = OpenTelemetry Authors
author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-mysql
+url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-mysql
platforms = any
license = Apache-2.0
classifiers =
@@ -41,7 +41,7 @@ package_dir=
packages=find_namespace:
install_requires =
opentelemetry-api == 0.12.dev0
- opentelemetry-ext-dbapi == 0.12.dev0
+ opentelemetry-instrumentation-dbapi == 0.12.dev0
opentelemetry-instrumentation == 0.12.dev0
mysql-connector-python ~= 8.0
wrapt >= 1.0.0, < 2.0.0
@@ -55,4 +55,4 @@ where = src
[options.entry_points]
opentelemetry_instrumentor =
- mysql = opentelemetry.ext.mysql:MySQLInstrumentor
+ mysql = opentelemetry.instrumentation.mysql:MySQLInstrumentor
diff --git a/ext/opentelemetry-ext-mysql/setup.py b/instrumentation/opentelemetry-instrumentation-mysql/setup.py
similarity index 91%
rename from ext/opentelemetry-ext-mysql/setup.py
rename to instrumentation/opentelemetry-instrumentation-mysql/setup.py
index 4ba48fb404..955f75d71e 100644
--- a/ext/opentelemetry-ext-mysql/setup.py
+++ b/instrumentation/opentelemetry-instrumentation-mysql/setup.py
@@ -17,7 +17,7 @@
BASE_DIR = os.path.dirname(__file__)
VERSION_FILENAME = os.path.join(
- BASE_DIR, "src", "opentelemetry", "ext", "mysql", "version.py"
+ BASE_DIR, "src", "opentelemetry", "instrumentation", "mysql", "version.py"
)
PACKAGE_INFO = {}
with open(VERSION_FILENAME) as f:
diff --git a/ext/opentelemetry-ext-mysql/src/opentelemetry/ext/mysql/__init__.py b/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/__init__.py
similarity index 94%
rename from ext/opentelemetry-ext-mysql/src/opentelemetry/ext/mysql/__init__.py
rename to instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/__init__.py
index 883a0aa9bb..1cbd240cc5 100644
--- a/ext/opentelemetry-ext-mysql/src/opentelemetry/ext/mysql/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/__init__.py
@@ -26,7 +26,7 @@
import mysql.connector
from opentelemetry import trace
from opentelemetry.trace import TracerProvider
- from opentelemetry.ext.mysql import MySQLInstrumentor
+ from opentelemetry.instrumentation.mysql import MySQLInstrumentor
trace.set_tracer_provider(TracerProvider())
@@ -44,9 +44,9 @@
import mysql.connector
-from opentelemetry.ext import dbapi
-from opentelemetry.ext.mysql.version import __version__
+from opentelemetry.instrumentation import dbapi
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.mysql.version import __version__
from opentelemetry.trace import get_tracer
diff --git a/ext/opentelemetry-ext-mysql/src/opentelemetry/ext/mysql/version.py b/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/version.py
similarity index 100%
rename from ext/opentelemetry-ext-mysql/src/opentelemetry/ext/mysql/version.py
rename to instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/version.py
diff --git a/ext/opentelemetry-ext-mysql/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-mysql/tests/__init__.py
similarity index 100%
rename from ext/opentelemetry-ext-mysql/tests/__init__.py
rename to instrumentation/opentelemetry-instrumentation-mysql/tests/__init__.py
diff --git a/ext/opentelemetry-ext-mysql/tests/test_mysql_integration.py b/instrumentation/opentelemetry-instrumentation-mysql/tests/test_mysql_integration.py
similarity index 94%
rename from ext/opentelemetry-ext-mysql/tests/test_mysql_integration.py
rename to instrumentation/opentelemetry-instrumentation-mysql/tests/test_mysql_integration.py
index 6a86ef8927..6c114d969f 100644
--- a/ext/opentelemetry-ext-mysql/tests/test_mysql_integration.py
+++ b/instrumentation/opentelemetry-instrumentation-mysql/tests/test_mysql_integration.py
@@ -16,8 +16,8 @@
import mysql.connector
-import opentelemetry.ext.mysql
-from opentelemetry.ext.mysql import MySQLInstrumentor
+import opentelemetry.instrumentation.mysql
+from opentelemetry.instrumentation.mysql import MySQLInstrumentor
from opentelemetry.sdk import resources
from opentelemetry.test.test_base import TestBase
@@ -43,7 +43,9 @@ def test_instrumentor(self, mock_connect):
span = spans_list[0]
# Check version and name in span's instrumentation info
- self.check_span_instrumentation_info(span, opentelemetry.ext.mysql)
+ self.check_span_instrumentation_info(
+ span, opentelemetry.instrumentation.mysql
+ )
# check that no spans are generated after uninstrumen
MySQLInstrumentor().uninstrument()
diff --git a/ext/opentelemetry-ext-psycopg2/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-psycopg2/CHANGELOG.md
similarity index 63%
rename from ext/opentelemetry-ext-psycopg2/CHANGELOG.md
rename to instrumentation/opentelemetry-instrumentation-psycopg2/CHANGELOG.md
index 2106b42550..c997f23945 100644
--- a/ext/opentelemetry-ext-psycopg2/CHANGELOG.md
+++ b/instrumentation/opentelemetry-instrumentation-psycopg2/CHANGELOG.md
@@ -2,6 +2,9 @@
## Unreleased
+- Change package name to opentelemetry-instrumentation-psycopg2
+ ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999))
+
## 0.8b0
Released 2020-05-27
diff --git a/ext/opentelemetry-ext-psycopg2/LICENSE b/instrumentation/opentelemetry-instrumentation-psycopg2/LICENSE
similarity index 100%
rename from ext/opentelemetry-ext-psycopg2/LICENSE
rename to instrumentation/opentelemetry-instrumentation-psycopg2/LICENSE
diff --git a/ext/opentelemetry-ext-psycopg2/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-psycopg2/MANIFEST.in
similarity index 100%
rename from ext/opentelemetry-ext-psycopg2/MANIFEST.in
rename to instrumentation/opentelemetry-instrumentation-psycopg2/MANIFEST.in
diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/README.rst b/instrumentation/opentelemetry-instrumentation-psycopg2/README.rst
new file mode 100644
index 0000000000..3ab1025eae
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-psycopg2/README.rst
@@ -0,0 +1,20 @@
+OpenTelemetry Psycopg Instrumentation
+=====================================
+
+|pypi|
+
+.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-psycopg2.svg
+ :target: https://pypi.org/project/opentelemetry-instrumentation-psycopg2/
+
+Installation
+------------
+
+::
+
+ pip install opentelemetry-instrumentation-psycopg2
+
+
+References
+----------
+* `OpenTelemetry Psycopg Instrumentation `_
+* `OpenTelemetry Project `_
diff --git a/ext/opentelemetry-ext-psycopg2/setup.cfg b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg
similarity index 85%
rename from ext/opentelemetry-ext-psycopg2/setup.cfg
rename to instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg
index 73d541cad6..c20693a96c 100644
--- a/ext/opentelemetry-ext-psycopg2/setup.cfg
+++ b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg
@@ -13,13 +13,13 @@
# limitations under the License.
#
[metadata]
-name = opentelemetry-ext-psycopg2
-description = OpenTelemetry psycopg2 integration
+name = opentelemetry-instrumentation-psycopg2
+description = OpenTelemetry psycopg2 instrumentation
long_description = file: README.rst
long_description_content_type = text/x-rst
author = OpenTelemetry Authors
author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-psycopg2
+url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-psycopg2
platforms = any
license = Apache-2.0
classifiers =
@@ -41,7 +41,7 @@ package_dir=
packages=find_namespace:
install_requires =
opentelemetry-api == 0.12.dev0
- opentelemetry-ext-dbapi == 0.12.dev0
+ opentelemetry-instrumentation-dbapi == 0.12.dev0
opentelemetry-instrumentation == 0.12.dev0
psycopg2-binary >= 2.7.3.1
wrapt >= 1.0.0, < 2.0.0
@@ -55,4 +55,4 @@ where = src
[options.entry_points]
opentelemetry_instrumentor =
- psycopg2 = opentelemetry.ext.psycopg2:Psycopg2Instrumentor
+ psycopg2 = opentelemetry.instrumentation.psycopg2:Psycopg2Instrumentor
diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.py b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.py
new file mode 100644
index 0000000000..4bd0e16be5
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.py
@@ -0,0 +1,31 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import os
+
+import setuptools
+
+BASE_DIR = os.path.dirname(__file__)
+VERSION_FILENAME = os.path.join(
+ BASE_DIR,
+ "src",
+ "opentelemetry",
+ "instrumentation",
+ "psycopg2",
+ "version.py",
+)
+PACKAGE_INFO = {}
+with open(VERSION_FILENAME) as f:
+ exec(f.read(), PACKAGE_INFO)
+
+setuptools.setup(version=PACKAGE_INFO["__version__"])
diff --git a/ext/opentelemetry-ext-psycopg2/src/opentelemetry/ext/psycopg2/__init__.py b/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/__init__.py
similarity index 94%
rename from ext/opentelemetry-ext-psycopg2/src/opentelemetry/ext/psycopg2/__init__.py
rename to instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/__init__.py
index ec6c4c82ad..7782f6fe63 100644
--- a/ext/opentelemetry-ext-psycopg2/src/opentelemetry/ext/psycopg2/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/__init__.py
@@ -26,7 +26,7 @@
import psycopg2
from opentelemetry import trace
from opentelemetry.sdk.trace import TracerProvider
- from opentelemetry.ext.psycopg2 import Psycopg2Instrumentor
+ from opentelemetry.instrumentation.psycopg2 import Psycopg2Instrumentor
trace.set_tracer_provider(TracerProvider())
@@ -44,9 +44,9 @@
import psycopg2
-from opentelemetry.ext import dbapi
-from opentelemetry.ext.psycopg2.version import __version__
+from opentelemetry.instrumentation import dbapi
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.psycopg2.version import __version__
from opentelemetry.trace import get_tracer
diff --git a/ext/opentelemetry-ext-psycopg2/src/opentelemetry/ext/psycopg2/version.py b/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/version.py
similarity index 100%
rename from ext/opentelemetry-ext-psycopg2/src/opentelemetry/ext/psycopg2/version.py
rename to instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/version.py
diff --git a/ext/opentelemetry-ext-psycopg2/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-psycopg2/tests/__init__.py
similarity index 100%
rename from ext/opentelemetry-ext-psycopg2/tests/__init__.py
rename to instrumentation/opentelemetry-instrumentation-psycopg2/tests/__init__.py
diff --git a/ext/opentelemetry-ext-psycopg2/tests/test_psycopg2_integration.py b/instrumentation/opentelemetry-instrumentation-psycopg2/tests/test_psycopg2_integration.py
similarity index 94%
rename from ext/opentelemetry-ext-psycopg2/tests/test_psycopg2_integration.py
rename to instrumentation/opentelemetry-instrumentation-psycopg2/tests/test_psycopg2_integration.py
index f854787bd9..629b2f62b6 100644
--- a/ext/opentelemetry-ext-psycopg2/tests/test_psycopg2_integration.py
+++ b/instrumentation/opentelemetry-instrumentation-psycopg2/tests/test_psycopg2_integration.py
@@ -16,8 +16,8 @@
import psycopg2
-import opentelemetry.ext.psycopg2
-from opentelemetry.ext.psycopg2 import Psycopg2Instrumentor
+import opentelemetry.instrumentation.psycopg2
+from opentelemetry.instrumentation.psycopg2 import Psycopg2Instrumentor
from opentelemetry.sdk import resources
from opentelemetry.test.test_base import TestBase
@@ -45,7 +45,9 @@ def test_instrumentor(self, mock_connect):
span = spans_list[0]
# Check version and name in span's instrumentation info
- self.check_span_instrumentation_info(span, opentelemetry.ext.psycopg2)
+ self.check_span_instrumentation_info(
+ span, opentelemetry.instrumentation.psycopg2
+ )
# check that no spans are generated after uninstrument
Psycopg2Instrumentor().uninstrument()
diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-pymemcache/CHANGELOG.md
new file mode 100644
index 0000000000..c549095d2e
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-pymemcache/CHANGELOG.md
@@ -0,0 +1,12 @@
+# Changelog
+
+## Unreleased
+
+- Change package name to opentelemetry-instrumentation-pymemcache
+ ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999))
+
+## Version 0.10b0
+
+Released 2020-06-23
+
+- Initial release
\ No newline at end of file
diff --git a/ext/opentelemetry-ext-pymemcache/LICENSE b/instrumentation/opentelemetry-instrumentation-pymemcache/LICENSE
similarity index 100%
rename from ext/opentelemetry-ext-pymemcache/LICENSE
rename to instrumentation/opentelemetry-instrumentation-pymemcache/LICENSE
diff --git a/ext/opentelemetry-ext-pymemcache/MANIFEST.IN b/instrumentation/opentelemetry-instrumentation-pymemcache/MANIFEST.IN
similarity index 100%
rename from ext/opentelemetry-ext-pymemcache/MANIFEST.IN
rename to instrumentation/opentelemetry-instrumentation-pymemcache/MANIFEST.IN
diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/README.rst b/instrumentation/opentelemetry-instrumentation-pymemcache/README.rst
new file mode 100644
index 0000000000..f126f4246d
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-pymemcache/README.rst
@@ -0,0 +1,20 @@
+OpenTelemetry pymemcache Instrumentation
+========================================
+
+|pypi|
+
+.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-pymemcache.svg
+ :target: https://pypi.org/project/opentelemetry-instrumentation-pymemcache/
+
+Installation
+------------
+
+::
+
+ pip install opentelemetry-instrumentation-pymemcache
+
+
+References
+----------
+* `OpenTelemetry Pymemcache Instrumentation `_
+* `OpenTelemetry Project `_
diff --git a/ext/opentelemetry-ext-pymemcache/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg
similarity index 84%
rename from ext/opentelemetry-ext-pymemcache/setup.cfg
rename to instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg
index 798988461c..aff71c8245 100644
--- a/ext/opentelemetry-ext-pymemcache/setup.cfg
+++ b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg
@@ -13,13 +13,13 @@
# limitations under the License.
#
[metadata]
-name = opentelemetry-ext-pymemcache
-description = OpenTelemetry pymemcache integration
+name = opentelemetry-instrumentation-pymemcache
+description = OpenTelemetry pymemcache instrumentation
long_description = file: README.rst
long_description_content_type = text/x-rst
author = OpenTelemetry Authors
author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/ext/opentelemetry-ext-pymemcache
+url = https://github.com/open-telemetry/opentelemetry-python/instrumentation/opentelemetry-instrumentation-pymemcache
platforms = any
license = Apache-2.0
classifiers =
@@ -54,4 +54,4 @@ where = src
[options.entry_points]
opentelemetry_instrumentor =
- pymemcache = opentelemetry.ext.pymemcache:PymemcacheInstrumentor
+ pymemcache = opentelemetry.instrumentation.pymemcache:PymemcacheInstrumentor
diff --git a/ext/opentelemetry-ext-pymemcache/setup.py b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.py
similarity index 88%
rename from ext/opentelemetry-ext-pymemcache/setup.py
rename to instrumentation/opentelemetry-instrumentation-pymemcache/setup.py
index 4b730b4f31..46bf607933 100644
--- a/ext/opentelemetry-ext-pymemcache/setup.py
+++ b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.py
@@ -18,7 +18,12 @@
BASE_DIR = os.path.dirname(__file__)
VERSION_FILENAME = os.path.join(
- BASE_DIR, "src", "opentelemetry", "ext", "pymemcache", "version.py"
+ BASE_DIR,
+ "src",
+ "opentelemetry",
+ "instrumentation",
+ "pymemcache",
+ "version.py",
)
PACKAGE_INFO = {}
with open(VERSION_FILENAME) as f:
diff --git a/ext/opentelemetry-ext-pymemcache/src/opentelemetry/ext/pymemcache/__init__.py b/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/__init__.py
similarity index 97%
rename from ext/opentelemetry-ext-pymemcache/src/opentelemetry/ext/pymemcache/__init__.py
rename to instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/__init__.py
index e63bbe6f13..332e92ccdd 100644
--- a/ext/opentelemetry-ext-pymemcache/src/opentelemetry/ext/pymemcache/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/__init__.py
@@ -26,7 +26,7 @@
from opentelemetry import trace
from opentelemetry.sdk.trace import TracerProvider
- from opentelemetry.ext.pymemcache import PymemcacheInstrumentor
+ from opentelemetry.instrumentation.pymemcache import PymemcacheInstrumentor
trace.set_tracer_provider(TracerProvider())
PymemcacheInstrumentor().instrument()
from pymemcache.client.base import Client
@@ -44,8 +44,8 @@
from wrapt import ObjectProxy
from wrapt import wrap_function_wrapper as _wrap
-from opentelemetry.ext.pymemcache.version import __version__
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.pymemcache.version import __version__
from opentelemetry.instrumentation.utils import unwrap
from opentelemetry.trace import SpanKind, get_tracer
diff --git a/ext/opentelemetry-ext-pymemcache/src/opentelemetry/ext/pymemcache/version.py b/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/version.py
similarity index 100%
rename from ext/opentelemetry-ext-pymemcache/src/opentelemetry/ext/pymemcache/version.py
rename to instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/version.py
diff --git a/ext/opentelemetry-ext-pymemcache/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-pymemcache/tests/__init__.py
similarity index 100%
rename from ext/opentelemetry-ext-pymemcache/tests/__init__.py
rename to instrumentation/opentelemetry-instrumentation-pymemcache/tests/__init__.py
diff --git a/ext/opentelemetry-ext-pymemcache/tests/test_pymemcache.py b/instrumentation/opentelemetry-instrumentation-pymemcache/tests/test_pymemcache.py
similarity index 99%
rename from ext/opentelemetry-ext-pymemcache/tests/test_pymemcache.py
rename to instrumentation/opentelemetry-instrumentation-pymemcache/tests/test_pymemcache.py
index aea4ad82f1..794da9972b 100644
--- a/ext/opentelemetry-ext-pymemcache/tests/test_pymemcache.py
+++ b/instrumentation/opentelemetry-instrumentation-pymemcache/tests/test_pymemcache.py
@@ -22,7 +22,7 @@
)
from opentelemetry import trace as trace_api
-from opentelemetry.ext.pymemcache import PymemcacheInstrumentor
+from opentelemetry.instrumentation.pymemcache import PymemcacheInstrumentor
from opentelemetry.test.test_base import TestBase
from opentelemetry.trace import get_tracer
from opentelemetry.trace.status import StatusCanonicalCode
diff --git a/ext/opentelemetry-ext-pymemcache/tests/utils.py b/instrumentation/opentelemetry-instrumentation-pymemcache/tests/utils.py
similarity index 100%
rename from ext/opentelemetry-ext-pymemcache/tests/utils.py
rename to instrumentation/opentelemetry-instrumentation-pymemcache/tests/utils.py
diff --git a/ext/opentelemetry-ext-pymongo/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-pymongo/CHANGELOG.md
similarity index 72%
rename from ext/opentelemetry-ext-pymongo/CHANGELOG.md
rename to instrumentation/opentelemetry-instrumentation-pymongo/CHANGELOG.md
index 83a310c143..59f8e35551 100644
--- a/ext/opentelemetry-ext-pymongo/CHANGELOG.md
+++ b/instrumentation/opentelemetry-instrumentation-pymongo/CHANGELOG.md
@@ -2,6 +2,9 @@
## Unreleased
+- Change package name to opentelemetry-instrumentation-pymongo
+ ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999))
+
## 0.7b1
Released 2020-05-12
diff --git a/ext/opentelemetry-ext-pymongo/LICENSE b/instrumentation/opentelemetry-instrumentation-pymongo/LICENSE
similarity index 100%
rename from ext/opentelemetry-ext-pymongo/LICENSE
rename to instrumentation/opentelemetry-instrumentation-pymongo/LICENSE
diff --git a/ext/opentelemetry-ext-pymongo/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-pymongo/MANIFEST.in
similarity index 100%
rename from ext/opentelemetry-ext-pymongo/MANIFEST.in
rename to instrumentation/opentelemetry-instrumentation-pymongo/MANIFEST.in
diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/README.rst b/instrumentation/opentelemetry-instrumentation-pymongo/README.rst
new file mode 100644
index 0000000000..7791810e97
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-pymongo/README.rst
@@ -0,0 +1,21 @@
+OpenTelemetry pymongo Instrumentation
+=====================================
+
+|pypi|
+
+.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-pymongo.svg
+ :target: https://pypi.org/project/opentelemetry-instrumentation-pymongo/
+
+Installation
+------------
+
+::
+
+ pip install opentelemetry-instrumentation-pymongo
+
+
+References
+----------
+* `OpenTelemetry pymongo Instrumentation `_
+* `OpenTelemetry Project `_
+
diff --git a/ext/opentelemetry-ext-pymongo/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg
similarity index 87%
rename from ext/opentelemetry-ext-pymongo/setup.cfg
rename to instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg
index 4aae442aa1..a480f05d6f 100644
--- a/ext/opentelemetry-ext-pymongo/setup.cfg
+++ b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg
@@ -13,13 +13,13 @@
# limitations under the License.
#
[metadata]
-name = opentelemetry-ext-pymongo
-description = OpenTelemetry pymongo integration
+name = opentelemetry-instrumentation-pymongo
+description = OpenTelemetry pymongo instrumentation
long_description = file: README.rst
long_description_content_type = text/x-rst
author = OpenTelemetry Authors
author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-pymongo
+url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-pymongo
platforms = any
license = Apache-2.0
classifiers =
@@ -53,4 +53,4 @@ where = src
[options.entry_points]
opentelemetry_instrumentor =
- pymongo = opentelemetry.ext.pymongo:PymongoInstrumentor
+ pymongo = opentelemetry.instrumentation.pymongo:PymongoInstrumentor
diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/setup.py b/instrumentation/opentelemetry-instrumentation-pymongo/setup.py
new file mode 100644
index 0000000000..7b862ae2aa
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-pymongo/setup.py
@@ -0,0 +1,31 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import os
+
+import setuptools
+
+BASE_DIR = os.path.dirname(__file__)
+VERSION_FILENAME = os.path.join(
+ BASE_DIR,
+ "src",
+ "opentelemetry",
+ "instrumentation",
+ "pymongo",
+ "version.py",
+)
+PACKAGE_INFO = {}
+with open(VERSION_FILENAME) as f:
+ exec(f.read(), PACKAGE_INFO)
+
+setuptools.setup(version=PACKAGE_INFO["__version__"])
diff --git a/ext/opentelemetry-ext-pymongo/src/opentelemetry/ext/pymongo/__init__.py b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py
similarity index 97%
rename from ext/opentelemetry-ext-pymongo/src/opentelemetry/ext/pymongo/__init__.py
rename to instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py
index fa8a599539..0d5ddc10ee 100644
--- a/ext/opentelemetry-ext-pymongo/src/opentelemetry/ext/pymongo/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py
@@ -26,7 +26,7 @@
from pymongo import MongoClient
from opentelemetry import trace
from opentelemetry.trace import TracerProvider
- from opentelemetry.ext.pymongo import PymongoInstrumentor
+ from opentelemetry.instrumentation.pymongo import PymongoInstrumentor
trace.set_tracer_provider(TracerProvider())
@@ -43,8 +43,8 @@
from pymongo import monitoring
from opentelemetry import trace
-from opentelemetry.ext.pymongo.version import __version__
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.pymongo.version import __version__
from opentelemetry.trace import SpanKind, get_tracer
from opentelemetry.trace.status import Status, StatusCanonicalCode
diff --git a/ext/opentelemetry-ext-pymongo/src/opentelemetry/ext/pymongo/version.py b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/version.py
similarity index 100%
rename from ext/opentelemetry-ext-pymongo/src/opentelemetry/ext/pymongo/version.py
rename to instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/version.py
diff --git a/ext/opentelemetry-ext-pymongo/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-pymongo/tests/__init__.py
similarity index 100%
rename from ext/opentelemetry-ext-pymongo/tests/__init__.py
rename to instrumentation/opentelemetry-instrumentation-pymongo/tests/__init__.py
diff --git a/ext/opentelemetry-ext-pymongo/tests/test_pymongo.py b/instrumentation/opentelemetry-instrumentation-pymongo/tests/test_pymongo.py
similarity index 98%
rename from ext/opentelemetry-ext-pymongo/tests/test_pymongo.py
rename to instrumentation/opentelemetry-instrumentation-pymongo/tests/test_pymongo.py
index abb4e8ab50..57f91e131b 100644
--- a/ext/opentelemetry-ext-pymongo/tests/test_pymongo.py
+++ b/instrumentation/opentelemetry-instrumentation-pymongo/tests/test_pymongo.py
@@ -15,7 +15,10 @@
from unittest import mock
from opentelemetry import trace as trace_api
-from opentelemetry.ext.pymongo import CommandTracer, PymongoInstrumentor
+from opentelemetry.instrumentation.pymongo import (
+ CommandTracer,
+ PymongoInstrumentor,
+)
from opentelemetry.test.test_base import TestBase
diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-pymysql/CHANGELOG.md
new file mode 100644
index 0000000000..f9b59fcf7a
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-pymysql/CHANGELOG.md
@@ -0,0 +1,12 @@
+# Changelog
+
+## Unreleased
+
+- Change package name to opentelemetry-instrumentation-pymysql
+ ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999))
+
+## 0.7b1
+
+Released 2020-05-12
+
+- Initial release
\ No newline at end of file
diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/README.rst b/instrumentation/opentelemetry-instrumentation-pymysql/README.rst
new file mode 100644
index 0000000000..0b566d2a94
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-pymysql/README.rst
@@ -0,0 +1,20 @@
+OpenTelemetry PyMySQL Instrumentation
+=====================================
+
+|pypi|
+
+.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-pymysql.svg
+ :target: https://pypi.org/project/opentelemetry-instrumentation-pymysql/
+
+Installation
+------------
+
+::
+
+ pip install opentelemetry-instrumentation-pymysql
+
+
+References
+----------
+* `OpenTelemetry PyMySQL Instrumentation `_
+* `OpenTelemetry Project `_
diff --git a/ext/opentelemetry-ext-pymysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg
similarity index 85%
rename from ext/opentelemetry-ext-pymysql/setup.cfg
rename to instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg
index 9d8ccdff6f..b00276c9d2 100644
--- a/ext/opentelemetry-ext-pymysql/setup.cfg
+++ b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg
@@ -13,13 +13,13 @@
# limitations under the License.
#
[metadata]
-name = opentelemetry-ext-pymysql
-description = OpenTelemetry PyMySQL integration
+name = opentelemetry-instrumentation-pymysql
+description = OpenTelemetry PyMySQL instrumentation
long_description = file: README.rst
long_description_content_type = text/x-rst
author = OpenTelemetry Authors
author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-pymysql
+url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-pymysql
platforms = any
license = Apache-2.0
classifiers =
@@ -41,7 +41,7 @@ package_dir=
packages=find_namespace:
install_requires =
opentelemetry-api == 0.12.dev0
- opentelemetry-ext-dbapi == 0.12.dev0
+ opentelemetry-instrumentation-dbapi == 0.12.dev0
opentelemetry-instrumentation == 0.12.dev0
PyMySQL ~= 0.9.3
@@ -54,4 +54,4 @@ where = src
[options.entry_points]
opentelemetry_instrumentor =
- pymysql = opentelemetry.ext.pymysql:PyMySQLInstrumentor
+ pymysql = opentelemetry.instrumentation.pymysql:PyMySQLInstrumentor
diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/setup.py b/instrumentation/opentelemetry-instrumentation-pymysql/setup.py
new file mode 100644
index 0000000000..74cd948fee
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-pymysql/setup.py
@@ -0,0 +1,31 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import os
+
+import setuptools
+
+BASE_DIR = os.path.dirname(__file__)
+VERSION_FILENAME = os.path.join(
+ BASE_DIR,
+ "src",
+ "opentelemetry",
+ "instrumentation",
+ "pymysql",
+ "version.py",
+)
+PACKAGE_INFO = {}
+with open(VERSION_FILENAME) as f:
+ exec(f.read(), PACKAGE_INFO)
+
+setuptools.setup(version=PACKAGE_INFO["__version__"])
diff --git a/ext/opentelemetry-ext-pymysql/src/opentelemetry/ext/pymysql/__init__.py b/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/__init__.py
similarity index 93%
rename from ext/opentelemetry-ext-pymysql/src/opentelemetry/ext/pymysql/__init__.py
rename to instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/__init__.py
index e44e08e189..5d299505d6 100644
--- a/ext/opentelemetry-ext-pymysql/src/opentelemetry/ext/pymysql/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/__init__.py
@@ -25,7 +25,7 @@
import pymysql
from opentelemetry import trace
- from opentelemetry.ext.pymysql import PyMySQLInstrumentor
+ from opentelemetry.instrumentation.pymysql import PyMySQLInstrumentor
from opentelemetry.sdk.trace import TracerProvider
trace.set_tracer_provider(TracerProvider())
@@ -45,9 +45,9 @@
import pymysql
-from opentelemetry.ext import dbapi
-from opentelemetry.ext.pymysql.version import __version__
+from opentelemetry.instrumentation import dbapi
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.pymysql.version import __version__
class PyMySQLInstrumentor(BaseInstrumentor):
diff --git a/ext/opentelemetry-ext-pymysql/src/opentelemetry/ext/pymysql/version.py b/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/version.py
similarity index 100%
rename from ext/opentelemetry-ext-pymysql/src/opentelemetry/ext/pymysql/version.py
rename to instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/version.py
diff --git a/ext/opentelemetry-ext-pymysql/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-pymysql/tests/__init__.py
similarity index 100%
rename from ext/opentelemetry-ext-pymysql/tests/__init__.py
rename to instrumentation/opentelemetry-instrumentation-pymysql/tests/__init__.py
diff --git a/ext/opentelemetry-ext-pymysql/tests/test_pymysql_integration.py b/instrumentation/opentelemetry-instrumentation-pymysql/tests/test_pymysql_integration.py
similarity index 94%
rename from ext/opentelemetry-ext-pymysql/tests/test_pymysql_integration.py
rename to instrumentation/opentelemetry-instrumentation-pymysql/tests/test_pymysql_integration.py
index 60c060f117..35c9f4d32b 100644
--- a/ext/opentelemetry-ext-pymysql/tests/test_pymysql_integration.py
+++ b/instrumentation/opentelemetry-instrumentation-pymysql/tests/test_pymysql_integration.py
@@ -16,8 +16,8 @@
import pymysql
-import opentelemetry.ext.pymysql
-from opentelemetry.ext.pymysql import PyMySQLInstrumentor
+import opentelemetry.instrumentation.pymysql
+from opentelemetry.instrumentation.pymysql import PyMySQLInstrumentor
from opentelemetry.sdk import resources
from opentelemetry.test.test_base import TestBase
@@ -43,7 +43,9 @@ def test_instrumentor(self, mock_connect):
span = spans_list[0]
# Check version and name in span's instrumentation info
- self.check_span_instrumentation_info(span, opentelemetry.ext.pymysql)
+ self.check_span_instrumentation_info(
+ span, opentelemetry.instrumentation.pymysql
+ )
# check that no spans are generated after uninstrument
PyMySQLInstrumentor().uninstrument()
diff --git a/instrumentation/opentelemetry-instrumentation-redis/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-redis/CHANGELOG.md
new file mode 100644
index 0000000000..79c4e6bf92
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-redis/CHANGELOG.md
@@ -0,0 +1,12 @@
+# Changelog
+
+## Unreleased
+
+- Change package name to opentelemetry-instrumentation-redis
+ ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999))
+
+## 0.7b1
+
+Released 2020-05-12
+
+- Initial release
\ No newline at end of file
diff --git a/ext/opentelemetry-ext-redis/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-redis/MANIFEST.in
similarity index 100%
rename from ext/opentelemetry-ext-redis/MANIFEST.in
rename to instrumentation/opentelemetry-instrumentation-redis/MANIFEST.in
diff --git a/instrumentation/opentelemetry-instrumentation-redis/README.rst b/instrumentation/opentelemetry-instrumentation-redis/README.rst
new file mode 100644
index 0000000000..289a0be0c3
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-redis/README.rst
@@ -0,0 +1,23 @@
+OpenTelemetry Redis Instrumentation
+===================================
+
+|pypi|
+
+.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-redis.svg
+ :target: https://pypi.org/project/opentelemetry-instrumentation-redis/
+
+This library allows tracing requests made by the Redis library.
+
+Installation
+------------
+
+::
+
+ pip install opentelemetry-instrumentation-redis
+
+
+References
+----------
+
+* `OpenTelemetry Redis Instrumentation `_
+* `OpenTelemetry Project `_
diff --git a/ext/opentelemetry-ext-redis/setup.cfg b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg
similarity index 88%
rename from ext/opentelemetry-ext-redis/setup.cfg
rename to instrumentation/opentelemetry-instrumentation-redis/setup.cfg
index 0b245f341a..27793a5bed 100644
--- a/ext/opentelemetry-ext-redis/setup.cfg
+++ b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg
@@ -13,13 +13,13 @@
# limitations under the License.
#
[metadata]
-name = opentelemetry-ext-redis
-description = Redis tracing for OpenTelemetry
+name = opentelemetry-instrumentation-redis
+description = OpenTelemetry Redis instrumentation
long_description = file: README.rst
long_description_content_type = text/x-rst
author = OpenTelemetry Authors
author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-redis
+url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-redis
platforms = any
license = Apache-2.0
classifiers =
@@ -55,4 +55,4 @@ where = src
[options.entry_points]
opentelemetry_instrumentor =
- redis = opentelemetry.ext.redis:RedisInstrumentor
+ redis = opentelemetry.instrumentation.redis:RedisInstrumentor
diff --git a/ext/opentelemetry-ext-asyncpg/setup.py b/instrumentation/opentelemetry-instrumentation-redis/setup.py
similarity index 91%
rename from ext/opentelemetry-ext-asyncpg/setup.py
rename to instrumentation/opentelemetry-instrumentation-redis/setup.py
index 8172205c1a..df80a8fd1a 100644
--- a/ext/opentelemetry-ext-asyncpg/setup.py
+++ b/instrumentation/opentelemetry-instrumentation-redis/setup.py
@@ -17,7 +17,7 @@
BASE_DIR = os.path.dirname(__file__)
VERSION_FILENAME = os.path.join(
- BASE_DIR, "src", "opentelemetry", "ext", "asyncpg", "version.py"
+ BASE_DIR, "src", "opentelemetry", "instrumentation", "redis", "version.py"
)
PACKAGE_INFO = {}
with open(VERSION_FILENAME) as f:
diff --git a/ext/opentelemetry-ext-redis/src/opentelemetry/ext/redis/__init__.py b/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py
similarity index 96%
rename from ext/opentelemetry-ext-redis/src/opentelemetry/ext/redis/__init__.py
rename to instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py
index 0b7f6e28eb..fef856041e 100644
--- a/ext/opentelemetry-ext-redis/src/opentelemetry/ext/redis/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py
@@ -28,7 +28,7 @@
.. code:: python
from opentelemetry import trace
- from opentelemetry.ext.redis import RedisInstrumentor
+ from opentelemetry.instrumentation.redis import RedisInstrumentor
from opentelemetry.sdk.trace import TracerProvider
import redis
@@ -49,12 +49,12 @@
from wrapt import ObjectProxy, wrap_function_wrapper
from opentelemetry import trace
-from opentelemetry.ext.redis.util import (
+from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.redis.util import (
_extract_conn_attributes,
_format_command_args,
)
-from opentelemetry.ext.redis.version import __version__
-from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.redis.version import __version__
from opentelemetry.instrumentation.utils import unwrap
_DEFAULT_SERVICE = "redis"
diff --git a/ext/opentelemetry-ext-redis/src/opentelemetry/ext/redis/util.py b/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/util.py
similarity index 100%
rename from ext/opentelemetry-ext-redis/src/opentelemetry/ext/redis/util.py
rename to instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/util.py
diff --git a/ext/opentelemetry-ext-redis/src/opentelemetry/ext/redis/version.py b/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/version.py
similarity index 100%
rename from ext/opentelemetry-ext-redis/src/opentelemetry/ext/redis/version.py
rename to instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/version.py
diff --git a/ext/opentelemetry-ext-redis/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-redis/tests/__init__.py
similarity index 100%
rename from ext/opentelemetry-ext-redis/tests/__init__.py
rename to instrumentation/opentelemetry-instrumentation-redis/tests/__init__.py
diff --git a/ext/opentelemetry-ext-redis/tests/test_redis.py b/instrumentation/opentelemetry-instrumentation-redis/tests/test_redis.py
similarity index 96%
rename from ext/opentelemetry-ext-redis/tests/test_redis.py
rename to instrumentation/opentelemetry-instrumentation-redis/tests/test_redis.py
index b36e96a627..86b2459c11 100644
--- a/ext/opentelemetry-ext-redis/tests/test_redis.py
+++ b/instrumentation/opentelemetry-instrumentation-redis/tests/test_redis.py
@@ -15,7 +15,7 @@
import redis
-from opentelemetry.ext.redis import RedisInstrumentor
+from opentelemetry.instrumentation.redis import RedisInstrumentor
from opentelemetry.test.test_base import TestBase
diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-sqlalchemy/CHANGELOG.md
new file mode 100644
index 0000000000..3022345ac7
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/CHANGELOG.md
@@ -0,0 +1,12 @@
+# Changelog
+
+## Unreleased
+
+- Change package name to opentelemetry-instrumentation-sqlalchemy
+ ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999))
+
+## 0.7b1
+
+Released 2020-05-12
+
+- Initial release
\ No newline at end of file
diff --git a/ext/opentelemetry-ext-sqlalchemy/LICENSE b/instrumentation/opentelemetry-instrumentation-sqlalchemy/LICENSE
similarity index 100%
rename from ext/opentelemetry-ext-sqlalchemy/LICENSE
rename to instrumentation/opentelemetry-instrumentation-sqlalchemy/LICENSE
diff --git a/ext/opentelemetry-ext-sqlalchemy/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-sqlalchemy/MANIFEST.in
similarity index 100%
rename from ext/opentelemetry-ext-sqlalchemy/MANIFEST.in
rename to instrumentation/opentelemetry-instrumentation-sqlalchemy/MANIFEST.in
diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/README.rst b/instrumentation/opentelemetry-instrumentation-sqlalchemy/README.rst
new file mode 100644
index 0000000000..f29cbe9fff
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/README.rst
@@ -0,0 +1,24 @@
+OpenTelemetry SQLAlchemy Instrumentation
+========================================
+
+|pypi|
+
+.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-sqlalchemy.svg
+ :target: https://pypi.org/project/opentelemetry-instrumentation-sqlalchemy/
+
+This library allows tracing requests made by the SQLAlchemy library.
+
+Installation
+------------
+
+::
+
+ pip install opentelemetry-instrumentation-sqlalchemy
+
+
+References
+----------
+
+* `SQLAlchemy Project `_
+* `OpenTelemetry SQLAlchemy Tracing `_
+* `OpenTelemetry Project `_
\ No newline at end of file
diff --git a/ext/opentelemetry-ext-sqlalchemy/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg
similarity index 87%
rename from ext/opentelemetry-ext-sqlalchemy/setup.cfg
rename to instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg
index 16416f37ef..e10a684d65 100644
--- a/ext/opentelemetry-ext-sqlalchemy/setup.cfg
+++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg
@@ -13,13 +13,13 @@
# limitations under the License.
#
[metadata]
-name = opentelemetry-ext-sqlalchemy
-description = SQLAlchemy tracing for OpenTelemetry
+name = opentelemetry-instrumentation-sqlalchemy
+description = OpenTelemetry SQLAlchemy instrumentation
long_description = file: README.rst
long_description_content_type = text/x-rst
author = OpenTelemetry Authors
author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-sqlalchemy
+url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-sqlalchemy
platforms = any
license = Apache-2.0
classifiers =
@@ -55,4 +55,4 @@ where = src
[options.entry_points]
opentelemetry_instrumentor =
- sqlalchemy = opentelemetry.ext.sqlalchemy:SQLAlchemyInstrumentor
+ sqlalchemy = opentelemetry.instrumentation.sqlalchemy:SQLAlchemyInstrumentor
diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.py b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.py
new file mode 100644
index 0000000000..26d3ef4fc9
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.py
@@ -0,0 +1,31 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import os
+
+import setuptools
+
+BASE_DIR = os.path.dirname(__file__)
+VERSION_FILENAME = os.path.join(
+ BASE_DIR,
+ "src",
+ "opentelemetry",
+ "instrumentation",
+ "sqlalchemy",
+ "version.py",
+)
+PACKAGE_INFO = {}
+with open(VERSION_FILENAME) as f:
+ exec(f.read(), PACKAGE_INFO)
+
+setuptools.setup(version=PACKAGE_INFO["__version__"])
diff --git a/ext/opentelemetry-ext-sqlalchemy/src/opentelemetry/ext/sqlalchemy/__init__.py b/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/__init__.py
similarity index 95%
rename from ext/opentelemetry-ext-sqlalchemy/src/opentelemetry/ext/sqlalchemy/__init__.py
rename to instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/__init__.py
index 05d5e625ef..aad6dbfc07 100644
--- a/ext/opentelemetry-ext-sqlalchemy/src/opentelemetry/ext/sqlalchemy/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/__init__.py
@@ -29,7 +29,7 @@
from sqlalchemy import create_engine
from opentelemetry import trace
- from opentelemetry.ext.sqlalchemy import SQLAlchemyInstrumentor
+ from opentelemetry.instrumentation.sqlalchemy import SQLAlchemyInstrumentor
from opentelemetry.sdk.trace import TracerProvider
import sqlalchemy
@@ -47,12 +47,12 @@
import wrapt
from wrapt import wrap_function_wrapper as _w
-from opentelemetry.ext.sqlalchemy.engine import (
+from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.sqlalchemy.engine import (
EngineTracer,
_get_tracer,
_wrap_create_engine,
)
-from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
from opentelemetry.instrumentation.utils import unwrap
diff --git a/ext/opentelemetry-ext-sqlalchemy/src/opentelemetry/ext/sqlalchemy/engine.py b/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/engine.py
similarity index 98%
rename from ext/opentelemetry-ext-sqlalchemy/src/opentelemetry/ext/sqlalchemy/engine.py
rename to instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/engine.py
index 890bbc7c8d..df80c4841c 100644
--- a/ext/opentelemetry-ext-sqlalchemy/src/opentelemetry/ext/sqlalchemy/engine.py
+++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/engine.py
@@ -15,7 +15,7 @@
from sqlalchemy.event import listen
from opentelemetry import trace
-from opentelemetry.ext.sqlalchemy.version import __version__
+from opentelemetry.instrumentation.sqlalchemy.version import __version__
from opentelemetry.trace.status import Status, StatusCanonicalCode
# Network attribute semantic convention here:
diff --git a/ext/opentelemetry-ext-sqlalchemy/src/opentelemetry/ext/sqlalchemy/version.py b/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/version.py
similarity index 100%
rename from ext/opentelemetry-ext-sqlalchemy/src/opentelemetry/ext/sqlalchemy/version.py
rename to instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/version.py
diff --git a/ext/opentelemetry-ext-sqlalchemy/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-sqlalchemy/tests/__init__.py
similarity index 100%
rename from ext/opentelemetry-ext-sqlalchemy/tests/__init__.py
rename to instrumentation/opentelemetry-instrumentation-sqlalchemy/tests/__init__.py
diff --git a/ext/opentelemetry-ext-sqlalchemy/tests/test_sqlalchemy.py b/instrumentation/opentelemetry-instrumentation-sqlalchemy/tests/test_sqlalchemy.py
similarity index 95%
rename from ext/opentelemetry-ext-sqlalchemy/tests/test_sqlalchemy.py
rename to instrumentation/opentelemetry-instrumentation-sqlalchemy/tests/test_sqlalchemy.py
index 858cc652ef..06593da94f 100644
--- a/ext/opentelemetry-ext-sqlalchemy/tests/test_sqlalchemy.py
+++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/tests/test_sqlalchemy.py
@@ -14,7 +14,7 @@
from sqlalchemy import create_engine
-from opentelemetry.ext.sqlalchemy import SQLAlchemyInstrumentor
+from opentelemetry.instrumentation.sqlalchemy import SQLAlchemyInstrumentor
from opentelemetry.test.test_base import TestBase
diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-sqlite3/CHANGELOG.md
new file mode 100644
index 0000000000..7804da9051
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-sqlite3/CHANGELOG.md
@@ -0,0 +1,12 @@
+# Changelog
+
+## Unreleased
+
+- Change package name to opentelemetry-instrumentation-sqlite3
+ ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999))
+
+## 0.8b0
+
+Released 2020-05-27
+
+- Initial release
\ No newline at end of file
diff --git a/ext/opentelemetry-ext-sqlite3/LICENSE b/instrumentation/opentelemetry-instrumentation-sqlite3/LICENSE
similarity index 100%
rename from ext/opentelemetry-ext-sqlite3/LICENSE
rename to instrumentation/opentelemetry-instrumentation-sqlite3/LICENSE
diff --git a/ext/opentelemetry-ext-sqlite3/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-sqlite3/MANIFEST.in
similarity index 100%
rename from ext/opentelemetry-ext-sqlite3/MANIFEST.in
rename to instrumentation/opentelemetry-instrumentation-sqlite3/MANIFEST.in
diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/README.rst b/instrumentation/opentelemetry-instrumentation-sqlite3/README.rst
new file mode 100644
index 0000000000..0d2aa2dd99
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-sqlite3/README.rst
@@ -0,0 +1,21 @@
+OpenTelemetry SQLite3 Instrumentation
+=====================================
+
+|pypi|
+
+.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-sqlite3.svg
+ :target: https://pypi.org/project/opentelemetry-instrumentation-sqlite3/
+
+Installation
+------------
+
+::
+
+ pip install opentelemetry-instrumentation-sqlite3
+
+
+References
+----------
+* `OpenTelemetry SQLite3 Instrumentation `_
+* `OpenTelemetry Project `_
+
diff --git a/ext/opentelemetry-ext-sqlite3/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg
similarity index 85%
rename from ext/opentelemetry-ext-sqlite3/setup.cfg
rename to instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg
index 51f6b2f30d..841c8d3b17 100644
--- a/ext/opentelemetry-ext-sqlite3/setup.cfg
+++ b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg
@@ -13,13 +13,13 @@
# limitations under the License.
#
[metadata]
-name = opentelemetry-ext-sqlite3
-description = OpenTelemetry SQLite3 integration
+name = opentelemetry-instrumentation-sqlite3
+description = OpenTelemetry SQLite3 instrumentation
long_description = file: README.rst
long_description_content_type = text/x-rst
author = OpenTelemetry Authors
author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-sqlite3
+url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-sqlite3
platforms = any
license = Apache-2.0
classifiers =
@@ -41,7 +41,7 @@ package_dir=
packages=find_namespace:
install_requires =
opentelemetry-api == 0.12.dev0
- opentelemetry-ext-dbapi == 0.12.dev0
+ opentelemetry-instrumentation-dbapi == 0.12.dev0
opentelemetry-instrumentation == 0.12.dev0
wrapt >= 1.0.0, < 2.0.0
@@ -54,4 +54,4 @@ where = src
[options.entry_points]
opentelemetry_instrumentor =
- sqlite3 = opentelemetry.ext.sqlite3:SQLite3Instrumentor
+ sqlite3 = opentelemetry.instrumentation.sqlite3:SQLite3Instrumentor
diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.py b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.py
new file mode 100644
index 0000000000..67ce350fab
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.py
@@ -0,0 +1,31 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import os
+
+import setuptools
+
+BASE_DIR = os.path.dirname(__file__)
+VERSION_FILENAME = os.path.join(
+ BASE_DIR,
+ "src",
+ "opentelemetry",
+ "instrumentation",
+ "sqlite3",
+ "version.py",
+)
+PACKAGE_INFO = {}
+with open(VERSION_FILENAME) as f:
+ exec(f.read(), PACKAGE_INFO)
+
+setuptools.setup(version=PACKAGE_INFO["__version__"])
diff --git a/ext/opentelemetry-ext-sqlite3/src/opentelemetry/ext/sqlite3/__init__.py b/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/__init__.py
similarity index 93%
rename from ext/opentelemetry-ext-sqlite3/src/opentelemetry/ext/sqlite3/__init__.py
rename to instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/__init__.py
index 3cdfd88f75..568e83f0d6 100644
--- a/ext/opentelemetry-ext-sqlite3/src/opentelemetry/ext/sqlite3/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/__init__.py
@@ -26,7 +26,7 @@
import sqlite3
from opentelemetry import trace
from opentelemetry.trace import TracerProvider
- from opentelemetry.ext.sqlite3 import SQLite3Instrumentor
+ from opentelemetry.instrumentation.sqlite3 import SQLite3Instrumentor
trace.set_tracer_provider(TracerProvider())
@@ -44,9 +44,9 @@
import sqlite3
-from opentelemetry.ext import dbapi
-from opentelemetry.ext.sqlite3.version import __version__
+from opentelemetry.instrumentation import dbapi
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.sqlite3.version import __version__
from opentelemetry.trace import get_tracer
diff --git a/ext/opentelemetry-ext-sqlite3/src/opentelemetry/ext/sqlite3/version.py b/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/version.py
similarity index 100%
rename from ext/opentelemetry-ext-sqlite3/src/opentelemetry/ext/sqlite3/version.py
rename to instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/version.py
diff --git a/ext/opentelemetry-ext-sqlite3/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-sqlite3/tests/__init__.py
similarity index 100%
rename from ext/opentelemetry-ext-sqlite3/tests/__init__.py
rename to instrumentation/opentelemetry-instrumentation-sqlite3/tests/__init__.py
diff --git a/ext/opentelemetry-ext-sqlite3/tests/test_sqlite3.py b/instrumentation/opentelemetry-instrumentation-sqlite3/tests/test_sqlite3.py
similarity index 97%
rename from ext/opentelemetry-ext-sqlite3/tests/test_sqlite3.py
rename to instrumentation/opentelemetry-instrumentation-sqlite3/tests/test_sqlite3.py
index 7f4793bda3..a4444e7d93 100644
--- a/ext/opentelemetry-ext-sqlite3/tests/test_sqlite3.py
+++ b/instrumentation/opentelemetry-instrumentation-sqlite3/tests/test_sqlite3.py
@@ -15,7 +15,7 @@
import sqlite3
from opentelemetry import trace as trace_api
-from opentelemetry.ext.sqlite3 import SQLite3Instrumentor
+from opentelemetry.instrumentation.sqlite3 import SQLite3Instrumentor
from opentelemetry.test.test_base import TestBase
diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py
index 857ceb84fe..7b512a84ce 100644
--- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py
+++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py
@@ -26,27 +26,27 @@
# target library to desired instrumentor path/versioned package name
instrumentations = {
"asgi": "opentelemetry-instrumentation-asgi>=0.11b0",
- "asyncpg": "opentelemetry-ext-asyncpg>=0.11b0",
+ "asyncpg": "opentelemetry-instrumentation-asyncpg>=0.11b0",
"boto": "opentelemetry-ext-boto>=0.11b0",
"botocore": "opentelemetry-ext-botocore>=0.11b0",
"celery": "opentelemetry-ext-celery>=0.11b0",
- "dbapi": "opentelemetry-ext-dbapi>=0.8b0",
+ "dbapi": "opentelemetry-instrumentation-dbapi>=0.8b0",
"django": "opentelemetry-instrumentation-django>=0.8b0",
"elasticsearch": "opentelemetry-ext-elasticsearch>=0.11b0",
"fastapi": "opentelemetry-instrumentation-fastapi>=0.11b0",
"flask": "opentelemetry-instrumentation-flask>=0.8b0",
"grpc": "opentelemetry-ext-grpc>=0.8b0",
"jinja2": "opentelemetry-ext-jinja2>=0.8b0",
- "mysql": "opentelemetry-ext-mysql>=0.8b0",
- "psycopg2": "opentelemetry-ext-psycopg2>=0.8b0",
- "pymemcache": "opentelemetry-ext-pymemcache>=0.11b0",
- "pymongo": "opentelemetry-ext-pymongo>=0.8b0",
- "pymysql": "opentelemetry-ext-pymysql>=0.8b0",
+ "mysql": "opentelemetry-instrumentation-mysql>=0.8b0",
+ "psycopg2": "opentelemetry-instrumentation-psycopg2>=0.8b0",
+ "pymemcache": "opentelemetry-instrumentation-pymemcache>=0.11b0",
+ "pymongo": "opentelemetry-instrumentation-pymongo>=0.8b0",
+ "pymysql": "opentelemetry-instrumentation-pymysql>=0.8b0",
"pyramid": "opentelemetry-instrumentation-pyramid>=0.11b0",
- "redis": "opentelemetry-ext-redis>=0.8b0",
+ "redis": "opentelemetry-instrumentation-redis>=0.8b0",
"requests": "opentelemetry-instrumentation-requests>=0.8b0",
- "sqlalchemy": "opentelemetry-ext-sqlalchemy>=0.8b0",
- "sqlite3": "opentelemetry-ext-sqlite3>=0.11b0",
+ "sqlalchemy": "opentelemetry-instrumentation-sqlalchemy>=0.8b0",
+ "sqlite3": "opentelemetry-instrumentation-sqlite3>=0.11b0",
"starlette": "opentelemetry-instrumentation-starlette>=0.11b0",
"wsgi": "opentelemetry-instrumentation-wsgi>=0.8b0",
}
@@ -54,27 +54,27 @@
# relevant instrumentors and tracers to uninstall and check for conflicts for target libraries
libraries = {
"asgi": ("opentelemetry-instrumentation-asgi",),
- "asyncpg": ("opentelemetry-ext-asyncpg",),
+ "asyncpg": ("opentelemetry-instrumentation-asyncpg",),
"boto": ("opentelemetry-ext-boto",),
"botocore": ("opentelemetry-ext-botocore",),
"celery": ("opentelemetry-ext-celery",),
- "dbapi": ("opentelemetry-ext-dbapi",),
+ "dbapi": ("opentelemetry-instrumentation-dbapi",),
"django": ("opentelemetry-instrumentation-django",),
"elasticsearch": ("opentelemetry-ext-elasticsearch",),
"fastapi": ("opentelemetry-instrumentation-fastapi",),
"flask": ("opentelemetry-instrumentation-flask",),
"grpc": ("opentelemetry-ext-grpc",),
"jinja2": ("opentelemetry-ext-jinja2",),
- "mysql": ("opentelemetry-ext-mysql",),
- "psycopg2": ("opentelemetry-ext-psycopg2",),
- "pymemcache": ("opentelemetry-ext-pymemcache",),
- "pymongo": ("opentelemetry-ext-pymongo",),
- "pymysql": ("opentelemetry-ext-pymysql",),
+ "mysql": ("opentelemetry-instrumentation-mysql",),
+ "psycopg2": ("opentelemetry-instrumentation-psycopg2",),
+ "pymemcache": ("opentelemetry-instrumentation-pymemcache",),
+ "pymongo": ("opentelemetry-instrumentation-pymongo",),
+ "pymysql": ("opentelemetry-instrumentation-pymysql",),
"pyramid": ("opentelemetry-instrumentation-pyramid",),
- "redis": ("opentelemetry-ext-redis",),
+ "redis": ("opentelemetry-instrumentation-redis",),
"requests": ("opentelemetry-instrumentation-requests",),
- "sqlalchemy": ("opentelemetry-ext-sqlalchemy",),
- "sqlite3": ("opentelemetry-ext-sqlite3",),
+ "sqlalchemy": ("opentelemetry-instrumentation-sqlalchemy",),
+ "sqlite3": ("opentelemetry-instrumentation-sqlite3",),
"starlette": ("opentelemetry-instrumentation-starlette",),
"wsgi": ("opentelemetry-instrumentation-wsgi",),
}
diff --git a/tox.ini b/tox.ini
index 6dab08f703..8528b63f60 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,7 +44,7 @@ envlist =
py3{4,5,6,7,8}-test-instrumentation-django
pypy3-test-instrumentation-django
- ; opentelemetry-ext-dbapi
+ ; opentelemetry-instrumentation-dbapi
py3{4,5,6,7,8}-test-instrumentation-dbapi
pypy3-test-instrumentation-dbapi
@@ -85,7 +85,7 @@ envlist =
; opentelemetry-exporter-datadog
py3{5,6,7,8}-test-exporter-datadog
- ; opentelemetry-ext-mysql
+ ; opentelemetry-instrumentation-mysql
py3{4,5,6,7,8}-test-instrumentation-mysql
pypy3-test-instrumentation-mysql
@@ -101,19 +101,19 @@ envlist =
py3{4,5,6,7,8}-test-exporter-prometheus
pypy3-test-exporter-prometheus
- ; opentelemetry-ext-psycopg2
+ ; opentelemetry-instrumentation-psycopg2
py3{4,5,6,7,8}-test-instrumentation-psycopg2
; ext-psycopg2 intentionally excluded from pypy3
- ; opentelemetry-ext-pymemcache
+ ; opentelemetry-instrumentation-pymemcache
py3{4,5,6,7,8}-test-instrumentation-pymemcache
pypy3-test-instrumentation-pymemcache
- ; opentelemetry-ext-pymongo
+ ; opentelemetry-instrumentation-pymongo
py3{4,5,6,7,8}-test-instrumentation-pymongo
pypy3-test-instrumentation-pymongo
- ; opentelemetry-ext-pymysql
+ ; opentelemetry-instrumentation-pymysql
py3{4,5,6,7,8}-test-instrumentation-pymysql
pypy3-test-instrumentation-pymysql
@@ -125,11 +125,11 @@ envlist =
py3{5,6,7,8}-test-instrumentation-asgi
pypy3-test-instrumentation-asgi
- ; opentelemetry-ext-asyncpg
+ ; opentelemetry-instrumentation-asyncpg
py3{5,6,7,8}-test-instrumentation-asyncpg
; ext-asyncpg intentionally excluded from pypy3
- ; opentelemetry-ext-sqlite3
+ ; opentelemetry-instrumentation-sqlite3
py3{4,5,6,7,8}-test-instrumentation-sqlite3
pypy3-test-instrumentation-sqlite3
@@ -148,11 +148,11 @@ envlist =
; opentelemetry-ext-grpc
py3{5,6,7,8}-test-instrumentation-grpc
- ; opentelemetry-ext-sqlalchemy
+ ; opentelemetry-instrumentation-sqlalchemy
py3{4,5,6,7,8}-test-instrumentation-sqlalchemy
pypy3-test-instrumentation-sqlalchemy
- ; opentelemetry-ext-redis
+ ; opentelemetry-instrumentation-redis
py3{4,5,6,7,8}-test-instrumentation-redis
pypy3-test-instrumentation-redis
@@ -200,11 +200,11 @@ changedir =
test-instrumentation-aiohttp-client: instrumentation/opentelemetry-instrumentation-aiohttp-client/tests
test-instrumentation-aiopg: instrumentation/opentelemetry-instrumentation-aiopg/tests
test-instrumentation-asgi: instrumentation/opentelemetry-instrumentation-asgi/tests
- test-instrumentation-asyncpg: ext/opentelemetry-ext-asyncpg/tests
+ test-instrumentation-asyncpg: instrumentation/opentelemetry-instrumentation-asyncpg/tests
test-instrumentation-boto: ext/opentelemetry-ext-boto/tests
test-instrumentation-botocore: ext/opentelemetry-ext-botocore/tests
test-instrumentation-celery: ext/opentelemetry-ext-celery/tests
- test-instrumentation-dbapi: ext/opentelemetry-ext-dbapi/tests
+ test-instrumentation-dbapi: instrumentation/opentelemetry-instrumentation-dbapi/tests
test-instrumentation-django: instrumentation/opentelemetry-instrumentation-django/tests
test-instrumentation-example-app: docs/examples/opentelemetry-example-app/tests
test-instrumentation-elasticsearch{2,5,6,7}: ext/opentelemetry-ext-elasticsearch/tests
@@ -212,16 +212,16 @@ changedir =
test-instrumentation-flask: instrumentation/opentelemetry-instrumentation-flask/tests
test-instrumentation-grpc: ext/opentelemetry-ext-grpc/tests
test-instrumentation-jinja2: ext/opentelemetry-ext-jinja2/tests
- test-instrumentation-mysql: ext/opentelemetry-ext-mysql/tests
- test-instrumentation-psycopg2: ext/opentelemetry-ext-psycopg2/tests
- test-instrumentation-pymemcache: ext/opentelemetry-ext-pymemcache/tests
- test-instrumentation-pymongo: ext/opentelemetry-ext-pymongo/tests
- test-instrumentation-pymysql: ext/opentelemetry-ext-pymysql/tests
+ test-instrumentation-mysql: instrumentation/opentelemetry-instrumentation-mysql/tests
+ test-instrumentation-psycopg2: instrumentation/opentelemetry-instrumentation-psycopg2/tests
+ test-instrumentation-pymemcache: instrumentation/opentelemetry-instrumentation-pymemcache/tests
+ test-instrumentation-pymongo: instrumentation/opentelemetry-instrumentation-pymongo/tests
+ test-instrumentation-pymysql: instrumentation/opentelemetry-instrumentation-pymysql/tests
test-instrumentation-pyramid: instrumentation/opentelemetry-instrumentation-pyramid/tests
- test-instrumentation-redis: ext/opentelemetry-ext-redis/tests
+ test-instrumentation-redis: instrumentation/opentelemetry-instrumentation-redis/tests
test-instrumentation-requests: instrumentation/opentelemetry-instrumentation-requests/tests
- test-instrumentation-sqlalchemy: ext/opentelemetry-ext-sqlalchemy/tests
- test-instrumentation-sqlite3: ext/opentelemetry-ext-sqlite3/tests
+ test-instrumentation-sqlalchemy: instrumentation/opentelemetry-instrumentation-sqlalchemy/tests
+ test-instrumentation-sqlite3: instrumentation/opentelemetry-instrumentation-sqlite3/tests
test-instrumentation-starlette: instrumentation/opentelemetry-instrumentation-starlette/tests
test-instrumentation-system-metrics: ext/opentelemetry-ext-system-metrics/tests
test-instrumentation-wsgi: instrumentation/opentelemetry-instrumentation-wsgi/tests
@@ -254,7 +254,7 @@ commands_pre =
wsgi,flask,django,pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi
asgi,starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi
- asyncpg: pip install {toxinidir}/ext/opentelemetry-ext-asyncpg
+ asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg
boto: pip install {toxinidir}/ext/opentelemetry-ext-botocore[test]
boto: pip install {toxinidir}/ext/opentelemetry-ext-boto[test]
@@ -263,13 +263,13 @@ commands_pre =
botocore: pip install {toxinidir}/ext/opentelemetry-ext-botocore[test]
- dbapi: pip install {toxinidir}/ext/opentelemetry-ext-dbapi[test]
+ dbapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi[test]
django: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-django[test]
fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi[test]
- mysql: pip install {toxinidir}/ext/opentelemetry-ext-dbapi {toxinidir}/ext/opentelemetry-ext-mysql[test]
+ mysql: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql[test]
opencensus: pip install {toxinidir}/exporter/opentelemetry-exporter-opencensus
@@ -278,19 +278,19 @@ commands_pre =
prometheus: pip install {toxinidir}/exporter/opentelemetry-exporter-prometheus
- pymemcache: pip install {toxinidir}/ext/opentelemetry-ext-pymemcache[test]
+ pymemcache: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
- pymongo: pip install {toxinidir}/ext/opentelemetry-ext-pymongo[test]
+ pymongo: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo[test]
- psycopg2: pip install {toxinidir}/ext/opentelemetry-ext-dbapi {toxinidir}/ext/opentelemetry-ext-psycopg2 {toxinidir}/ext/opentelemetry-ext-psycopg2[test]
+ psycopg2: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
- pymysql: pip install {toxinidir}/ext/opentelemetry-ext-dbapi {toxinidir}/ext/opentelemetry-ext-pymysql[test]
+ pymysql: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql[test]
pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid[test]
- sqlite3: pip install {toxinidir}/ext/opentelemetry-ext-dbapi {toxinidir}/ext/opentelemetry-ext-sqlite3[test]
+ sqlite3: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3[test]
- redis: pip install {toxinidir}/ext/opentelemetry-ext-redis[test]
+ redis: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-redis[test]
requests: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-requests[test]
@@ -300,7 +300,7 @@ commands_pre =
aiohttp-client: pip install {toxinidir}/opentelemetry-sdk {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client
- aiopg: pip install {toxinidir}/ext/opentelemetry-ext-dbapi pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg[test]
+ aiopg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg[test]
jaeger: pip install {toxinidir}/exporter/opentelemetry-exporter-jaeger
@@ -311,7 +311,7 @@ commands_pre =
zipkin: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin
- sqlalchemy: pip install {toxinidir}/ext/opentelemetry-ext-sqlalchemy
+ sqlalchemy: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy
system-metrics: pip install {toxinidir}/ext/opentelemetry-ext-system-metrics[test]
@@ -412,16 +412,16 @@ commands_pre =
-e {toxinidir}/opentelemetry-sdk \
-e {toxinidir}/opentelemetry-instrumentation \
-e {toxinidir}/tests/util \
- -e {toxinidir}/ext/opentelemetry-ext-asyncpg \
+ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg \
-e {toxinidir}/ext/opentelemetry-ext-celery \
- -e {toxinidir}/ext/opentelemetry-ext-dbapi \
- -e {toxinidir}/ext/opentelemetry-ext-mysql \
- -e {toxinidir}/ext/opentelemetry-ext-psycopg2 \
- -e {toxinidir}/ext/opentelemetry-ext-pymongo \
- -e {toxinidir}/ext/opentelemetry-ext-pymysql \
- -e {toxinidir}/ext/opentelemetry-ext-sqlalchemy \
+ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi \
+ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql \
+ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2 \
+ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo \
+ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql \
+ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy \
-e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg \
- -e {toxinidir}/ext/opentelemetry-ext-redis \
+ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-redis \
-e {toxinidir}/ext/opentelemetry-ext-system-metrics \
-e {toxinidir}/exporter/opentelemetry-exporter-opencensus
docker-compose up -d