Author: sseifert
Date: Thu May 21 14:09:21 2015
New Revision: 1680879
URL: http://svn.apache.org/r1680879
Log:
SLING-4381 enable metrics logging for nosql adapter and disable event
distribution
Added:
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/adapter/MetricsNoSqlAdapterWrapper.java
(with props)
Modified:
sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlResourceProviderFactory.java
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java
Modified:
sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlResourceProviderFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlResourceProviderFactory.java?rev=1680879&r1=1680878&r2=1680879&view=diff
==============================================================================
---
sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlResourceProviderFactory.java
(original)
+++
sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlResourceProviderFactory.java
Thu May 21 14:09:21 2015
@@ -30,10 +30,12 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceProviderFactory;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.nosql.couchbase.client.CouchbaseClient;
+import org.apache.sling.nosql.generic.adapter.MetricsNoSqlAdapterWrapper;
import org.apache.sling.nosql.generic.adapter.NoSqlAdapter;
import
org.apache.sling.nosql.generic.resource.AbstractNoSqlResourceProviderFactory;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.event.EventAdmin;
+import org.slf4j.LoggerFactory;
/**
* {@link ResourceProviderFactory} implementation that uses couchbase as
@@ -50,7 +52,7 @@ import org.osgi.service.event.EventAdmin
public class CouchbaseNoSqlResourceProviderFactory extends
AbstractNoSqlResourceProviderFactory {
/**
- * Couchbase Client ID for Couchbase Resource Provier
+ * Couchbase Client ID for Couchbase Resource Provider
*/
public static final String COUCHBASE_CLIENT_ID =
"sling-resourceprovider-couchbase";
@@ -78,7 +80,8 @@ public class CouchbaseNoSqlResourceProvi
@Override
protected NoSqlAdapter getNoSqlAdapter() {
- return noSqlAdapter;
+ // enable call logging and metrics for {@link CouchbaseNoSqlAdapter}
+ return new MetricsNoSqlAdapterWrapper(noSqlAdapter,
LoggerFactory.getLogger(CouchbaseNoSqlAdapter.class));
}
@Override
Added:
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/adapter/MetricsNoSqlAdapterWrapper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/adapter/MetricsNoSqlAdapterWrapper.java?rev=1680879&view=auto
==============================================================================
---
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/adapter/MetricsNoSqlAdapterWrapper.java
(added)
+++
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/adapter/MetricsNoSqlAdapterWrapper.java
Thu May 21 14:09:21 2015
@@ -0,0 +1,111 @@
+/*
+ * 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.sling.nosql.generic.adapter;
+
+import java.util.Iterator;
+
+import org.slf4j.Logger;
+
+/**
+ * Wrapper for {@link NoSqlAdapter} that enables logging and time counting for
each call.
+ */
+public final class MetricsNoSqlAdapterWrapper implements NoSqlAdapter {
+
+ private final NoSqlAdapter delegate;
+ private final Logger logger;
+
+ public MetricsNoSqlAdapterWrapper(NoSqlAdapter delegate, Logger logger) {
+ this.delegate = delegate;
+ this.logger = logger;
+ }
+
+ public boolean validPath(String path) {
+ return delegate.validPath(path);
+ }
+
+ public NoSqlData get(String path) {
+ Metrics metrics = new Metrics();
+ try {
+ return delegate.get(path);
+ }
+ finally {
+ metrics.finish("get({})", path);
+ }
+ }
+
+ public Iterator<NoSqlData> getChildren(String parentPath) {
+ Metrics metrics = new Metrics();
+ try {
+ return delegate.getChildren(parentPath);
+ }
+ finally {
+ metrics.finish("getChildren({})", parentPath);
+ }
+ }
+
+ public boolean store(NoSqlData data) {
+ Metrics metrics = new Metrics();
+ try {
+ return delegate.store(data);
+ }
+ finally {
+ metrics.finish("store({})", data.getPath());
+ }
+ }
+
+ public boolean deleteRecursive(String path) {
+ Metrics metrics = new Metrics();
+ try {
+ return delegate.deleteRecursive(path);
+ }
+ finally {
+ metrics.finish("deleteRecursive({})", path);
+ }
+ }
+
+ public Iterator<NoSqlData> query(String query, String language) {
+ Metrics metrics = new Metrics();
+ try {
+ return delegate.query(query, language);
+ }
+ finally {
+ metrics.finish("query({})", query);
+ }
+ }
+
+ private class Metrics {
+
+ private long startTime;
+
+ public Metrics() {
+ if (logger.isDebugEnabled()) {
+ startTime = System.currentTimeMillis();
+ }
+ }
+
+ public void finish(String message, Object... data) {
+ if (logger.isDebugEnabled()) {
+ long duration = System.currentTimeMillis() - startTime;
+ logger.debug(message + " (" + duration + "ms)", data);
+ }
+ }
+
+ }
+
+}
Propchange:
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/adapter/MetricsNoSqlAdapterWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/adapter/MetricsNoSqlAdapterWrapper.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Thu May 21 14:09:21 2015
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange:
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/adapter/MetricsNoSqlAdapterWrapper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java?rev=1680879&r1=1680878&r2=1680879&view=diff
==============================================================================
---
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java
(original)
+++
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java
Thu May 21 14:09:21 2015
@@ -223,7 +223,6 @@ public class NoSqlResourceProvider imple
private void notifyAdded(String path) {
final Dictionary<String, Object> props = new Hashtable<String,
Object>();
props.put(SlingConstants.PROPERTY_PATH, path);
- props.put("event.distribute", "");
final Event event = new Event(SlingConstants.TOPIC_RESOURCE_ADDED,
props);
this.eventAdmin.postEvent(event);
}
@@ -231,7 +230,6 @@ public class NoSqlResourceProvider imple
private void notifyUpdated(String path) {
final Dictionary<String, Object> props = new Hashtable<String,
Object>();
props.put(SlingConstants.PROPERTY_PATH, path);
- props.put("event.distribute", "");
final Event event = new Event(SlingConstants.TOPIC_RESOURCE_CHANGED,
props);
this.eventAdmin.postEvent(event);
}
@@ -239,7 +237,6 @@ public class NoSqlResourceProvider imple
private void notifyRemoved(String path) {
final Dictionary<String, Object> props = new Hashtable<String,
Object>();
props.put(SlingConstants.PROPERTY_PATH, path);
- props.put("event.distribute", "");
final Event event = new Event(SlingConstants.TOPIC_RESOURCE_REMOVED,
props);
this.eventAdmin.postEvent(event);
}
