Merge "J-146: Lower the footprint of Jersey Monitoring for apps that are not used J-138: ExtendedMonitoringStatisticsListener is never called J-154: NPE in TimeWindowStatisticsImpl during WLS shutdown"

Author: Marek Potočiar

core-server/src/main/java/org/glassfish/jersey/server/ServerProperties.java

@@ -488,6 +488,21 @@ public final class ServerProperties {
      */
     public static final String MONITORING_STATISTICS_MBEANS_ENABLED = "jersey.config.server.monitoring.statistics.mbeans.enabled";
 
+    /**
+     * Interval (in {@code ms}) indicating how often will be monitoring statistics refreshed and
+     * {@link org.glassfish.jersey.server.monitoring.MonitoringStatisticsListener#onStatistics(org.glassfish.jersey.server.monitoring.MonitoringStatistics) onStatistics}
+     * method called.
+     * <p/>
+     * The default value is {@code 500}.
+     * <p/>
+     * The name of the configuration property is <tt>{@value}</tt>.
+     * <p/>
+     *
+     * @since 2.10
+     */
+    public static final String MONITORING_STATISTICS_REFRESH_INTERVAL =
+            "jersey.config.server.monitoring.statistics.refresh.interval";
+
     /**
      * {@link String} property that defines the application name.
      *

core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/ApplicationStatisticsImpl.java

@@ -50,7 +50,8 @@
  *
  * @author Miroslav Fuksa (miroslav.fuksa at oracle.com)
  */
-class ApplicationStatisticsImpl implements ApplicationStatistics {
+final class ApplicationStatisticsImpl implements ApplicationStatistics {
+
     private final ResourceConfig resourceConfig;
     private final Date startTime;
     private final Set<Class<?>> registeredClasses;
@@ -59,15 +60,15 @@ class ApplicationStatisticsImpl implements ApplicationStatistics {
 
     /**
      * Create a new application statistics instance.
+     *
      * @param resourceConfig Resource config of the application being monitored.
      * @param startTime Start time of the application (when initialization was finished).
      * @param registeredClasses Registered resource classes.
      * @param registeredInstances Registered resource instances.
      * @param providers Registered providers.
      */
-    ApplicationStatisticsImpl(ResourceConfig resourceConfig, Date startTime,
-                              Set<Class<?>> registeredClasses,
-                              Set<Object> registeredInstances, Set<Class<?>> providers) {
+    ApplicationStatisticsImpl(final ResourceConfig resourceConfig, final Date startTime, final Set<Class<?>> registeredClasses,
+                              final Set<Object> registeredInstances, final Set<Class<?>> providers) {
         this.resourceConfig = resourceConfig;
         this.startTime = startTime;
 

core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/ExceptionMapperStatisticsImpl.java

@@ -51,23 +51,29 @@
  *
  * @author Miroslav Fuksa (miroslav.fuksa at oracle.com)
  */
-class ExceptionMapperStatisticsImpl implements ExceptionMapperStatistics {
+final class ExceptionMapperStatisticsImpl implements ExceptionMapperStatistics {
 
     /**
      * Builder of exception mapper statistics.
      */
     static class Builder {
+
         private Map<Class<?>, Long> exceptionMapperExecutionCount = Maps.newHashMap();
         private long successfulMappings;
         private long unsuccessfulMappings;
         private long totalMappings;
 
+        private ExceptionMapperStatisticsImpl cached;
+
         /**
          * Add mappings.
+         *
          * @param success True if mappings were successful.
          * @param count Number of mappings.
          */
-        void addMapping(boolean success, int count) {
+        void addMapping(final boolean success, final int count) {
+            cached = null;
+
             totalMappings++;
             if (success) {
                 successfulMappings += count;
@@ -78,43 +84,46 @@ void addMapping(boolean success, int count) {
 
         /**
          * Add an execution of exception mapper.
+         *
          * @param mapper Exception mapper.
          * @param count Number of executions of the {@code mapper}.
          */
-        void addExceptionMapperExecution(Class<?> mapper, int count) {
+        void addExceptionMapperExecution(final Class<?> mapper, final int count) {
+            cached = null;
+
             Long cnt = exceptionMapperExecutionCount.get(mapper);
             cnt = cnt == null ? count : cnt + count;
             exceptionMapperExecutionCount.put(mapper, cnt);
         }
 
-
         /**
          * Build an instance of exception mapper statistics.
          *
          * @return New instance of exception mapper statistics.
          */
         public ExceptionMapperStatisticsImpl build() {
-            return new ExceptionMapperStatisticsImpl(Collections.unmodifiableMap(exceptionMapperExecutionCount),
-                    successfulMappings, unsuccessfulMappings, totalMappings);
+            if (cached == null) {
+                cached = new ExceptionMapperStatisticsImpl(Collections.unmodifiableMap(exceptionMapperExecutionCount),
+                        successfulMappings, unsuccessfulMappings, totalMappings);
+            }
+
+            return cached;
         }
     }
 
-
     private final Map<Class<?>, Long> exceptionMapperExecutionCount;
     private final long successfulMappings;
     private final long unsuccessfulMappings;
     private final long totalMappings;
 
-
-    private ExceptionMapperStatisticsImpl(Map<Class<?>, Long> exceptionMapperExecutionCount,
-                                         long successfulMappings, long unsuccessfulMappings, long totalMappings) {
+    private ExceptionMapperStatisticsImpl(final Map<Class<?>, Long> exceptionMapperExecutionCount, final long successfulMappings,
+                                          final long unsuccessfulMappings, final long totalMappings) {
         this.exceptionMapperExecutionCount = exceptionMapperExecutionCount;
         this.successfulMappings = successfulMappings;
         this.unsuccessfulMappings = unsuccessfulMappings;
         this.totalMappings = totalMappings;
     }
 
-
     @Override
     public Map<Class<?>, Long> getExceptionMapperExecutions() {
         return exceptionMapperExecutionCount;
@@ -141,5 +150,4 @@ public ExceptionMapperStatistics snapshot() {
         return this;
     }
 
-
 }

core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/ExecutionStatisticsImpl.java

@@ -56,19 +56,21 @@
  *
  * @author Miroslav Fuksa (miroslav.fuksa at oracle.com)
  */
-class ExecutionStatisticsImpl implements ExecutionStatistics {
+final class ExecutionStatisticsImpl implements ExecutionStatistics {
+
     /**
      * Builder of execution statistics.
      */
     static class Builder {
+
         private long lastStartTime;
         private final Map<Long, TimeWindowStatisticsImpl.Builder> intervalStatistics;
 
         /**
          * Create a new builder.
          */
         public Builder() {
-            this.intervalStatistics = new HashMap<Long, TimeWindowStatisticsImpl.Builder>(4);
+            this.intervalStatistics = new HashMap<>(6);
             addInterval(0, TimeUnit.MILLISECONDS);
             addInterval(1, TimeUnit.SECONDS);
             addInterval(15, TimeUnit.SECONDS);
@@ -77,20 +79,20 @@ public Builder() {
             addInterval(1, TimeUnit.HOURS);
         }
 
-        private void addInterval(long interval, TimeUnit timeUnit) {
+        private void addInterval(final long interval, final TimeUnit timeUnit) {
             final long intervalInMillis = timeUnit.toMillis(interval);
-            intervalStatistics.put(intervalInMillis,
-                    new TimeWindowStatisticsImpl.Builder(intervalInMillis, TimeUnit.MILLISECONDS));
+            intervalStatistics.put(intervalInMillis, new TimeWindowStatisticsImpl.Builder(intervalInMillis,
+                    TimeUnit.MILLISECONDS));
         }
 
-
         /**
          * Add execution of a target.
+         *
          * @param startTime (Unix timestamp format)
          * @param duration Duration of target execution in milliseconds.
          */
-        void addExecution(long startTime, long duration) {
-            for (TimeWindowStatisticsImpl.Builder statBuilder : intervalStatistics.values()) {
+        void addExecution(final long startTime, final long duration) {
+            for (final TimeWindowStatisticsImpl.Builder statBuilder : intervalStatistics.values()) {
                 statBuilder.addRequest(startTime, duration);
             }
 
@@ -99,23 +101,26 @@ void addExecution(long startTime, long duration) {
 
         /**
          * Build a new instance of execution statistics.
+         *
          * @return new instance of execution statistics.
          */
         public ExecutionStatisticsImpl build() {
-            Map<Long, TimeWindowStatistics> newIntervalStatistics = Maps.newHashMap();
-            for (Map.Entry<Long, TimeWindowStatisticsImpl.Builder> builderEntry : intervalStatistics.entrySet()) {
+            final Map<Long, TimeWindowStatistics> newIntervalStatistics = Maps.newHashMap();
+            for (final Map.Entry<Long, TimeWindowStatisticsImpl.Builder> builderEntry : intervalStatistics.entrySet()) {
                 newIntervalStatistics.put(builderEntry.getKey(), builderEntry.getValue().build());
             }
 
+            // cache when request rate is 0
+
             return new ExecutionStatisticsImpl(lastStartTime, Collections.unmodifiableMap(newIntervalStatistics));
         }
     }
 
+    static final ExecutionStatistics EMPTY = new Builder().build();
 
     private final Date lastStartTime;
     private final Map<Long, TimeWindowStatistics> timeWindowStatistics;
 
-
     @Override
     public Date getLastStartTime() {
         return lastStartTime;
@@ -132,7 +137,7 @@ public ExecutionStatistics snapshot() {
         return this;
     }
 
-    private ExecutionStatisticsImpl(long lastStartTime, Map<Long, TimeWindowStatistics> timeWindowStatistics) {
+    private ExecutionStatisticsImpl(final long lastStartTime, final Map<Long, TimeWindowStatistics> timeWindowStatistics) {
         this.lastStartTime = new Date(lastStartTime);
         this.timeWindowStatistics = timeWindowStatistics;
     }

core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/MonitoringAutodiscoverable.java

@@ -54,7 +54,7 @@
  * @author Miroslav Fuksa (miroslav.fuksa at oracle.com)
  */
 @ConstrainedTo(RuntimeType.SERVER)
-public class MonitoringAutodiscoverable implements ForcedAutoDiscoverable {
+public final class MonitoringAutodiscoverable implements ForcedAutoDiscoverable {
 
     @Override
     public void configure(final FeatureContext context) {

core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/MonitoringContainerListener.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -57,7 +57,7 @@
  *
  * @author Miroslav Fuksa (miroslav.fuksa at oracle.com)
  */
-public class MonitoringContainerListener implements ContainerLifecycleListener {
+public final class MonitoringContainerListener implements ContainerLifecycleListener {
 
     private volatile ApplicationEvent initFinishedEvent;
     private volatile ApplicationEventListener listener;