[django] keep a different version of _resource_from_cache_prefix in django/utils; it could be different from flask_cache for future versions

This reverts commit e308bda.

Author: Emanuele Palazzetti

ddtrace/contrib/django/cache.py

@@ -5,8 +5,7 @@
 from django.conf import settings as django_settings
 
 from .conf import settings, import_from_string
-from .utils import quantize_key_values
-from ..util import _resource_from_cache_prefix
+from .utils import quantize_key_values, _resource_from_cache_prefix
 
 
 log = logging.getLogger(__name__)

ddtrace/contrib/django/utils.py

@@ -1,3 +1,16 @@
+def _resource_from_cache_prefix(resource, cache):
+    """
+    Combine the resource name with the cache prefix (if any)
+    """
+    if getattr(cache, "key_prefix", None):
+        name = "{} {}".format(resource, cache.key_prefix)
+    else:
+        name = resource
+
+    # enforce lowercase to make the output nicer to read
+    return name.lower()
+
+
 def quantize_key_values(key):
     """
     Used in the Django trace operation method, it ensures that if a dict

ddtrace/contrib/flask_cache/tracers.py

@@ -6,8 +6,7 @@
 import logging
 
 # project
-from .utils import _extract_conn_tags
-from ..util import _resource_from_cache_prefix
+from .utils import _extract_conn_tags, _resource_from_cache_prefix
 from ...ext import AppTypes
 
 # 3rd party

ddtrace/contrib/flask_cache/utils.py

@@ -3,6 +3,18 @@
 from ..redis.util import _extract_conn_tags as extract_redis_tags
 from ..pylibmc.addrs import parse_addresses
 
+def _resource_from_cache_prefix(resource, cache):
+    """
+    Combine the resource name with the cache prefix (if any)
+    """
+    if getattr(cache, "key_prefix", None):
+        name = "{} {}".format(resource, cache.key_prefix)
+    else:
+        name = resource
+
+    # enforce lowercase to make the output nicer to read
+    return name.lower()
+
 
 def _extract_conn_tags(client):
     """

ddtrace/contrib/util.py

@@ -17,17 +17,3 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_value, traceback):
         return False
-
-
-def _resource_from_cache_prefix(resource, cache):
-    """
-    Combine the resource name with the cache prefix (if any) to generate
-    the cache resource name
-    """
-    if getattr(cache, "key_prefix", None):
-        name = "{} {}".format(resource, cache.key_prefix)
-    else:
-        name = resource
-
-    # enforce lowercase to make the output nicer to read
-    return name.lower()

tests/contrib/flask_cache/test_utils.py

@@ -5,9 +5,8 @@
 # project
 from ddtrace.ext import net
 from ddtrace.tracer import Tracer, Span
-from ddtrace.contrib.util import _resource_from_cache_prefix
 from ddtrace.contrib.flask_cache import get_traced_cache
-from ddtrace.contrib.flask_cache.utils import _extract_conn_tags
+from ddtrace.contrib.flask_cache.utils import _extract_conn_tags, _resource_from_cache_prefix
 from ddtrace.contrib.flask_cache.tracers import TYPE, CACHE_BACKEND
 
 # 3rd party