Merge branch 'develop' with streams_pe_launchCount added

Author: bmwilli

streams-metric-exporter/src/main/java/streams/metric/exporter/error/StreamsTrackerErrorCode.java

@@ -17,22 +17,30 @@
 package streams.metric.exporter.error;
 
 public enum StreamsTrackerErrorCode {
-    UNSPECIFIED_ERROR(0, "Unspecified Error Code"), JMX_MALFORMED_URL(1,
-            "A JMX Malformed URL error has occured."), JMX_IOERROR(2,
+    UNSPECIFIED_ERROR(0, "Unspecified Error Code"),
+    JMX_MALFORMED_URL(1,
+            "A JMX Malformed URL error has occured."),
+    JMX_IOERROR(2,
             "A JMX IO Error has occured.  Usually means that the connection has been lost."),
 
     DOMAIN_NOT_FOUND(10,
-            "The specified domain name is not found on the Streams JMX Server specified"), INSTANCE_NOT_FOUND(
+            "The specified domain name is not found on the Streams JMX Server specified"), 
+    INSTANCE_NOT_FOUND(
             11,
-            "The specified streams instance was not found in the Streams domain"), JOB_NOT_FOUND(
+            "The specified streams instance was not found in the Streams domain"), 
+    JOB_NOT_FOUND(
             12, "Specified Streams job was not found in the Streams instance"),
 
     STREAMS_MONITOR_UNAVAILABLE(50,
-            "The Streams Monitor has not been created and initialized."), ALL_JOBS_NOT_AVAILABLE(
+            "The Streams Monitor has not been created and initialized."), 
+    ALL_JOBS_NOT_AVAILABLE(
             51,
-            "The Streams jobs are not available at this time.  The Streams instance does not exist."), ALL_METRICS_NOT_AVAILABLE(
+            "The Streams jobs are not available at this time.  The Streams instance does not exist."), 
+    ALL_METRICS_NOT_AVAILABLE(
             52,
-            "The Metrics for all jobs is not available at this time.  Either the JMX Connection or the Instance is not avaiable."),
+            "The Metrics for all jobs is not available at this time.  Either the JMX Connection or the Instance is not avaiable."), 
+    ALL_SNAPSHOTS_NOT_AVAILABLE(53,
+    "The Snapshots for all jobs is not available at thjis time.  Either the JMX Connection or the Instance is not available."),
 
     OTHER_ERROR(99, "Unspecified Error Code");
 

streams-metric-exporter/src/main/java/streams/metric/exporter/rest/resources/JobResource.java

@@ -86,10 +86,10 @@ public Response getJobHealth() throws StreamsTrackerException,
 
     }
 
-    @Path("snapshot")
+    @Path("snapshotnow")
     @GET
     @Produces(MediaType.APPLICATION_JSON)
-    public Response getJobSnapshot(
+    public Response getJobSnapshotNow(
             @DefaultValue("1") @QueryParam("depth") int maximumDepth,
             @DefaultValue("true") @QueryParam("static") boolean includeStaticAttributes)
             throws StreamsTrackerException, WebApplicationException {
@@ -137,6 +137,34 @@ public Response getJobMetrics() throws StreamsTrackerException,
         return r;
 
     }
+    
+    @Path("snapshot")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getJobSnapshot() throws StreamsTrackerException,
+            WebApplicationException, JsonProcessingException {
+        ObjectMapper om = new ObjectMapper();
+
+        Response r = null;
+
+        // Create return format
+        JobSnapshotBody body = new JobSnapshotBody(ji.getLastSnapshotRefresh(),
+                ji.getLastSnapshotFailure(), ji.isLastSnapshotRefreshFailed(),
+                ji.getJobSnapshot());
+
+        // If the metrics refresh failed, use NOT_MODIFIED so client can
+        // understand we are sending cached info
+        // More cached than it usually is :)
+        if (ji.isLastSnapshotRefreshFailed()) {
+            r = Response.status(Response.Status.NOT_MODIFIED)
+                    .entity(om.writeValueAsString(body)).build();
+        } else {
+            r = Response.status(Response.Status.OK)
+                    .entity(om.writeValueAsString(body)).build();
+        }
+        return r;
+
+    }    
 
     /******** SUPPORTING CLASSES FOR OUTPUT FORMATTING ********/
     private class JobMetricsBody {
@@ -154,4 +182,21 @@ public JobMetricsBody(Date lastMetricsRefresh, Date lastMetricsFailure,
             this.jobMetrics = jobMetrics;
         }
     }
+    
+    /******** SUPPORTING CLASSES FOR OUTPUT FORMATTING ********/
+    private class JobSnapshotBody {
+        public Date lastSnapshotRefresh = null;
+        public Date lastSnapshotFailure = null;
+        public boolean lastSnapshotRefreshFailed = false;
+        @JsonRawValue
+        public String jobSnapshot;
+
+        public JobSnapshotBody(Date lastSnapshotRefresh, Date lastSnapshotFailure,
+                boolean lastSnapshotRefreshFailed, String jobSnapshot) {
+            this.lastSnapshotRefresh = lastSnapshotRefresh;
+            this.lastSnapshotFailure = lastSnapshotFailure;
+            this.lastSnapshotRefreshFailed = lastSnapshotRefreshFailed;
+            this.jobSnapshot = jobSnapshot;
+        }
+    }
 }

