use sqlalchemy module name not engine. fixes #922

open-telemetry · May 10, 2022 · acf1d1f · acf1d1f
1 parent fa56c6c
commit acf1d1f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/...metry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/__init__.py b/...metry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/__init__.py
@@ -104,7 +104,7 @@ def _instrument(self, **kwargs):
 
         if kwargs.get("engine") is not None:
             return EngineTracer(
-                _get_tracer(kwargs.get("engine"), tracer_provider),
+                _get_tracer(tracer_provider),
                 kwargs.get("engine"),
                 kwargs.get("enable_commenter", False),
             )

diff --git a/...lemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/engine.py b/...lemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/engine.py
@@ -16,6 +16,9 @@
 from sqlalchemy.event import listen  # pylint: disable=no-name-in-module
 
 from opentelemetry import trace
+from opentelemetry.instrumentation.sqlalchemy.package import (
+    _instrumenting_module_name,
+)
 from opentelemetry.instrumentation.sqlalchemy.version import __version__
 from opentelemetry.instrumentation.utils import (
     _generate_opentelemetry_traceparent,
@@ -40,9 +43,9 @@ def _normalize_vendor(vendor):
     return vendor
 
 
-def _get_tracer(engine, tracer_provider=None):
+def _get_tracer(tracer_provider=None):
     return trace.get_tracer(
-        _normalize_vendor(engine.name),
+        _instrumenting_module_name,
         __version__,
         tracer_provider=tracer_provider,
     )
@@ -55,7 +58,7 @@ def _wrap_create_async_engine_internal(func, module, args, kwargs):
         object that will listen to SQLAlchemy events.
         """
         engine = func(*args, **kwargs)
-        EngineTracer(_get_tracer(engine, tracer_provider), engine.sync_engine)
+        EngineTracer(_get_tracer(tracer_provider), engine.sync_engine)
         return engine
 
     return _wrap_create_async_engine_internal
@@ -68,7 +71,7 @@ def _wrap_create_engine_internal(func, module, args, kwargs):
         object that will listen to SQLAlchemy events.
         """
         engine = func(*args, **kwargs)
-        EngineTracer(_get_tracer(engine, tracer_provider), engine)
+        EngineTracer(_get_tracer(tracer_provider), engine)
         return engine
 
     return _wrap_create_engine_internal

diff --git a/...emetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/package.py b/...emetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/package.py
@@ -12,5 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+_instrumenting_module_name = "opentelemetry.instrumentation.sqlalchemy"
 
 _instruments = ("sqlalchemy",)