[celery] update util.py to utils.py; removing duplicated / unused code

Author: Emanuele Palazzetti

ddtrace/contrib/celery/app.py

@@ -4,7 +4,7 @@
 from ddtrace.pin import _DD_PIN_NAME
 from ddtrace.ext import AppTypes
 
-from .util import APP, WORKER_SERVICE
+from .constants import APP, WORKER_SERVICE
 from .signals import (
     trace_prerun,
     trace_postrun,

ddtrace/contrib/celery/util.py renamed to ddtrace/contrib/celery/utils.py

@@ -1,18 +1,7 @@
-# stdlib
-import os
-
 from weakref import WeakValueDictionary
 
-# Project
-from ddtrace import Pin
-
 from .constants import CTX_KEY
 
-# Service info
-APP = 'celery'
-PRODUCER_SERVICE = os.environ.get('DATADOG_SERVICE_NAME') or 'celery-producer'
-WORKER_SERVICE = os.environ.get('DATADOG_SERVICE_NAME') or 'celery-worker'
-
 
 def tags_from_context(context):
     """Helper to extract meta values from a Celery Context"""
@@ -100,16 +89,3 @@ def retrieve_task_id(context):
     else:
         # Protocol Version 1
         return body.get('id')
-
-
-def require_pin(decorated):
-    """ decorator for extracting the `Pin` from a wrapped method """
-    def wrapper(wrapped, instance, args, kwargs):
-        pin = Pin.get_from(instance)
-        # Execute the original method if pin is not enabled
-        if not pin or not pin.enabled():
-            return wrapped(*args, **kwargs)
-
-        # Execute our decorated function
-        return decorated(pin, wrapped, instance, args, kwargs)
-    return wrapper