Skip to content

Commit fa35a88

Browse files
bitglueyurishkuro
authored andcommitted
Add client hooks for psycopg2 (#39)
1 parent 5547afa commit fa35a88

File tree

4 files changed

+58
-2
lines changed

4 files changed

+58
-2
lines changed

opentracing_instrumentation/client_hooks/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2015 Uber Technologies, Inc.
1+
# Copyright (c) 2015-2017 Uber Technologies, Inc.
22
#
33
# Permission is hereby granted, free of charge, to any person obtaining a copy
44
# of this software and associated documentation files (the "Software"), to deal
@@ -34,6 +34,7 @@ def install_all_patches():
3434
If a specific module is not available on the path, it is ignored.
3535
"""
3636
from . import mysqldb
37+
from . import psycopg2
3738
from . import strict_redis
3839
from . import sqlalchemy
3940
from . import tornado_http
@@ -42,6 +43,7 @@ def install_all_patches():
4243
from . import requests
4344

4445
mysqldb.install_patches()
46+
psycopg2.install_patches()
4547
strict_redis.install_patches()
4648
sqlalchemy.install_patches()
4749
tornado_http.install_patches()

opentracing_instrumentation/client_hooks/_dbapi2.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2015 Uber Technologies, Inc.
1+
# Copyright (c) 2015-2017 Uber Technologies, Inc.
22
#
33
# Permission is hereby granted, free of charge, to any person obtaining a copy
44
# of this software and associated documentation files (the "Software"), to deal
@@ -115,6 +115,8 @@ def __call__(self, *args, **kwargs):
115115

116116

117117
class ConnectionWrapper(wrapt.ObjectProxy):
118+
__slots__ = ('_module_name', '_connect_params')
119+
118120
def __init__(self, connection, module_name, connect_params):
119121
super(ConnectionWrapper, self).__init__(wrapped=connection)
120122
self._module_name = module_name
@@ -174,6 +176,8 @@ def __exit__(self, exc, value, tb):
174176

175177

176178
class CursorWrapper(wrapt.ObjectProxy):
179+
__slots__ = ('_module_name', '_connect_params', '_cursor_params')
180+
177181
def __init__(self, cursor, module_name,
178182
connect_params=None, cursor_params=None):
179183
super(CursorWrapper, self).__init__(wrapped=cursor)
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Copyright (c) 2017 Uber Technologies, Inc.
2+
#
3+
# Permission is hereby granted, free of charge, to any person obtaining a copy
4+
# of this software and associated documentation files (the "Software"), to deal
5+
# in the Software without restriction, including without limitation the rights
6+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
# copies of the Software, and to permit persons to whom the Software is
8+
# furnished to do so, subject to the following conditions:
9+
#
10+
# The above copyright notice and this permission notice shall be included in
11+
# all copies or substantial portions of the Software.
12+
#
13+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
# THE SOFTWARE.
20+
21+
from __future__ import absolute_import
22+
from ._dbapi2 import ContextManagerConnectionWrapper as ConnectionWrapper
23+
from ._dbapi2 import ConnectionFactory
24+
from ._singleton import singleton
25+
26+
# Try to save the original entry points
27+
try:
28+
import psycopg2
29+
except ImportError: # pragma: no cover
30+
pass
31+
else:
32+
_psycopg2_connect = psycopg2.connect
33+
34+
35+
@singleton
36+
def install_patches():
37+
try:
38+
import psycopg2
39+
except ImportError: # pragma: no cover
40+
return
41+
42+
factory = ConnectionFactory(connect_func=psycopg2.connect,
43+
module_name='psycopg2',
44+
conn_wrapper_ctor=ConnectionWrapper)
45+
setattr(psycopg2, 'connect', factory)
46+
if hasattr(psycopg2, 'Connect'):
47+
setattr(psycopg2, 'Connect', factory)

opentracing_instrumentation/request_context.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@ def span_in_context(span):
181181
## Usage example in WSGI middleware:
182182
183183
.. code-block:: python
184+
from opentracing_instrumentation.http_server import WSGIRequestWrapper
185+
from opentracing_instrumentation.http_server import before_request
186+
from opentracing_instrumentation import request_context
184187
185188
def create_wsgi_tracing_middleware(other_wsgi):
186189

0 commit comments

Comments
 (0)