Fixed UWSGICollector.collect to return unique metrics.

Fixed registry_to_text format.

Author: Lispython

CHANGELOG.rst

@@ -0,0 +1,10 @@
+Version 0.0.4
+-------------
+
+* [BUGFIX] Fixed `UWSGICollector.collect`` to return unique metrics.
+* [BUGFIX] Fixed registry_to_text format.
+
+Version 0.0.2
+-------------
+
+* Initial version

MANIFEST.in

@@ -1,4 +1,5 @@
 include setup.py README.rst MANIFEST.in LICENSE *.txt
 recursive-include pyprometheus/ *
 graft tests
-global-exclude *~
+global-exclude *~
+global-exclude #*#

Makefile

@@ -21,6 +21,10 @@ clean-pyc:
 	find . -name '*~' -exec rm -f {} +
 	find . -name "__pycache__" -exec rm -rf {} +
 
+clean-dist:
+	rm -rf dist/*
+	rm -rf build/*
+
 help:
 	@echo "Available commands:"
 	@sed -n '/^[a-zA-Z0-9_.]*:/s/:.*//p' <Makefile | sort
@@ -29,7 +33,7 @@ help:
 release:
 	git tag -f v$(version) && git push origin v$(version)
 
-publish: clean-pyc
+publish: clean-pyc clean-dist
 	@echo "Create release $(version) and upload to pypi"
 
 	$(DOCKER_RUN_COMMAND) "python setup.py sdist bdist_wheel"

pyprometheus/__init__.py

@@ -18,7 +18,7 @@
 
 __license__ = "BSD, see LICENSE for more details"
 
-__version__ = '0.0.2'
+__version__ = '0.0.4'
 
 __version_info__ = list(map(int, __version__.split('.')))
 

pyprometheus/const.py

@@ -36,8 +36,7 @@ class Types(object):
 CONTENT_TYPE = 'text/plain; version=0.0.4; charset=utf-8'
 
 
-CREDITS = """
-# Python client for prometheus.io
+CREDITS = """# Python client for prometheus.io
 # http://github.com/Lispython/pyprometheus
 # Generated at {dt}
 """

pyprometheus/contrib/uwsgi_features.py

@@ -102,25 +102,34 @@ def collect(self):
 
         yield self.get_memory_samples()
 
-        for worker in uwsgi.workers():
-            for sample in self.get_worker_sample(worker):
-                yield sample
+        for x in self.get_workers_samples(uwsgi.workers()):
+            yield x
 
-    def get_worker_sample(self, worker):
+
+    def get_workers_samples(self, workers):
         """Read worker stats and create samples
 
         :param worker: worker stats
         """
         for name in ['requests', 'respawn_count', 'running_time',
-                     'exceptions', 'requests', 'delta_requests',
+                     'exceptions', 'delta_requests',
                      'rss', 'vsz', 'last_spawn', 'tx', 'avg_rt', 'signals']:
             metric = self._collectors["process:" + name]
-            yield metric.build_samples([(self._labels + (('id', worker['id']),), (  (TYPES.GAUGE, metric.name, '', self._labels + (('id', worker['id']),), worker[name]),  ))])
+
+            for worker in workers:
+                labels = self._labels + (('id', worker['id']),)
+                metric.add_sample(labels, metric.build_sample(labels,
+                                  (  (TYPES.GAUGE, metric.name, '', self._labels + (('id', worker['id']),), worker[name]),  )))
+
+            yield metric
 
         metric = self._collectors["process:status"]
-        yield metric.build_samples([(self._labels + (('id', worker['id']), ('status', worker['status'])),
-                                        (  (TYPES.GAUGE, metric.name, '', self._labels + (('id', worker['id']), ('status', worker['status'])), 1),  ))])
+        for worker in workers:
+            labels = self._labels + (('id', worker['id']), ('status', worker['status']))
+            metric.add_sample(labels, metric.build_sample(labels,
+                                (  (TYPES.GAUGE, metric.name, '', self._labels + (('id', worker['id']), ('status', worker['status'])), 1),  )))
 
+        yield metric
 
     def get_sample(self, name, value):
         """Create sample for given name and value

pyprometheus/utils/exposition.py

@@ -24,6 +24,7 @@ def registry_to_text(registry):
         output.append(collector.text_export_header)
         for sample in samples:
             output.append(sample.export_str)
+    output.append('')
     return '\n'.join(output)
 
 

tests/test_registry.py

@@ -124,3 +124,8 @@ def test_base_registry(storage_cls, measure_time):
                 assert test1 == test2
             else:
                 assert test1.split()[:-1] == test2.split()[:-1]
+
+    metrics_count = map(lambda x: x.split(' ')[2],
+                        filter(lambda x: x.startswith('# HELP'), [x for x in registry_to_text(registry).split('\n')]))
+
+    assert len(metrics_count) == len(set(metrics_count))

tests/test_uwsgi_collector.py

@@ -21,13 +21,19 @@ def test_uwsgi_collector():
     registry.register(uwsgi_collector)
 
     collectors = dict([(x.name, x) for x in registry.collect()])
-    assert len(registry_to_text(registry).split('\n')) == 63
+
+    metrics_count = sorted(map(lambda x: x.split(' ')[2],
+                           filter(lambda x: x.startswith('# HELP'), [x for x in registry_to_text(registry).split('\n')])))
+
+    assert len(metrics_count) == len(set(metrics_count))
+
+    assert len(registry_to_text(registry).split('\n')) == 60
 
     assert collectors['uwsgi_namespace:buffer_size_bytes'].get_samples()[0].value == uwsgi.buffer_size
     assert collectors['uwsgi_namespace:processes_total'].get_samples()[0].value == uwsgi.numproc
     assert collectors['uwsgi_namespace:requests_total'].get_samples()[0].value == uwsgi.total_requests()
 
-    for name in ['requests', 'respawn_count', 'running_time', 'exceptions', 'requests', 'delta_requests']:
+    for name in ['requests', 'respawn_count', 'running_time', 'exceptions', 'delta_requests']:
         assert collectors['uwsgi_namespace:process:{0}'.format(name)].get_samples()[0].value == uwsgi.workers()[0][name]
 
     assert uwsgi_collector.metric_name("test") == "uwsgi_namespace:test"