Merge branch 'master' into master

regunathb · Apr 25, 2017 · a7be96d · a7be96d
2 parents e16dd17 + 71217c1
commit a7be96d
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 2 deletions.
diff --git a/api/src/main/java/com/flipkart/poseidon/api/APILegoSet.java b/api/src/main/java/com/flipkart/poseidon/api/APILegoSet.java
@@ -21,6 +21,7 @@
 import com.flipkart.poseidon.core.RequestContext;
 import com.flipkart.poseidon.ds.trie.KeyWrapper;
 import com.flipkart.poseidon.ds.trie.Trie;
+import com.flipkart.poseidon.helpers.MetricsHelper;
 import com.flipkart.poseidon.legoset.PoseidonLegoSet;
 import com.flipkart.poseidon.metrics.Metrics;
 import com.flipkart.poseidon.pojos.EndpointPOJO;
@@ -106,7 +107,7 @@ public Buildable getBuildable(Request request) throws LegoSetException, ElementN
 
             String name = pojo.getName();
             if (name != null && !name.isEmpty()) {
-                poseidonRequest.setAttribute(TIMER_CONTEXT, Metrics.getRegistry().timer("poseidon.api." + name + "." + httpMethod).time());
+                poseidonRequest.setAttribute(TIMER_CONTEXT, Metrics.getRegistry().timer(MetricsHelper.getApiTimerMetricsName(name, httpMethod)).time());
             }
         }
 

diff --git a/container/src/main/java/com/flipkart/poseidon/filters/HystrixContextFilter.java b/container/src/main/java/com/flipkart/poseidon/filters/HystrixContextFilter.java
@@ -18,8 +18,10 @@
 
 import com.flipkart.poseidon.api.Configuration;
 import com.flipkart.poseidon.api.HeaderConfiguration;
+import com.flipkart.poseidon.constants.RequestConstants;
 import com.flipkart.poseidon.core.RequestContext;
 import com.flipkart.poseidon.handlers.http.utils.StringUtils;
+import com.flipkart.poseidon.helpers.MetricsHelper;
 import com.flipkart.poseidon.metrics.Metrics;
 import com.flipkart.poseidon.serviceclients.ServiceClientConstants;
 import com.flipkart.poseidon.serviceclients.ServiceContext;
@@ -70,7 +72,9 @@ private void ingestResponseBasedMetrics(ServletResponse response) {
         // Ingest API response status codes for HttpServletResponse
         if (response instanceof HttpServletResponse && !StringUtils.isNullOrEmpty(RequestContext.get(ENDPOINT_NAME))) {
             String status = (((HttpServletResponse) response).getStatus() / 100) + "XX";
-            Metrics.getRegistry().counter("poseidon.api." + RequestContext.get(ENDPOINT_NAME) + "." + status).inc();
+            Metrics.getRegistry()
+                    .counter(MetricsHelper.getStatusCodeMetricsName(RequestContext.get(ENDPOINT_NAME), RequestContext.get(RequestConstants.METHOD), status))
+                    .inc();
         }
     }
 

diff --git a/container/src/main/java/com/flipkart/poseidon/helpers/MetricsHelper.java b/container/src/main/java/com/flipkart/poseidon/helpers/MetricsHelper.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 Flipkart Internet, pvt ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.flipkart.poseidon.helpers;
+
+/**
+ * Created by shubham.srivastava on 19/04/17.
+ */
+public class MetricsHelper {
+
+    private static String BASE_METRICS_NAME = "poseidon.api.";
+    private static String DEFAULT_DELIMITER = ".";
+
+    public static String getStatusCodeMetricsName(String endpoint, String method, String status) {
+        return new StringBuilder(BASE_METRICS_NAME)
+                .append(endpoint)
+                .append(DEFAULT_DELIMITER)
+                .append(method)
+                .append(DEFAULT_DELIMITER)
+                .append(status)
+                .toString();
+    }
+
+    public static String getApiTimerMetricsName(String endpoint, String method) {
+        return new StringBuilder(BASE_METRICS_NAME)
+                .append(endpoint)
+                .append(DEFAULT_DELIMITER)
+                .append(method)
+                .toString();
+    }
+
+}