update calls in other integrations

ddtrace/contrib/aioredis/patch.py

@@ -5,8 +5,8 @@
 import aioredis
 
 from ddtrace import config
-from ddtrace._trace.utils_redis import _trace_redis_cmd
-from ddtrace._trace.utils_redis import _trace_redis_execute_pipeline
+from ddtrace._trace.utils_redis import _instrument_redis_cmd
+from ddtrace._trace.utils_redis import _instrument_redis_execute_pipeline
 from ddtrace.contrib.redis_utils import ROW_RETURNING_COMMANDS
 from ddtrace.contrib.redis_utils import _run_redis_command_async
 from ddtrace.contrib.redis_utils import determine_row_count
@@ -93,8 +93,8 @@ async def traced_execute_command(func, instance, args, kwargs):
     if not pin or not pin.enabled():
         return await func(*args, **kwargs)
 
-    with _trace_redis_cmd(pin, config.aioredis, instance, args) as span:
-        return await _run_redis_command_async(span=span, func=func, args=args, kwargs=kwargs)
+    with _instrument_redis_cmd(pin, config.aioredis, instance, args) as ctx:
+        return await _run_redis_command_async(ctx=ctx, func=func, args=args, kwargs=kwargs)
 
 
 def traced_pipeline(func, instance, args, kwargs):
@@ -111,7 +111,7 @@ async def traced_execute_pipeline(func, instance, args, kwargs):
         return await func(*args, **kwargs)
 
     cmds = [stringify_cache_args(c, cmd_max_len=config.aioredis.cmd_max_length) for c, _ in instance.command_stack]
-    with _trace_redis_execute_pipeline(pin, config.aioredis, cmds, instance):
+    with _instrument_redis_execute_pipeline(pin, config.aioredis, cmds, instance):
         return await func(*args, **kwargs)
 
 

ddtrace/contrib/aredis/patch.py

@@ -3,8 +3,8 @@
 import aredis
 
 from ddtrace import config
-from ddtrace._trace.utils_redis import _trace_redis_cmd
-from ddtrace._trace.utils_redis import _trace_redis_execute_pipeline
+from ddtrace._trace.utils_redis import _instrument_redis_cmd
+from ddtrace._trace.utils_redis import _instrument_redis_execute_pipeline
 from ddtrace.contrib.redis_utils import _run_redis_command_async
 from ddtrace.vendor import wrapt
 
@@ -64,8 +64,8 @@ async def traced_execute_command(func, instance, args, kwargs):
     if not pin or not pin.enabled():
         return await func(*args, **kwargs)
 
-    with _trace_redis_cmd(pin, config.aredis, instance, args) as span:
-        return await _run_redis_command_async(span=span, func=func, args=args, kwargs=kwargs)
+    with _instrument_redis_cmd(pin, config.aredis, instance, args) as ctx:
+        return await _run_redis_command_async(ctx=ctx, func=func, args=args, kwargs=kwargs)
 
 
 async def traced_pipeline(func, instance, args, kwargs):
@@ -82,5 +82,5 @@ async def traced_execute_pipeline(func, instance, args, kwargs):
         return await func(*args, **kwargs)
 
     cmds = [stringify_cache_args(c, cmd_max_len=config.aredis.cmd_max_length) for c, _ in instance.command_stack]
-    with _trace_redis_execute_pipeline(pin, config.aredis, cmds, instance):
+    with _instrument_redis_execute_pipeline(pin, config.aredis, cmds, instance):
         return await func(*args, **kwargs)

ddtrace/contrib/yaaredis/patch.py

@@ -3,8 +3,8 @@
 import yaaredis
 
 from ddtrace import config
-from ddtrace._trace.utils_redis import _trace_redis_cmd
-from ddtrace._trace.utils_redis import _trace_redis_execute_pipeline
+from ddtrace._trace.utils_redis import _instrument_redis_cmd
+from ddtrace._trace.utils_redis import _instrument_redis_execute_pipeline
 from ddtrace.contrib.redis_utils import _run_redis_command_async
 from ddtrace.vendor import wrapt
 
@@ -61,8 +61,8 @@ async def traced_execute_command(func, instance, args, kwargs):
     if not pin or not pin.enabled():
         return await func(*args, **kwargs)
 
-    with _trace_redis_cmd(pin, config.yaaredis, instance, args) as span:
-        return await _run_redis_command_async(span=span, func=func, args=args, kwargs=kwargs)
+    with _instrument_redis_cmd(pin, config.yaaredis, instance, args) as ctx:
+        return await _run_redis_command_async(ctx=ctx, func=func, args=args, kwargs=kwargs)
 
 
 async def traced_pipeline(func, instance, args, kwargs):
@@ -79,5 +79,5 @@ async def traced_execute_pipeline(func, instance, args, kwargs):
         return await func(*args, **kwargs)
 
     cmds = [stringify_cache_args(c, cmd_max_len=config.yaaredis.cmd_max_length) for c, _ in instance.command_stack]
-    with _trace_redis_execute_pipeline(pin, config.yaaredis, cmds, instance):
+    with _instrument_redis_execute_pipeline(pin, config.yaaredis, cmds, instance):
         return await func(*args, **kwargs)