streams-metric-exporter/src/main/java/streams/metric/exporter/rest/resources/RootResource.java

@@ -96,6 +96,19 @@ public Response getAllJobMetrics() throws StreamsTrackerException,
         return Response.status(200).entity(jobTracker.getAllJobMetrics())
                 .build();
     }
+    
+    // If instance is not started or exists, then returns 404
+    @Path("snapshots")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response getAllJobSnapshots() throws StreamsTrackerException,
+            WebApplicationException {
+        StreamsInstanceTracker jobTracker = StreamsInstanceTracker
+                .getInstance();
+
+        return Response.status(200).entity(jobTracker.getAllJobSnapshots())
+                .build();
+    }
 
     @Path("joblist/")
     @GET
@@ -130,11 +143,15 @@ public Response getJobList() throws StreamsTrackerException,
             UriBuilder mub = jub.clone();
             URI metricsUri = mub.path("metrics").build();
             j.put("metrics", metricsUri.toASCIIString());
-
+            
             UriBuilder sub = jub.clone();
             URI snapshotUri = sub.path("snapshot").build();
             j.put("snapshot", snapshotUri.toASCIIString());
 
+            UriBuilder snub = jub.clone();
+            URI snapshotNowUri = snub.path("snapshotnow").build();
+            j.put("snapshotnow", snapshotNowUri.toASCIIString());
+
             jlist.add(j);
         }
 

streams-metric-exporter/src/main/java/streams/metric/exporter/rest/serializers/StreamsInstanceJobMonitorSerializer.java

@@ -67,7 +67,9 @@ public void serialize(StreamsInstanceTracker monitor,
         jgen.writeBooleanField("jobMetricsAvailable",
                 monitor.metricsAvailable());
         jgen.writeStringField("instanceResourceMetricsLastUpdateTime", convertTime(monitor.getInstanceResourceMetricsLastUpdated()));
-
+        jgen.writeBooleanField("jobSnapshotsAvailable",
+                monitor.snapshotsAvailable());
+        
         if (monitor.jobsAvailable()) {
             Iterator<Map.Entry<BigInteger, JobInfo>> it = monitor
                     .getCurrentJobMap().entrySet().iterator();
@@ -84,8 +86,14 @@ public void serialize(StreamsInstanceTracker monitor,
                         .toString());
                 jgen.writeStringField("applicationName", entry.getValue()
                         .getApplicationName());
-                jgen.writeStringField("metrics", entry.getValue()
-                        .getJobMetrics());
+//                jgen.writeStringField("metrics", entry.getValue()
+//                        .getJobMetrics());
+//                jgen.writeStringField("snapshot", entry.getValue()
+//                        .getJobSnapshot());
+                jgen.writeFieldName("metrics");
+                jgen.writeRawValue(entry.getValue().getJobMetrics());
+                jgen.writeFieldName("snapshot");
+                jgen.writeRawValue(entry.getValue().getJobSnapshot());
 
                 jgen.writeEndObject();
                 jgen.writeEndObject();