Metrics working.

.gitignore

@@ -44,6 +44,7 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *.cover
+*.py,cover
 .hypothesis/
 
 # Translations

crossover/__init__.py

@@ -35,11 +35,12 @@ class CrossoverRouter(celery.Task):
     name = CROSSOVER_ROUTER_NAME
 
     def run(self, *args, **kwargs):
+        metrics = CrossoverMetrics.load(kwargs)
+        metrics.set_remote_time()
+
         app = celery.current_app if celery.VERSION < self.CELERY_4_VERSION else self.app
         task_name = kwargs.pop('task_name')
 
-        metrics = CrossoverMetrics.load(kwargs)
-        metrics.set_remote_time()
         metrics_subscribe.call_subscribers(metrics)
 
         logger.debug('Got Crossover task: {}'.format(task_name))
@@ -123,12 +124,13 @@ def __init__(self, broker, remote_task_name, task=CROSSOVER_ROUTER_NAME, queue=C
         self.remote_task_name = remote_task_name
 
     def __call__(self, *args, **kwargs):
+        metrics = CrossoverMetrics()
+        metrics.set_origin_time()
+
         kwargs['task_name'] = self.remote_task_name
         if 'callback' in kwargs:
             kwargs['callback'] = _build_callback(kwargs['callback'])
 
-        metrics = CrossoverMetrics()
-        metrics.set_origin_time()
         kwargs['metrics'] = metrics.dump()
 
         requests.post(self.url, json=kwargs)

setup.py

@@ -21,7 +21,7 @@ def long_desc_img_replacer(long_desc):
 
 requires = [
     'celery[redis]>=3.1.20',
-    'requests-celery-adapters>=2.0.13',
+    'requests-celery-adapters>=2.0.14',
     'six>=1.11.0'
             ]
 

tests/conftest.py

@@ -4,14 +4,16 @@
 
 from examples.database import redis as redis_
 
+
 class ProjectWorker(object):
     CMD_LINE = ''
 
     def start(self):
         self.sp = subprocess.Popen(self.CMD_LINE)
 
     def stop(self):
-        self.sp.terminate()
+        self.sp.send_signal(signal.SIGINT)
+        self.sp.wait()
 
 
 class Project1Worker(ProjectWorker):
@@ -22,6 +24,10 @@ class Project2Worker(ProjectWorker):
     CMD_LINE = 'celery worker -A examples.project_2.project.app -l INFO'.split(' ')
 
 
+def pytest_configure():
+    redis_.db.flushall()
+
+
 @pytest.fixture(scope='session')
 def worker_1():
     pw = Project1Worker()

tox.ini

@@ -7,7 +7,7 @@ envlist =
 
 [testenv]
 deps =
-    pytest
+    pytest==4.6.6
     celery3120: celery[redis]==3.1.20
     celery3120: kombu==3.0.37
     celery3120: redis==2.10.6