Skip to content

Commit d32e83d

Browse files
committed
feedback: pass in tracer_provider directly rather than kwargs
1 parent ed5259e commit d32e83d

File tree

2 files changed

+7
-10
lines changed
  • instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy

2 files changed

+7
-10
lines changed

instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/__init__.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,20 @@ def _instrument(self, **kwargs):
8888
Returns:
8989
An instrumented engine if passed in as an argument, None otherwise.
9090
"""
91-
_w("sqlalchemy", "create_engine", _wrap_create_engine(kwargs))
92-
_w("sqlalchemy.engine", "create_engine", _wrap_create_engine(kwargs))
91+
tracer_provider = kwargs.get("tracer_provider")
92+
_w("sqlalchemy", "create_engine", _wrap_create_engine(tracer_provider))
93+
_w("sqlalchemy.engine", "create_engine", _wrap_create_engine(tracer_provider))
9394
if parse_version(sqlalchemy.__version__).release >= (1, 4):
9495
_w(
9596
"sqlalchemy.ext.asyncio",
9697
"create_async_engine",
97-
_wrap_create_async_engine(kwargs),
98+
_wrap_create_async_engine(tracer_provider),
9899
)
99100

100101
if kwargs.get("engine") is not None:
101102
return EngineTracer(
102103
_get_tracer(
103-
kwargs.get("engine"), kwargs.get("tracer_provider")
104+
kwargs.get("engine"), tracer_provider
104105
),
105106
kwargs.get("engine"),
106107
)

instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/engine.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ def _get_tracer(engine, tracer_provider=None):
4343

4444

4545
# pylint: disable=unused-argument
46-
def _wrap_create_async_engine(kwargs):
47-
tracer_provider = kwargs.get("tracer_provider")
48-
46+
def _wrap_create_async_engine(tracer_provider=None):
4947
def _wrap_create_async_engine_internal(func, module, args, kwargs):
5048
"""Trace the SQLAlchemy engine, creating an `EngineTracer`
5149
object that will listen to SQLAlchemy events.
@@ -58,9 +56,7 @@ def _wrap_create_async_engine_internal(func, module, args, kwargs):
5856

5957

6058
# pylint: disable=unused-argument
61-
def _wrap_create_engine(kwargs):
62-
tracer_provider = kwargs.get("tracer_provider")
63-
59+
def _wrap_create_engine(tracer_provider=None):
6460
def _wrap_create_engine_internal(func, module, args, kwargs):
6561
"""Trace the SQLAlchemy engine, creating an `EngineTracer`
6662
object that will listen to SQLAlchemy events.

0 commit comments

Comments
 (0)