Added tags for gunicorn

Author: chillaq

splitio/client/factory.py

@@ -1,7 +1,6 @@
 """A module for Split.io Factories."""
 import logging
 import threading
-import sys
 from collections import Counter
 
 from enum import Enum
@@ -419,9 +418,6 @@ def _build_in_memory_factory(api_key, cfg, sdk_url=None, events_url=None,  # pyl
     )
 
     telemetry_init_producer.record_config(cfg, extra_cfg)
-    if int(_get_uwsgi_worker_id()) > -1:
-        telemetry_init_producer.add_config_tag("initilization:uwsgi")
-        telemetry_init_producer.add_config_tag("uwsgi_worker:#" + _get_uwsgi_worker_id())
 
     if preforked_initialization:
         synchronizer.sync_all(max_retry_attempts=_MAX_RETRY_SYNC_ALL)
@@ -503,9 +499,6 @@ def _build_redis_factory(api_key, cfg):
     initialization_thread.start()
 
     telemetry_init_producer.record_config(cfg, {})
-    if int(_get_uwsgi_worker_id()) > -1:
-        telemetry_init_producer.add_config_tag("initilization:uwsgi")
-        telemetry_init_producer.add_config_tag("uwsgi_worker:#" + _get_uwsgi_worker_id())
 
     split_factory = SplitFactory(
         api_key,
@@ -622,13 +615,4 @@ def _get_active_and_redundant_count():
         redundant_factory_count += _INSTANTIATED_FACTORIES[item] - 1
         active_factory_count += _INSTANTIATED_FACTORIES[item]
     _INSTANTIATED_FACTORIES_LOCK.release()
-    return redundant_factory_count, active_factory_count
-
-def _get_uwsgi_worker_id():
-    try:
-        import uwsgi
-        _LOGGER.debug("uwsgi lib detected")
-        return str(uwsgi.worker_id())
-    except ModuleNotFoundError:
-        pass
-        return "-1"
+    return redundant_factory_count, active_factory_count

splitio/engine/telemetry.py

@@ -1,5 +1,9 @@
 """Telemetry engine classes."""
 import json
+import os
+
+import logging
+_LOGGER = logging.getLogger(__name__)
 
 from  splitio.storage.inmemmory import InMemoryTelemetryStorage
 from splitio.models.telemetry import CounterConstants
@@ -35,6 +39,10 @@ def __init__(self, telemetry_storage):
     def record_config(self, config, extra_config):
         """Record configurations."""
         self._telemetry_storage.record_config(config, extra_config)
+        current_app, app_worker_id = self._get_app_worker_id()
+        if  current_app is not None:
+            self.add_config_tag("initilization:" + current_app)
+            self.add_config_tag("worker:#" + app_worker_id)
 
     def record_ready_time(self, ready_time):
         """Record ready time."""
@@ -55,6 +63,20 @@ def add_config_tag(self, tag):
         """Record tag string."""
         self._telemetry_storage.add_config_tag(tag)
 
+    def _get_app_worker_id(self):
+        try:
+            import uwsgi
+            return "uwsgi", str(uwsgi.worker_id())
+        except ModuleNotFoundError:
+            _LOGGER.debug("NO uwsgi")
+            pass
+
+        if 'gunicorn' in os.environ.get("SERVER_SOFTWARE", ""):
+            return "gunicorn", str(os.getpid())
+        else:
+            return None, None
+
+
 class TelemetryEvaluationProducer(object):
     """Telemetry evaluation producer class."""