Author: rmannibucau
Date: Tue Oct 15 09:31:41 2013
New Revision: 1532262
URL: http://svn.apache.org/r1532262
Log:
adding a session gauge to monitor the number of sessions and renaming old
session counter to session-durations which is more appropriated
Added:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/SessionGauge.java
Modified:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java
Modified:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java?rev=1532262&r1=1532261&r2=1532262&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java
(original)
+++
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java
Tue Oct 15 09:31:41 2013
@@ -36,8 +36,8 @@ public class WebMonitoringInitializer im
return;
}
- ctx.addListener(GaugeDiscoveryListener.class);
ctx.addListener(MonitoringSessionListener.class);
+ ctx.addListener(GaugeDiscoveryListener.class);
String monitoredUrls =
ctx.getInitParameter(Configuration.COMMONS_MONITORING_PREFIX +
"web.monitored-urls");
if (monitoredUrls == null) {
Modified:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java?rev=1532262&r1=1532261&r2=1532262&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java
(original)
+++
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java
Tue Oct 15 09:31:41 2013
@@ -28,16 +28,21 @@ import javax.servlet.http.HttpSessionEve
import javax.servlet.http.HttpSessionListener;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
public class MonitoringSessionListener implements HttpSessionListener,
ServletContextListener {
private final Map<String, StopWatch> watches = new
ConcurrentHashMap<String, StopWatch>();
+ private final AtomicLong sessionNumber = new AtomicLong(0);
+
private Counter counter;
+ private SessionGauge gauge;
@Override
public void sessionCreated(final HttpSessionEvent httpSessionEvent) {
final StopWatch watch = Repository.INSTANCE.start(counter);
watches.put(httpSessionEvent.getSession().getId(), watch);
+ sessionNumber.incrementAndGet();
}
@Override
@@ -46,6 +51,7 @@ public class MonitoringSessionListener i
if (watch != null) {
watch.stop();
}
+ sessionNumber.decrementAndGet();
}
@Override
@@ -54,11 +60,14 @@ public class MonitoringSessionListener i
if (contextPath == null || contextPath.isEmpty()) {
contextPath = "/";
}
- counter = Repository.INSTANCE.getCounter(new Counter.Key(new
Role("sessions", Unit.UNARY), "sessions-" + contextPath));
+ counter = Repository.INSTANCE.getCounter(new Counter.Key(new
Role("session-durations", Unit.Time.NANOSECOND), "session-durations-" +
contextPath));
+
+ gauge = new SessionGauge(contextPath, sessionNumber);
+ Repository.INSTANCE.addGauge(gauge);
}
@Override
public void contextDestroyed(final ServletContextEvent sce) {
- // no-op
+ Repository.INSTANCE.stopGauge(gauge.role());
}
}
Added:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/SessionGauge.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/SessionGauge.java?rev=1532262&view=auto
==============================================================================
---
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/SessionGauge.java
(added)
+++
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/SessionGauge.java
Tue Oct 15 09:31:41 2013
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.commons.monitoring.web.session;
+
+import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.configuration.Configuration;
+import org.apache.commons.monitoring.counters.Unit;
+import org.apache.commons.monitoring.gauges.Gauge;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+public class SessionGauge implements Gauge {
+ private final Role role;
+ private final AtomicLong counter;
+
+ public SessionGauge(final String ctx, final AtomicLong counter) {
+ this.role = new Role("sessions-" + ctx, Unit.UNARY);
+ this.counter = counter;
+ }
+
+ @Override
+ public Role role() {
+ return role;
+ }
+
+ @Override
+ public double value() {
+ return counter.get();
+ }
+
+ @Override
+ public long period() {
+ return
Configuration.getInteger(Configuration.COMMONS_MONITORING_PREFIX +
"gauge.sessions.period", 4000);
+ }
+}
