Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename db framework packages from "ext" to "instrumentation" #966

Merged
merged 43 commits into from
Aug 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
c2c634e
exporters
lzchen Jul 28, 2020
97a85bf
errors
lzchen Jul 28, 2020
1fb9c2e
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Jul 28, 2020
5caffec
changelog
lzchen Jul 28, 2020
e95d42a
rename
lzchen Jul 28, 2020
084ea18
black
lzchen Jul 28, 2020
5154b72
fix
lzchen Jul 28, 2020
1472931
rename
lzchen Jul 28, 2020
aaf24e5
lint
lzchen Jul 28, 2020
7a30143
datadog
lzchen Jul 28, 2020
5249771
flake
lzchen Jul 28, 2020
a5af6e9
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Jul 28, 2020
fb9e3db
toctree
lzchen Jul 28, 2020
c1da72d
docs
lzchen Jul 28, 2020
ee0a0bb
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Jul 29, 2020
10e4314
jaeger
lzchen Jul 29, 2020
1b5c234
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Jul 29, 2020
f2d07a1
init
lzchen Jul 30, 2020
47d8bec
othher
lzchen Jul 30, 2020
b8277ed
tox
lzchen Jul 30, 2020
7c04eef
docs
lzchen Jul 30, 2020
d9f6428
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Jul 30, 2020
570e6a8
changelog
lzchen Jul 30, 2020
8568b44
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Jul 30, 2020
59d0f76
lint
lzchen Jul 30, 2020
4992f22
docs
lzchen Jul 30, 2020
cb0dd9c
isort
lzchen Jul 30, 2020
699a589
lint
lzchen Jul 30, 2020
a1d5963
grpcio
lzchen Jul 30, 2020
91dd6a4
grpc
lzchen Jul 30, 2020
c50b5e5
grpc
lzchen Jul 30, 2020
447f472
test
lzchen Jul 30, 2020
c6cf35b
revert grpc
lzchen Jul 30, 2020
9f1f987
lint
lzchen Jul 30, 2020
30f6bb4
lint
lzchen Jul 30, 2020
6509403
utils
lzchen Jul 30, 2020
7db8e11
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Aug 3, 2020
375720d
address comments
lzchen Aug 3, 2020
99980bf
rename
lzchen Aug 3, 2020
903de2b
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
lzchen Aug 3, 2020
ffa0357
fix
lzchen Aug 3, 2020
f9167df
black
lzchen Aug 3, 2020
a02ae99
isort
lzchen Aug 3, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions docs/ext/asyncpg/asyncpg.rst

This file was deleted.

7 changes: 0 additions & 7 deletions docs/ext/dbapi/dbapi.rst

This file was deleted.

7 changes: 0 additions & 7 deletions docs/ext/mysql/mysql.rst

This file was deleted.

7 changes: 0 additions & 7 deletions docs/ext/psycopg2/psycopg2.rst

This file was deleted.

7 changes: 0 additions & 7 deletions docs/ext/pymemcache/pymemcache.rst

This file was deleted.

7 changes: 0 additions & 7 deletions docs/ext/pymongo/pymongo.rst

This file was deleted.

7 changes: 0 additions & 7 deletions docs/ext/pymysql/pymysql.rst

This file was deleted.

7 changes: 0 additions & 7 deletions docs/ext/sqlite3/sqlite3.rst

This file was deleted.

10 changes: 10 additions & 0 deletions docs/instrumentation/asyncpg/asyncpg.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Opentelemetry asyncpg Instrumentation
=====================================

Module contents
---------------

.. automodule:: opentelemetry.instrumentation.asyncpg
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/instrumentation/dbapi/dbapi.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OpenTelemetry Database API Instrumentation
==========================================

.. automodule:: opentelemetry.instrumentation.dbapi
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/instrumentation/mysql/mysql.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OpenTelemetry MySQL Instrumentation
===================================

.. automodule:: opentelemetry.instrumentation.mysql
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/instrumentation/psycopg2/psycopg2.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OpenTelemetry Psycopg Instrumentation
=====================================

.. automodule:: opentelemetry.instrumentation.psycopg2
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/instrumentation/pymemcache/pymemcache.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OpenTelemetry pymemcache Instrumentation
========================================

.. automodule:: opentelemetry.instrumentation.pymemcache
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/instrumentation/pymongo/pymongo.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OpenTelemetry pymongo Instrumentation
=====================================

.. automodule:: opentelemetry.instrumentation.pymongo
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/instrumentation/pymysql/pymysql.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OpenTelemetry PyMySQL Instrumentation
=====================================

.. automodule:: opentelemetry.instrumentation.pymysql
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OpenTelemetry Redis Instrumentation
===================================

.. automodule:: opentelemetry.ext.redis
.. automodule:: opentelemetry.instrumentation.redis
:members:
:undoc-members:
:show-inheritance:
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OpenTelemetry SQLAlchemy Instrumentation
========================================

.. automodule:: opentelemetry.ext.sqlalchemy
.. automodule:: opentelemetry.instrumentation.sqlalchemy
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/instrumentation/sqlite3/sqlite3.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OpenTelemetry SQLite3 Instrumentation
=====================================

.. automodule:: opentelemetry.instrumentation.sqlite3
:members:
:undoc-members:
:show-inheritance:
2 changes: 1 addition & 1 deletion eachdist.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
23 changes: 0 additions & 23 deletions ext/opentelemetry-ext-asyncpg/README.rst

This file was deleted.

21 changes: 0 additions & 21 deletions ext/opentelemetry-ext-dbapi/README.rst

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
25 changes: 0 additions & 25 deletions ext/opentelemetry-ext-mysql/README.rst

This file was deleted.

Loading