You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by rm...@apache.org on 2013/10/23 08:56:20 UTC
svn commit: r1534925 - in /incubator/sirona/trunk:
cdi/src/main/java/org/apache/sirona/cdi/internal/ cdi/src/test/resources/
collector/src/main/java/org/apache/sirona/collector/server/store/gauge/
collector/src/test/resources/ core/src/main/java/org/ap...
Author: rmannibucau
Date: Wed Oct 23 06:56:19 2013
New Revision: 1534925
URL: http://svn.apache.org/r1534925
Log:
using sirona.properties + documenting how to monitor cdi/jta without updating any code
Added:
incubator/sirona/trunk/cdi/src/test/resources/sirona.properties
- copied unchanged from r1534923, incubator/sirona/trunk/cdi/src/test/resources/commons-monitoring.properties
incubator/sirona/trunk/collector/src/test/resources/sirona.properties
- copied unchanged from r1534923, incubator/sirona/trunk/collector/src/test/resources/commons-monitoring.properties
incubator/sirona/trunk/cube/src/test/resources/sirona.properties
- copied unchanged from r1534923, incubator/sirona/trunk/cube/src/test/resources/commons-monitoring.properties
incubator/sirona/trunk/graphite/src/test/resources/sirona.properties
- copied unchanged from r1534923, incubator/sirona/trunk/graphite/src/test/resources/commons-monitoring.properties
incubator/sirona/trunk/jta/src/test/resources/sirona.properties
- copied unchanged from r1534923, incubator/sirona/trunk/jta/src/test/resources/commons-monitoring.properties
Removed:
incubator/sirona/trunk/cdi/src/test/resources/commons-monitoring.properties
incubator/sirona/trunk/collector/src/test/resources/commons-monitoring.properties
incubator/sirona/trunk/cube/src/test/resources/commons-monitoring.properties
incubator/sirona/trunk/graphite/src/test/resources/commons-monitoring.properties
incubator/sirona/trunk/jta/src/test/resources/commons-monitoring.properties
Modified:
incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/CommonsMonitoringPerformanceExtension.java
incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeStore.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Unit.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/BatchCounterDataStore.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryGaugeDataStore.java
incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/UnitTest.java
incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java
incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAGauges.java
incubator/sirona/trunk/reporting/pom.xml
incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java
incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java
incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/BaseMemoryGauge.java
incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/CPUGauge.java
incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java
incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java
incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java
incubator/sirona/trunk/src/site/markdown/configuration.md
incubator/sirona/trunk/src/site/markdown/instrumentation.md
incubator/sirona/trunk/src/site/markdown/jta.md
incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/registration/WebMonitoringInitializer.java
incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/session/SessionGauge.java
Modified: incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/CommonsMonitoringPerformanceExtension.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/CommonsMonitoringPerformanceExtension.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/CommonsMonitoringPerformanceExtension.java (original)
+++ incubator/sirona/trunk/cdi/src/main/java/org/apache/sirona/cdi/internal/CommonsMonitoringPerformanceExtension.java Wed Oct 23 06:56:19 2013
@@ -41,7 +41,7 @@ public class CommonsMonitoringPerformanc
private static final String PERFORMANCE_MARKER = "performance";
- private final boolean enabled = Configuration.is(Configuration.COMMONS_MONITORING_PREFIX + "cdi.enabled", true);
+ private final boolean enabled = Configuration.is(Configuration.CONFIG_PROPERTY_PREFIX + "cdi.enabled", true);
private final Monitored binding = newAnnotation(Monitored.class);
private final Map<Class<? extends Annotation>, Annotation> otherBindings = new HashMap<Class<? extends Annotation>, Annotation>();
Modified: incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeStore.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeStore.java (original)
+++ incubator/sirona/trunk/collector/src/main/java/org/apache/sirona/collector/server/store/gauge/CollectorGaugeStore.java Wed Oct 23 06:56:19 2013
@@ -40,7 +40,7 @@ public class CollectorGaugeStore impleme
try {
delegateClass = Class.class.cast(
CollectorGaugeStore.class.getClassLoader().loadClass( // use this classloader and not TCCL to avoid issues
- Configuration.getProperty(Configuration.COMMONS_MONITORING_PREFIX + "collector.gauge.store-class", InMemoryGaugeDataStore.class.getName())));
+ Configuration.getProperty(Configuration.CONFIG_PROPERTY_PREFIX + "collector.gauge.store-class", InMemoryGaugeDataStore.class.getName())));
} catch (final ClassNotFoundException e) {
throw new MonitoringException(e);
}
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java Wed Oct 23 06:56:19 2013
@@ -43,12 +43,12 @@ import java.util.logging.Logger;
public final class Configuration {
private static final Logger LOGGER = Logger.getLogger(Configuration.class.getName());
- public static final String COMMONS_MONITORING_PREFIX = "org.apache.sirona.";
+ public static final String CONFIG_PROPERTY_PREFIX = "org.apache.sirona.";
private static final Map<Class<?>, Object> SINGLETONS = new ConcurrentHashMap<Class<?>, Object>();
private static final Collection<ToDestroy> INSTANCES = new ArrayList<ToDestroy>();
- private static final String DEFAULT_CONFIGURATION_FILE = "commons-monitoring.properties";
+ private static final String DEFAULT_CONFIGURATION_FILE = "sirona.properties";
private static Thread shutdownHook = null;
@@ -66,12 +66,13 @@ public final class Configuration {
}
private static InputStream findConfiguration() throws FileNotFoundException {
- final String filename = System.getProperty(COMMONS_MONITORING_PREFIX + "configuration", DEFAULT_CONFIGURATION_FILE);
+ final String filename = System.getProperty(CONFIG_PROPERTY_PREFIX + "configuration", DEFAULT_CONFIGURATION_FILE);
if (new File(filename).exists()) {
return new FileInputStream(filename);
}
- return ClassLoaders.current().getResourceAsStream(filename);
+ // use core classloader and not TCCL to avoid to use app loader to load config
+ return Configuration.class.getClassLoader().getResourceAsStream(filename);
}
public static <T> T[] newInstances(final Class<T> api) {
@@ -132,7 +133,7 @@ public final class Configuration {
if (m.getAnnotation(Created.class) != null) {
m.invoke(instance);
} else if (m.getAnnotation(Destroying.class) != null) {
- if (shutdownHook == null == is(COMMONS_MONITORING_PREFIX + "shutdown.hook", true)) {
+ if (shutdownHook == null == is(CONFIG_PROPERTY_PREFIX + "shutdown.hook", true)) {
shutdownHook = new Thread() {
@Override
public void run() {
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Unit.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Unit.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Unit.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/counters/Unit.java Wed Oct 23 06:56:19 2013
@@ -46,7 +46,7 @@ public class Unit implements Comparable<
*/
public static class Time extends Unit {
public static final Unit NANOSECOND = new Unit("ns");
- public static final Unit MICROSECOND = new Unit("µs", NANOSECOND, 1000);
+ public static final Unit MICROSECOND = new Unit("us", NANOSECOND, 1000);
public static final Unit MILLISECOND = new Unit("ms", MICROSECOND, 1000);
public static final Unit SECOND = new Unit("s", MILLISECOND, 1000);
public static final Unit MINUTE = new Unit("min", SECOND, 60);
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/BatchCounterDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/BatchCounterDataStore.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/BatchCounterDataStore.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/BatchCounterDataStore.java Wed Oct 23 06:56:19 2013
@@ -31,7 +31,7 @@ public abstract class BatchCounterDataSt
protected BatchCounterDataStore() {
final String name = getClass().getSimpleName().toLowerCase(Locale.ENGLISH).replace("counterdatastore", "");
- final long period = Configuration.getInteger(Configuration.COMMONS_MONITORING_PREFIX + name + ".period", 60000);
+ final long period = Configuration.getInteger(Configuration.CONFIG_PROPERTY_PREFIX + name + ".period", 60000);
final ScheduledExecutorService ses = Executors.newSingleThreadScheduledExecutor(new DaemonThreadFactory(name + "-schedule-"));
final ScheduledFuture<?> future = ses.scheduleAtFixedRate(new BatchPushCountersTask(), period, period, TimeUnit.MILLISECONDS);
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryGaugeDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryGaugeDataStore.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryGaugeDataStore.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/InMemoryGaugeDataStore.java Wed Oct 23 06:56:19 2013
@@ -59,7 +59,7 @@ public class InMemoryGaugeDataStore impl
// no perf issues here normally since add is called not that often
protected static class FixedSizedMap extends ConcurrentSkipListMap<Long, Double> {
- private static final int MAX_SIZE = Configuration.getInteger(Configuration.COMMONS_MONITORING_PREFIX + "gauge.max-size", 100);
+ private static final int MAX_SIZE = Configuration.getInteger(Configuration.CONFIG_PROPERTY_PREFIX + "gauge.max-size", 100);
protected FixedSizedMap() {
// no-op
Modified: incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/UnitTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/UnitTest.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/UnitTest.java (original)
+++ incubator/sirona/trunk/core/src/test/java/org/apache/sirona/counters/UnitTest.java Wed Oct 23 06:56:19 2013
@@ -34,7 +34,7 @@ public class UnitTest {
public void derived() {
assertEquals(NANOSECOND, HOUR.getPrimary());
assertEquals(NANOSECOND, NANOSECOND.getDerived("ns"));
- assertEquals(MICROSECOND, NANOSECOND.getDerived("µs"));
+ assertEquals(MICROSECOND, NANOSECOND.getDerived("us"));
assertEquals(MILLISECOND, NANOSECOND.getDerived("ms"));
assertEquals(SECOND, NANOSECOND.getDerived("s"));
}
Modified: incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java (original)
+++ incubator/sirona/trunk/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java Wed Oct 23 06:56:19 2013
@@ -35,7 +35,7 @@ import static org.apache.sirona.jpa.JPAP
public class MonitoringPersistence implements PersistenceProvider {
public static final Role ROLE = new Role("jpa", Unit.Time.NANOSECOND);
- private static final String DELEGATE_PROVIDER_KEY = Configuration.COMMONS_MONITORING_PREFIX + "jpa.provider";
+ private static final String DELEGATE_PROVIDER_KEY = Configuration.CONFIG_PROPERTY_PREFIX + "jpa.provider";
private static final String DEFAULT_PROVIDER = System.getProperty(DELEGATE_PROVIDER_KEY);
private static final Class<?>[] PROXY_API = new Class<?>[] { EntityManagerFactory.class, Serializable.class};
Modified: incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAGauges.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAGauges.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAGauges.java (original)
+++ incubator/sirona/trunk/jta/src/main/java/org/apache/sirona/jta/JTAGauges.java Wed Oct 23 06:56:19 2013
@@ -35,7 +35,7 @@ public class JTAGauges implements GaugeF
@Override
public Gauge[] gauges() {
- final long period = Configuration.getInteger(Configuration.COMMONS_MONITORING_PREFIX + "gauge.jta.period", 4000);
+ final long period = Configuration.getInteger(Configuration.CONFIG_PROPERTY_PREFIX + "gauge.jta.period", 4000);
return new Gauge[] {
new JTAGauge(JTA_COMMITED, COMMITTED, period),
new JTAGauge(JTA_ROLLBACKED, ROLLBACKED, period),
Modified: incubator/sirona/trunk/reporting/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/pom.xml?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/pom.xml (original)
+++ incubator/sirona/trunk/reporting/pom.xml Wed Oct 23 06:56:19 2013
@@ -149,6 +149,7 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<port>${tomcatRunPort}</port>
<path>${tomcatRunPath}</path>
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java Wed Oct 23 06:56:19 2013
@@ -36,7 +36,7 @@ public class TemplateHelper {
renderHtml(template, Collections.<String, Object>emptyMap());
}
- public void renderHtml(final String template, final Map<String, ?> userParams) {
+ public void renderHtml(final String template, final Map<String, ? extends Object> userParams) {
Templates.htmlRender(writer, template, new MapBuilder<String, Object>().set(Map.class.cast(params)).set(Map.class.cast(userParams)).build());
}
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java Wed Oct 23 06:56:19 2013
@@ -46,7 +46,7 @@ import java.util.Map;
import java.util.Set;
public class JMXEndpoints {
- private static final boolean METHOD_INVOCATION_ALLOWED = Configuration.is(Configuration.COMMONS_MONITORING_PREFIX + "jmx.method.allowed", true);
+ private static final boolean METHOD_INVOCATION_ALLOWED = Configuration.is(Configuration.CONFIG_PROPERTY_PREFIX + "jmx.method.allowed", true);
private static final Map<String, Class<?>> WRAPPERS = new HashMap<String, Class<?>>();
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/BaseMemoryGauge.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/BaseMemoryGauge.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/BaseMemoryGauge.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/BaseMemoryGauge.java Wed Oct 23 06:56:19 2013
@@ -27,6 +27,6 @@ public abstract class BaseMemoryGauge im
@Override
public long period() {
- return Configuration.getInteger(Configuration.COMMONS_MONITORING_PREFIX + "gauge.memory.period", 4000);
+ return Configuration.getInteger(Configuration.CONFIG_PROPERTY_PREFIX + "gauge.memory.period", 4000);
}
}
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/CPUGauge.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/CPUGauge.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/CPUGauge.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/CPUGauge.java Wed Oct 23 06:56:19 2013
@@ -41,6 +41,6 @@ public class CPUGauge implements Gauge {
@Override
public long period() {
- return Configuration.getInteger(Configuration.COMMONS_MONITORING_PREFIX + "gauge.cpu.period", 4000);
+ return Configuration.getInteger(Configuration.CONFIG_PROPERTY_PREFIX + "gauge.cpu.period", 4000);
}
}
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java Wed Oct 23 06:56:19 2013
@@ -25,7 +25,7 @@ import java.util.Collection;
import java.util.Map;
public class CSVFormat extends MapFormat implements Format {
- private static final String SEPARATOR = Configuration.getProperty(Configuration.COMMONS_MONITORING_PREFIX + "csv.separator", ";");
+ private static final String SEPARATOR = Configuration.getProperty(Configuration.CONFIG_PROPERTY_PREFIX + "csv.separator", ";");
public static final String HEADER = "Monitor" + SEPARATOR + "Role" + SEPARATOR + toCsv(ATTRIBUTES_ORDERED_LIST);
@Override
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java Wed Oct 23 06:56:19 2013
@@ -29,12 +29,12 @@ import java.util.Set;
public class MonitoringReportingInitializer implements ServletContainerInitializer {
@Override
public void onStartup(final Set<Class<?>> classes, final ServletContext ctx) throws ServletException {
- final String activated = ctx.getInitParameter(Configuration.COMMONS_MONITORING_PREFIX + "reporting.activated");
+ final String activated = ctx.getInitParameter(Configuration.CONFIG_PROPERTY_PREFIX + "reporting.activated");
if ("false".equalsIgnoreCase(activated)) {
return;
}
- String mapping = ctx.getInitParameter(Configuration.COMMONS_MONITORING_PREFIX + "reporting.mapping");
+ String mapping = ctx.getInitParameter(Configuration.CONFIG_PROPERTY_PREFIX + "reporting.mapping");
if (mapping == null) {
mapping = "/monitoring";
}
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java Wed Oct 23 06:56:19 2013
@@ -44,7 +44,7 @@ public final class Templates {
velocityConfiguration.setProperty(RuntimeConstants.RUNTIME_REFERENCES_STRICT_ESCAPE, Boolean.TRUE.toString());
velocityConfiguration.setProperty(RuntimeConstants.RESOURCE_LOADER, "monitoring");
velocityConfiguration.setProperty(RuntimeConstants.VM_LIBRARY, "/templates/macro.vm");
- velocityConfiguration.setProperty(RESOURCE_LOADER_KEY, Configuration.getProperty(Configuration.COMMONS_MONITORING_PREFIX + "reporting.resource-loader", ClasspathResourceLoader.class.getName()));
+ velocityConfiguration.setProperty(RESOURCE_LOADER_KEY, Configuration.getProperty(Configuration.CONFIG_PROPERTY_PREFIX + "reporting.resource-loader", ClasspathResourceLoader.class.getName()));
Velocity.init(velocityConfiguration);
if (filterMapping.isEmpty()) {
Modified: incubator/sirona/trunk/src/site/markdown/configuration.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/configuration.md?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/configuration.md (original)
+++ incubator/sirona/trunk/src/site/markdown/configuration.md Wed Oct 23 06:56:19 2013
@@ -18,9 +18,9 @@ under the License.
-->
## Configuration features
### Location
-Configuration relies on `commons-monitoring.properties` file which should be found in the commons-monitoring-core classloader.
+Configuration relies on `sirona.properties` file which should be found in the commons-monitoring-core classloader.
-Note: you can change the file name using org.apache.sirona.configuration system property.
+Note: you can change the file name using `org.apache.sirona.configuration` system property.
### Utilities
Modified: incubator/sirona/trunk/src/site/markdown/instrumentation.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/instrumentation.md?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/instrumentation.md (original)
+++ incubator/sirona/trunk/src/site/markdown/instrumentation.md Wed Oct 23 06:56:19 2013
@@ -46,7 +46,15 @@ For instance:
Note: in some (old) CDI implementation you'll need to activate the monitoring interceptor: `org.apache.sirona.cdi.CommonsMonitoringInterceptor`.
-Note: we are working to make it configurable.
+You can configure it (without adding the `@Monitored` annotation) using <class|package>.cdi = performance
+
+For instance:
+
+```
+org.superbiz.MyService.cdi = performance
+# or for the whole package (recursive)
+org.superbiz.cdi = performance
+```
# Spring
Modified: incubator/sirona/trunk/src/site/markdown/jta.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/jta.md?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/jta.md (original)
+++ incubator/sirona/trunk/src/site/markdown/jta.md Wed Oct 23 06:56:19 2013
@@ -41,4 +41,16 @@ Then you need to add on the beans which
`org.apache.sirona.jta.JTAMonitored` (CDI beans) or the interceptor `org.apache.sirona.jta.JTAInterceptor`
(for EJB for instance it can be done through configuration, see ejb-jar.xml).
-Note: we are working to make it configurable - same note as for CDI module.
+To configure it and not modify your code you can use the `cdi` module and just add the `jta` in the list of values:
+
+You can configure it (without adding the `@Monitored` annotation) using <class|package>.cdi = performance
+
+For instance:
+
+```
+org.superbiz.MyService.cdi = jta
+# or for the whole package (recursive)
+org.superbiz.cdi = jta
+# and if you want both jta and performances:
+org.superbiz.MyService.cdi = performance,jta
+```
Modified: incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/registration/WebMonitoringInitializer.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/registration/WebMonitoringInitializer.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/registration/WebMonitoringInitializer.java (original)
+++ incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/registration/WebMonitoringInitializer.java Wed Oct 23 06:56:19 2013
@@ -31,7 +31,7 @@ import java.util.Set;
public class WebMonitoringInitializer implements ServletContainerInitializer {
@Override
public void onStartup(final Set<Class<?>> classes, final ServletContext ctx) throws ServletException {
- final String activated = ctx.getInitParameter(Configuration.COMMONS_MONITORING_PREFIX + "web.activated");
+ final String activated = ctx.getInitParameter(Configuration.CONFIG_PROPERTY_PREFIX + "web.activated");
if ("false".equalsIgnoreCase(activated)) {
return;
}
@@ -39,7 +39,7 @@ public class WebMonitoringInitializer im
ctx.addListener(MonitoringSessionListener.class);
ctx.addListener(GaugeDiscoveryListener.class);
- String monitoredUrls = ctx.getInitParameter(Configuration.COMMONS_MONITORING_PREFIX + "web.monitored-urls");
+ String monitoredUrls = ctx.getInitParameter(Configuration.CONFIG_PROPERTY_PREFIX + "web.monitored-urls");
if (monitoredUrls == null) {
monitoredUrls = "/*";
}
Modified: incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/session/SessionGauge.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/session/SessionGauge.java?rev=1534925&r1=1534924&r2=1534925&view=diff
==============================================================================
--- incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/session/SessionGauge.java (original)
+++ incubator/sirona/trunk/web/src/main/java/org/apache/sirona/web/session/SessionGauge.java Wed Oct 23 06:56:19 2013
@@ -57,6 +57,6 @@ public class SessionGauge implements Gau
@Override
public long period() {
- return Configuration.getInteger(Configuration.COMMONS_MONITORING_PREFIX + "gauge.sessions.period", 4000);
+ return Configuration.getInteger(Configuration.CONFIG_PROPERTY_PREFIX + "gauge.sessions.period", 4000);
}
}