Merge pull request #55 from ErnestOrt/42-migrate-sb2

42 migrate sb2

Author: ErnestOrt

README.md

@@ -1,10 +1,6 @@
 # Trampoline [![Twitter](https://img.shields.io/twitter/follow/espadrine.svg?style=social&logo=twitter&label=Follow)](https://twitter.com/TrampolineSB)
 
 [![Build Status](https://travis-ci.org/stunstunstun/awesome-spring-boot.svg?branch=master)](https://travis-ci.org/stunstunstun/awesome-spring-boot)
-[![Wercker](https://img.shields.io/badge/spring--boot-1.5.3.RELEASE-brightgreen.svg)]()
-[![Wercker](https://img.shields.io/badge/java-8-brightgreen.svg)]()
-[![Wercker](https://img.shields.io/badge/gradle-3.5-brightgreen.svg)]()
-[![Maven metadata URI](https://img.shields.io/maven-metadata/v/http/central.maven.org/maven2/com/google/code/gson/gson/maven-metadata.xml.svg)]()
 
 *NOTE: If you want to use examples provided (microservice-example-gradle & microservice-example-maven), please, clone the repository instead of downloading release zip. They need .git folder due to git related plugins specified on pom.xml and build.gradle*
 
@@ -20,7 +16,7 @@ The aim is to **help during the course of developing an application based on the
 
 Also you will be able to:
 
-* Admin Spring Boot locally
+* Admin Spring Boot locally (fully support for v1.x and v2.x)
 * Use configurable Actuator Endpoints and VM arguments
 * Register nicroservices directly from a GIT url
 * Monitor memory usage for each instance, capturing their metrics every 30 seconds

microservice-example-gradle-v2x/service.log

@@ -1,6 +1,7 @@
 package org.ernest.applications.trampoline.collectors;
 
 import org.apache.commons.collections4.queue.CircularFifoQueue;
+import org.ernest.applications.trampoline.entities.Instance;
 import org.ernest.applications.trampoline.entities.Metrics;
 import org.ernest.applications.trampoline.exceptions.CreatingSettingsFolderException;
 import org.ernest.applications.trampoline.exceptions.ReadingEcosystemException;
@@ -33,8 +34,12 @@ public void collectMetrics() throws JSONException, InterruptedException, Creatin
 
         ecosystemManager.getEcosystem().getInstances().forEach(instance ->{
             try {
-                JSONObject metricsJson = new JSONObject(new RestTemplate().getForObject("http://127.0.0.1:" + instance.getPort() + instance.getActuatorPrefix() + "/metrics", String.class));
-                Metrics metrics = buildMetricsFromJsonResponse(metricsJson);
+                Metrics metrics;
+                try {
+                    metrics = buildMetricsFromJsonResponseV1x(instance);
+                }catch (Exception e){
+                    metrics = buildMetricsFromJsonResponseV2x(instance);
+                }
 
                 if (metricsMap.containsKey(instance.getId())) {
                     metricsMap.get(instance.getId()).add(metrics);
@@ -70,7 +75,9 @@ private void removeNotActiveInstances() {
         idsToBeDeleted.stream().forEach(id-> metricsMap.remove(id));
     }
 
-    private Metrics buildMetricsFromJsonResponse(JSONObject metricsJson) throws JSONException {
+    private Metrics buildMetricsFromJsonResponseV1x(Instance instance) throws JSONException {
+        JSONObject metricsJson = new JSONObject(new RestTemplate().getForObject("http://127.0.0.1:" + instance.getPort() + instance.getActuatorPrefix() + "/metrics", String.class));
+
         Metrics metrics = new Metrics();
         metrics.setTotalMemoryKB(Long.valueOf(metricsJson.get("mem").toString()));
         metrics.setFreeMemoryKB(Long.valueOf(metricsJson.get("mem.free").toString()));
@@ -81,4 +88,23 @@ private Metrics buildMetricsFromJsonResponse(JSONObject metricsJson) throws JSON
 
         return metrics;
     }
+
+    private Metrics buildMetricsFromJsonResponseV2x(Instance instance) throws JSONException {
+        Metrics metrics = new Metrics();
+        metrics.setTotalMemoryKB(getValueMetric(instance, "jvm.memory.max"));
+        metrics.setHeapKB(0L);
+        metrics.setInitHeapKB(0L);
+        metrics.setUsedHeapKB(getValueMetric(instance, "jvm.memory.used"));
+        metrics.setFreeMemoryKB(metrics.getTotalMemoryKB() - metrics.getUsedHeapKB());
+        metrics.setDate(new SimpleDateFormat("HH:mm:ss").format(new Date()));
+
+        return metrics;
+    }
+
+    private Long getValueMetric(Instance instance, String key) throws JSONException {
+        JSONObject metricsJson = new JSONObject(new RestTemplate().getForObject("http://127.0.0.1:" + instance.getPort() + instance.getActuatorPrefix() + "/metrics/"+key, String.class));
+        return Long.valueOf(metricsJson.getJSONArray("measurements").getJSONObject(0).getInt("value"));
+    }
 }
+
+

microservice-example-gradle-v2x/service.log.2018-03-18.0.gz

@@ -28,8 +28,34 @@ public List<TraceActuator> getTraces(String idInstance) throws CreatingSettingsF
         List<TraceActuator> traces = new ArrayList<>();
 
         Instance instance = ecosystemManager.getEcosystem().getInstances().stream().filter(i -> i.getId().equals(idInstance)).findAny().get();
-        JSONArray traceArrayJson = new JSONArray(new RestTemplate().getForObject("http://127.0.0.1:" + instance.getPort() + instance.getActuatorPrefix() + "/trace", String.class));
+        JSONArray traceArrayJson;
 
+        try {
+            traceArrayJson = new JSONArray(new RestTemplate().getForObject("http://127.0.0.1:" + instance.getPort() + instance.getActuatorPrefix() + "/trace", String.class));
+            buildTracesV1x(traces, traceArrayJson);
+        }catch (Exception e){
+            traceArrayJson = new JSONObject(new RestTemplate().getForObject("http://127.0.0.1:" + instance.getPort() + instance.getActuatorPrefix() + "/httptrace", String.class)).getJSONArray("traces");
+            buildTracesV2x(traces, traceArrayJson);
+        }
+
+        return traces;
+    }
+
+    private void buildTracesV2x(List<TraceActuator> traces, JSONArray traceArrayJson) throws JSONException {
+        for (int i = 0; i < traceArrayJson.length(); i++) {
+            JSONObject traceJson = traceArrayJson.getJSONObject(i);
+
+            org.ernest.applications.trampoline.entities.TraceActuator traceActuator = new org.ernest.applications.trampoline.entities.TraceActuator();
+            traceActuator.setDate(traceJson.getString("timestamp"));
+            traceActuator.setMethod(traceJson.getJSONObject("request").getString("method"));
+            traceActuator.setPath(traceJson.getJSONObject("request").getString("uri"));
+            traceActuator.setStatus(traceJson.getJSONObject("response").getString("status"));
+            traces.add(traceActuator);
+        }
+
+    }
+
+    private void buildTracesV1x(List<TraceActuator> traces, JSONArray traceArrayJson) throws JSONException {
         for (int i = 0; i < traceArrayJson.length(); i++) {
             JSONObject traceJson = traceArrayJson.getJSONObject(i);
 
@@ -40,7 +66,5 @@ public List<TraceActuator> getTraces(String idInstance) throws CreatingSettingsF
             traceActuator.setStatus(traceJson.getJSONObject("info").getJSONObject("headers").getJSONObject("response").getString("status"));
             traces.add(traceActuator);
         }
-
-        return traces;
     }
 }

microservice-example-maven-v2x/service.log

@@ -39,4 +39,14 @@ public String getStatus() {
     public void setStatus(String status) {
         this.status = status;
     }
+
+    @Override
+    public String toString() {
+        return "TraceActuator{" +
+                "date='" + date + '\'' +
+                ", method='" + method + '\'' +
+                ", path='" + path + '\'' +
+                ", status='" + status + '\'' +
+                '}';
+    }
 }