open-telemetry · lzchen · Aug 4, 2020 · Jul 28, 2020 · Jul 28, 2020 · Jul 28, 2020
diff --git a/docs/ext/asyncpg/asyncpg.rst b/docs/ext/asyncpg/asyncpg.rst
diff --git a/docs/ext/dbapi/dbapi.rst b/docs/ext/dbapi/dbapi.rst
diff --git a/docs/ext/mysql/mysql.rst b/docs/ext/mysql/mysql.rst
diff --git a/docs/ext/psycopg2/psycopg2.rst b/docs/ext/psycopg2/psycopg2.rst
diff --git a/docs/ext/pymemcache/pymemcache.rst b/docs/ext/pymemcache/pymemcache.rst
diff --git a/docs/ext/pymongo/pymongo.rst b/docs/ext/pymongo/pymongo.rst
diff --git a/docs/ext/pymysql/pymysql.rst b/docs/ext/pymysql/pymysql.rst
diff --git a/docs/ext/sqlite3/sqlite3.rst b/docs/ext/sqlite3/sqlite3.rst
diff --git a/docs/instrumentation/asyncpg/asyncpg.rst 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,7 @@
+OpenTelemetry PyMySQL Instrumentation
+=====================================
+
+.. automodule:: opentelemetry.instrumentation.pymysql
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/ext/redis/redis.rst → docs/instrumentation/redis/redis.rst b/docs/ext/redis/redis.rst → 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 → ...instrumentation/sqlalchemy/sqlalchemy.rst b/docs/ext/sqlalchemy/sqlalchemy.rst → ...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
@@ -0,0 +1,7 @@
+OpenTelemetry SQLite3 Instrumentation
+=====================================
+
+.. automodule:: opentelemetry.instrumentation.sqlite3
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git 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
@@ -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
@@ -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
diff --git a/ext/opentelemetry-ext-dbapi/README.rst b/ext/opentelemetry-ext-dbapi/README.rst
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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