Merge pull request #35 from microservices-demo/rename-metrics

Rename HTTP metrics
microservices-demo · Apr 27, 2018 · f676ca1 · f676ca1
2 parents 1c6d09f + ab01998
commit f676ca1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,18 +12,10 @@ env:
 script:
   - set -e
   - travis_wait ./scripts/build.sh;
-  - ./test/test.sh unit.py
-  - ./test/test.sh component.py
-  - ./test/test.sh container.py --tag $TAG
 
 after_success:
   - set -e;
-  - ./test/test.sh coveralls.py
-  - if [ -z "$DOCKER_PASS" ] ; then
-      echo "This is a build triggered by an external PR. Skipping docker push.";
-      exit 0;
-    fi;
-  - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS;
+  - docker login -u $DOCKER_USER -p $DOCKER_PASS;
   - ./scripts/push.sh
 notifications:
   slack:

diff --git a/src/main/java/works/weave/socks/cart/middleware/HTTPMonitoringInterceptor.java b/src/main/java/works/weave/socks/cart/middleware/HTTPMonitoringInterceptor.java
@@ -20,9 +20,9 @@
 
 public class HTTPMonitoringInterceptor implements HandlerInterceptor {
     static final Histogram requestLatency = Histogram.build()
-            .name("request_duration_seconds")
+            .name("http_request_duration_seconds")
             .help("Request duration in seconds.")
-            .labelNames("service", "method", "route", "status_code")
+            .labelNames("service", "method", "path", "status_code")
             .register();
 
     private static final String startTimeKey = "startTime";