diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 2d08527..21e5aba 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.3.3 +current_version = 0.3.4 commit = False tag = False files = setup.py netuitive-statsd diff --git a/HISTORY.md b/HISTORY.md index 2bb8788..c282bab 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,8 @@ History ------- +Version 0.3.4 - Feb 16 2018 +--------------------------- +* Pull the latest Netuitive python client that contains a bug fix and improvement for handling element metrics lookup during adding a sample Version 0.3.3 - Jan 17 2018 --------------------------- diff --git a/netuitive-statsd b/netuitive-statsd index a6517ac..f5e8085 100755 --- a/netuitive-statsd +++ b/netuitive-statsd @@ -64,7 +64,7 @@ from setproctitle import setproctitle import libs # Constants -__version__ = "0.3.3" +__version__ = "0.3.4" __author__ = "Netuitive, Inc." __license__ = "Apache 2.0" diff --git a/requirements.txt b/requirements.txt index 1d3f97d..e14f0d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ wheel>=0.23.0 docopt -netuitive>=0.2.2 +netuitive>=0.3.2 configobj setproctitle docutils \ No newline at end of file diff --git a/setup.py b/setup.py index cd124af..fb1f9c7 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name='netuitive_statsd', - version='0.3.3', + version='0.3.4', description="Netuitive StatsD server", long_description='Netuitive StatsD server\n', author="Netuitive", diff --git a/tests/test_poster.py b/tests/test_poster.py index ac6e0b9..1c27610 100755 --- a/tests/test_poster.py +++ b/tests/test_poster.py @@ -121,6 +121,7 @@ def test_single_counter(self): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = json.loads(json.dumps( poster.elements.elements, default=lambda o: o.__dict__, @@ -186,6 +187,7 @@ def test_single_counter_with_tags(self): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = json.loads(json.dumps( poster.elements.elements, default=lambda o: o.__dict__, @@ -260,6 +262,7 @@ def test_single_counter_with_rate(self): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = json.loads(json.dumps( poster.elements.elements, default=lambda o: o.__dict__, @@ -325,6 +328,7 @@ def test_single_timer(self): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = json.loads(json.dumps( poster.elements.elements, default=lambda o: o.__dict__, @@ -392,6 +396,7 @@ def test_single_gauge(self): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = json.loads(json.dumps( poster.elements.elements, default=lambda o: o.__dict__, @@ -457,6 +462,7 @@ def test_single_histogram(self): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = json.loads(json.dumps( poster.elements.elements, default=lambda o: o.__dict__, @@ -524,6 +530,7 @@ def test_single_set(self): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = json.loads(json.dumps( poster.elements.elements, default=lambda o: o.__dict__, @@ -577,6 +584,7 @@ def test_mutliple_metrics(self): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() element = e.element @@ -812,6 +820,7 @@ def test_metric_type_change(self): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = json.loads(json.dumps( poster.elements.elements, default=lambda o: o.__dict__, @@ -878,6 +887,7 @@ def test_element_type_tag(self): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = json.loads(json.dumps( poster.elements.elements, default=lambda o: o.__dict__, @@ -943,6 +953,7 @@ def test_element_type(self): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = json.loads(json.dumps( poster.elements.elements, default=lambda o: o.__dict__, @@ -1008,6 +1019,7 @@ def test_metric_unit_tag(self): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = json.loads(json.dumps( poster.elements.elements, default=lambda o: o.__dict__, @@ -1077,6 +1089,7 @@ def test_metric_unit_and_type_tag(self): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = json.loads(json.dumps( poster.elements.elements, default=lambda o: o.__dict__, @@ -1156,6 +1169,7 @@ def test_sample_cleared(self, mock_post): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = poster.elements @@ -1226,6 +1240,7 @@ def test_memory_safety(self, mock_logging): for ename in poster.elements.elements: e = poster.elements.elements[ename] e.prepare() + e.element.merge_metrics() j = poster.elements