Re BrightcoveOS#531, this uses the gc based collection stats if they …

…exist, falling back to the ones we calculate
ceph · Feb 17, 2014 · b5daf58 · b5daf58
1 parent ce4c3f2
commit b5daf58
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/collectors/elasticsearch/elasticsearch.py b/src/collectors/elasticsearch/elasticsearch.py
@@ -247,8 +247,16 @@ def collect(self):
                     'collection_time_in_millis']
                 collection_time_in_millis += d['collection_time_in_millis']
             # calculate the totals, as they're absent in elasticsearch > 0.90.10
-            metrics['jvm.gc.collection.count'] = collection_count
-            metrics['jvm.gc.collection.time'] = collection_time_in_millis
+            if 'collection_count' in gc:
+                metrics['jvm.gc.collection.count'] = gc['collection_count']
+            else:
+                metrics['jvm.gc.collection.count'] = collection_count
+
+            k = 'collection_time_in_millis'
+            if k in gc:
+                metrics['jvm.gc.collection.time'] = gc[k]
+            else:
+                metrics['jvm.gc.collection.time'] = collection_time_in_millis
 
         #
         # thread_pool