Skip to content

Commit 6e34dfe

Browse files
lzchenlzchen
authored
Rename db framework packages from "ext" to "instrumentation" (#966)
1 parent 28d0cdf commit 6e34dfe

File tree

154 files changed

+725
-636
lines changed

Some content is hidden

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

154 files changed

+725
-636
lines changed

‎docs/ext/asyncpg/asyncpg.rst

-10
This file was deleted.

‎docs/ext/dbapi/dbapi.rst

-7
This file was deleted.

‎docs/ext/mysql/mysql.rst

-7
This file was deleted.

‎docs/ext/psycopg2/psycopg2.rst

-7
This file was deleted.

‎docs/ext/pymemcache/pymemcache.rst

-7
This file was deleted.

‎docs/ext/pymongo/pymongo.rst

-7
This file was deleted.

‎docs/ext/pymysql/pymysql.rst

-7
This file was deleted.

‎docs/ext/sqlite3/sqlite3.rst

-7
This file was deleted.

‎docs/instrumentation/asyncpg/asyncpg.rst

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Opentelemetry asyncpg Instrumentation
2+
=====================================
3+
4+
Module contents
5+
---------------
6+
7+
.. automodule:: opentelemetry.instrumentation.asyncpg
8+
:members:
9+
:undoc-members:
10+
:show-inheritance:

‎docs/instrumentation/dbapi/dbapi.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OpenTelemetry Database API Instrumentation
2+
==========================================
3+
4+
.. automodule:: opentelemetry.instrumentation.dbapi
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎docs/instrumentation/mysql/mysql.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OpenTelemetry MySQL Instrumentation
2+
===================================
3+
4+
.. automodule:: opentelemetry.instrumentation.mysql
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎docs/instrumentation/psycopg2/psycopg2.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OpenTelemetry Psycopg Instrumentation
2+
=====================================
3+
4+
.. automodule:: opentelemetry.instrumentation.psycopg2
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎docs/instrumentation/pymemcache/pymemcache.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OpenTelemetry pymemcache Instrumentation
2+
========================================
3+
4+
.. automodule:: opentelemetry.instrumentation.pymemcache
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎docs/instrumentation/pymongo/pymongo.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OpenTelemetry pymongo Instrumentation
2+
=====================================
3+
4+
.. automodule:: opentelemetry.instrumentation.pymongo
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎docs/instrumentation/pymysql/pymysql.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OpenTelemetry PyMySQL Instrumentation
2+
=====================================
3+
4+
.. automodule:: opentelemetry.instrumentation.pymysql
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎docs/ext/redis/redis.rst ‎docs/instrumentation/redis/redis.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OpenTelemetry Redis Instrumentation
22
===================================
33

4-
.. automodule:: opentelemetry.ext.redis
4+
.. automodule:: opentelemetry.instrumentation.redis
55
:members:
66
:undoc-members:
77
:show-inheritance:

‎docs/ext/sqlalchemy/sqlalchemy.rst ‎docs/instrumentation/sqlalchemy/sqlalchemy.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OpenTelemetry SQLAlchemy Instrumentation
22
========================================
33

4-
.. automodule:: opentelemetry.ext.sqlalchemy
4+
.. automodule:: opentelemetry.instrumentation.sqlalchemy
55
:members:
66
:undoc-members:
77
:show-inheritance:

‎docs/instrumentation/sqlite3/sqlite3.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OpenTelemetry SQLite3 Instrumentation
2+
=====================================
3+
4+
.. automodule:: opentelemetry.instrumentation.sqlite3
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎eachdist.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sortfirst=
88
opentelemetry-proto
99
tests/util
1010
instrumentation/opentelemetry-instrumentation-wsgi
11-
ext/opentelemetry-ext-dbapi
11+
instrumentation/opentelemetry-instrumentation-dbapi
1212
instrumentation/opentelemetry-instrumentation-asgi
1313
ext/opentelemetry-ext-botocore
1414
instrumentation/*

‎exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@
3434
_INSTRUMENTATION_SPAN_TYPES = {
3535
"opentelemetry.instrumentation.aiohttp-client": DatadogSpanTypes.HTTP,
3636
"opentelemetry.instrumentation.asgi": DatadogSpanTypes.WEB,
37-
"opentelemetry.ext.dbapi": DatadogSpanTypes.SQL,
37+
"opentelemetry.instrumentation.dbapi": DatadogSpanTypes.SQL,
3838
"opentelemetry.instrumentation.django": DatadogSpanTypes.WEB,
3939
"opentelemetry.instrumentation.flask": DatadogSpanTypes.WEB,
4040
"opentelemetry.ext.grpc": DatadogSpanTypes.GRPC,
4141
"opentelemetry.ext.jinja2": DatadogSpanTypes.TEMPLATE,
42-
"opentelemetry.ext.mysql": DatadogSpanTypes.SQL,
43-
"opentelemetry.ext.psycopg2": DatadogSpanTypes.SQL,
44-
"opentelemetry.ext.pymemcache": DatadogSpanTypes.CACHE,
45-
"opentelemetry.ext.pymongo": DatadogSpanTypes.MONGODB,
46-
"opentelemetry.ext.pymysql": DatadogSpanTypes.SQL,
47-
"opentelemetry.ext.redis": DatadogSpanTypes.REDIS,
42+
"opentelemetry.instrumentation.mysql": DatadogSpanTypes.SQL,
43+
"opentelemetry.instrumentation.psycopg2": DatadogSpanTypes.SQL,
44+
"opentelemetry.instrumentation.pymemcache": DatadogSpanTypes.CACHE,
45+
"opentelemetry.instrumentation.pymongo": DatadogSpanTypes.MONGODB,
46+
"opentelemetry.instrumentation.pymysql": DatadogSpanTypes.SQL,
47+
"opentelemetry.instrumentation.redis": DatadogSpanTypes.REDIS,
4848
"opentelemetry.instrumentation.requests": DatadogSpanTypes.HTTP,
49-
"opentelemetry.ext.sqlalchemy": DatadogSpanTypes.SQL,
49+
"opentelemetry.instrumentation.sqlalchemy": DatadogSpanTypes.SQL,
5050
"opentelemetry.instrumentation.wsgi": DatadogSpanTypes.WEB,
5151
}
5252

‎exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -291,18 +291,18 @@ def test_resources(self):
291291
def test_span_types(self):
292292
test_instrumentations = [
293293
"opentelemetry.instrumentation.aiohttp-client",
294-
"opentelemetry.ext.dbapi",
294+
"opentelemetry.instrumentation.dbapi",
295295
"opentelemetry.instrumentation.django",
296296
"opentelemetry.instrumentation.flask",
297297
"opentelemetry.ext.grpc",
298298
"opentelemetry.ext.jinja2",
299-
"opentelemetry.ext.mysql",
300-
"opentelemetry.ext.psycopg2",
301-
"opentelemetry.ext.pymongo",
302-
"opentelemetry.ext.pymysql",
303-
"opentelemetry.ext.redis",
299+
"opentelemetry.instrumentation.mysql",
300+
"opentelemetry.instrumentation.psycopg2",
301+
"opentelemetry.instrumentation.pymongo",
302+
"opentelemetry.instrumentation.pymysql",
303+
"opentelemetry.instrumentation.redis",
304304
"opentelemetry.instrumentation.requests",
305-
"opentelemetry.ext.sqlalchemy",
305+
"opentelemetry.instrumentation.sqlalchemy",
306306
"opentelemetry.instrumentation.wsgi",
307307
]
308308

‎ext/opentelemetry-ext-asyncpg/README.rst

-23
This file was deleted.

‎ext/opentelemetry-ext-dbapi/README.rst

-21
This file was deleted.

‎ext/opentelemetry-ext-docker-tests/tests/asyncpg/test_asyncpg_functional.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import asyncpg
55

6-
from opentelemetry.ext.asyncpg import AsyncPGInstrumentor
6+
from opentelemetry.instrumentation.asyncpg import AsyncPGInstrumentor
77
from opentelemetry.test.test_base import TestBase
88
from opentelemetry.trace.status import StatusCanonicalCode
99

‎ext/opentelemetry-ext-docker-tests/tests/mysql/test_mysql_functional.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import mysql.connector
1919

2020
from opentelemetry import trace as trace_api
21-
from opentelemetry.ext.mysql import MySQLInstrumentor
21+
from opentelemetry.instrumentation.mysql import MySQLInstrumentor
2222
from opentelemetry.test.test_base import TestBase
2323

2424
MYSQL_USER = os.getenv("MYSQL_USER ", "testuser")

‎ext/opentelemetry-ext-docker-tests/tests/postgres/test_psycopg_functional.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import psycopg2
1919

2020
from opentelemetry import trace as trace_api
21-
from opentelemetry.ext.psycopg2 import Psycopg2Instrumentor
21+
from opentelemetry.instrumentation.psycopg2 import Psycopg2Instrumentor
2222
from opentelemetry.test.test_base import TestBase
2323

2424
POSTGRES_HOST = os.getenv("POSTGRESQL_HOST ", "localhost")

‎ext/opentelemetry-ext-docker-tests/tests/pymongo/test_pymongo_functional.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from pymongo import MongoClient
1818

1919
from opentelemetry import trace as trace_api
20-
from opentelemetry.ext.pymongo import PymongoInstrumentor
20+
from opentelemetry.instrumentation.pymongo import PymongoInstrumentor
2121
from opentelemetry.test.test_base import TestBase
2222

2323
MONGODB_HOST = os.getenv("MONGODB_HOST ", "localhost")

‎ext/opentelemetry-ext-docker-tests/tests/pymysql/test_pymysql_functional.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import pymysql as pymy
1818

1919
from opentelemetry import trace as trace_api
20-
from opentelemetry.ext.pymysql import PyMySQLInstrumentor
20+
from opentelemetry.instrumentation.pymysql import PyMySQLInstrumentor
2121
from opentelemetry.test.test_base import TestBase
2222

2323
MYSQL_USER = os.getenv("MYSQL_USER ", "testuser")

‎ext/opentelemetry-ext-docker-tests/tests/redis/test_redis_functional.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import redis
1616

1717
from opentelemetry import trace
18-
from opentelemetry.ext.redis import RedisInstrumentor
18+
from opentelemetry.instrumentation.redis import RedisInstrumentor
1919
from opentelemetry.test.test_base import TestBase
2020

2121

‎ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/mixins.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
from sqlalchemy.orm import sessionmaker
2020

2121
from opentelemetry import trace
22-
from opentelemetry.ext.sqlalchemy import SQLAlchemyInstrumentor
23-
from opentelemetry.ext.sqlalchemy.engine import _DB, _ROWS, _STMT
22+
from opentelemetry.instrumentation.sqlalchemy import SQLAlchemyInstrumentor
23+
from opentelemetry.instrumentation.sqlalchemy.engine import _DB, _ROWS, _STMT
2424
from opentelemetry.test.test_base import TestBase
2525

2626
Base = declarative_base()

‎ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_instrument.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import sqlalchemy
1919

2020
from opentelemetry import trace
21-
from opentelemetry.ext.sqlalchemy import SQLAlchemyInstrumentor
21+
from opentelemetry.instrumentation.sqlalchemy import SQLAlchemyInstrumentor
2222
from opentelemetry.test.test_base import TestBase
2323

2424
POSTGRES_CONFIG = {

‎ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_mysql.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@
1919
from sqlalchemy.exc import ProgrammingError
2020

2121
from opentelemetry import trace
22-
from opentelemetry.ext.sqlalchemy.engine import _DB, _HOST, _PORT, _ROWS, _STMT
22+
from opentelemetry.instrumentation.sqlalchemy.engine import (
23+
_DB,
24+
_HOST,
25+
_PORT,
26+
_ROWS,
27+
_STMT,
28+
)
2329

2430
from .mixins import SQLAlchemyTestMixin
2531

‎ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_postgres.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@
2020
from sqlalchemy.exc import ProgrammingError
2121

2222
from opentelemetry import trace
23-
from opentelemetry.ext.sqlalchemy.engine import _DB, _HOST, _PORT, _ROWS, _STMT
23+
from opentelemetry.instrumentation.sqlalchemy.engine import (
24+
_DB,
25+
_HOST,
26+
_PORT,
27+
_ROWS,
28+
_STMT,
29+
)
2430

2531
from .mixins import SQLAlchemyTestMixin
2632

‎ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_sqlite.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from sqlalchemy.exc import OperationalError
1919

2020
from opentelemetry import trace
21-
from opentelemetry.ext.sqlalchemy.engine import _DB, _ROWS, _STMT
21+
from opentelemetry.instrumentation.sqlalchemy.engine import _DB, _ROWS, _STMT
2222

2323
from .mixins import SQLAlchemyTestMixin
2424

‎ext/opentelemetry-ext-mysql/README.rst

-25
This file was deleted.

0 commit comments

Comments
 (0)