#48 listen to connect tim

johrstrom · Mar 15, 2019 · 4f203de · 4f203de
1 parent b11788c
commit 4f203de
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # 0.3.0
 
 * #50 - listening to latency
+* #49 - listening to idle time
+* #48 - listening to connection time
 
 # 0.2.0
 

diff --git a/README.md b/README.md
@@ -75,6 +75,7 @@ This is a matrix of what metric types can measure what metrics.  If you configur
 | Response size  | x | x |   |   |   |
 | Latency        | x | x |   |   |   |
 | Idle time      | x | x |   |   |   |
+| Connect time   | x | x |   |   |   |
 | Count total    |   |   | x |   |   |
 | Failure total  |   |   | x |   |   |
 | Success total  |   |   | x |   |   |

diff --git a/docs/imgs/listener_full.png b/docs/imgs/listener_full.png
diff --git a/src/main/java/com/github/johrstrom/listener/ListenerCollectorConfig.java b/src/main/java/com/github/johrstrom/listener/ListenerCollectorConfig.java
@@ -26,6 +26,7 @@ public enum Measurable {
 		ResponseSize,
 		Latency,
 		IdleTime,
+		ConnectTime,
 
 		// for count type updater
 		SuccessTotal,

diff --git a/src/main/java/com/github/johrstrom/listener/PrometheusListener.java b/src/main/java/com/github/johrstrom/listener/PrometheusListener.java
@@ -182,6 +182,7 @@ protected void makeNewCollectors() {
 				case ResponseTime:
 				case Latency:
 				case IdleTime:
+				case ConnectTime:
 					updater = new AggregatedTypeUpdater(config);
 					break;
 				default:

diff --git a/src/main/java/com/github/johrstrom/listener/updater/AggregatedTypeUpdater.java b/src/main/java/com/github/johrstrom/listener/updater/AggregatedTypeUpdater.java
@@ -55,6 +55,8 @@ protected long measure(SampleEvent event) {
 			return result.getLatency();
 		case IdleTime:
 			return result.getIdleTime();
+		case ConnectTime:
+			return result.getConnectTime();
 		default:
 			return 0;
 		}

diff --git a/src/test/java/com/github/johrstrom/listener/PrometheusListenerTest.java b/src/test/java/com/github/johrstrom/listener/PrometheusListenerTest.java
@@ -141,6 +141,9 @@ public void updateAllTypes() {
 	    	case "test_hist_idle_time":
 	    		assertOnHistogram(reg.getOrCreateAndRegister(cfg), idleTime*samplesOccured, samplesOccured, idleTime);
 	    		break;
+	    	case "test_hist_connect_time":
+	    		assertOnHistogram(reg.getOrCreateAndRegister(cfg), connectTime*samplesOccured, samplesOccured, connectTime);
+	    		break;
 
 	    	// summaries
 	    	case "test_summary_rtime":
@@ -155,6 +158,9 @@ public void updateAllTypes() {
 	    	case "test_summary_idle_time":
 	    		assertOnSummary(reg.getOrCreateAndRegister(cfg), idleTime*samplesOccured, samplesOccured, idleTime);
 	    		break;
+	    	case "test_summary_connect_time":
+	    		assertOnSummary(reg.getOrCreateAndRegister(cfg), connectTime*samplesOccured, samplesOccured, connectTime);
+	    		break;
 
 			default:
 				Assert.assertTrue( name + " triggered untested switch case", false);

diff --git a/src/test/java/com/github/johrstrom/test/TestUtilities.java b/src/test/java/com/github/johrstrom/test/TestUtilities.java
@@ -172,6 +172,9 @@ public static List<ListenerCollectorConfig> fullListListener(){
 
     	cfg = redoNameAndMeasuring(cfg, "test_hist_idle_time", Measurable.IdleTime);
     	list.add(cfg);
+
+    	cfg = redoNameAndMeasuring(cfg, "test_hist_connect_time", Measurable.ConnectTime);
+    	list.add(cfg);
 
     	// -------- summaries
     	cfg = new ListenerCollectorConfig(simpleSummaryCfg());
@@ -187,6 +190,9 @@ public static List<ListenerCollectorConfig> fullListListener(){
     	cfg = redoNameAndMeasuring(cfg, "test_summary_idle_time", Measurable.IdleTime);
     	list.add(cfg);
 
+    	cfg = redoNameAndMeasuring(cfg, "test_summary_connect_time", Measurable.ConnectTime);
+    	list.add(cfg);
+
     	return list;
     }