Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5D95818E8A for ; Tue, 16 Jun 2015 22:45:52 +0000 (UTC) Received: (qmail 89079 invoked by uid 500); 16 Jun 2015 22:45:52 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 88991 invoked by uid 500); 16 Jun 2015 22:45:52 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 88905 invoked by uid 99); 16 Jun 2015 22:45:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jun 2015 22:45:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BBDADE3C4F; Tue, 16 Jun 2015 22:45:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Tue, 16 Jun 2015 22:45:52 -0000 Message-Id: <33893ca6820e49a6af6d7de7b60813bf@git.apache.org> In-Reply-To: <539482e1a99144538d55bee86dd58f0d@git.apache.org> References: <539482e1a99144538d55bee86dd58f0d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cassandra git commit: Add logback metrics Add logback metrics patch by yukim; reviewed by Jeremiah Jordan for CASSANDRA-9378 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/514dcd94 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/514dcd94 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/514dcd94 Branch: refs/heads/trunk Commit: 514dcd944c400a8a540962f54e16561d56496425 Parents: 6c4c146 Author: Yuki Morishita Authored: Thu Jun 4 10:39:15 2015 -0500 Committer: Yuki Morishita Committed: Tue Jun 16 17:39:00 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/logback.xml | 9 +- lib/licenses/metrics-logback-3.1.0.txt | 202 +++++++++++++++++++ lib/metrics-logback-3.1.0.jar | Bin 0 -> 4130 bytes .../metrics/CassandraMetricsRegistry.java | 23 +-- .../cassandra/service/CassandraDaemon.java | 25 ++- 6 files changed, 240 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/514dcd94/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1138fc2..9dccd84 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ Merged from 2.0: * Periodically submit background compaction tasks (CASSANDRA-9592) * Set HAS_MORE_PAGES flag to false when PagingState is null (CASSANDRA-9571) + * Add logback metrics (CASSANDRA-9378) 2.2.0-rc1 http://git-wip-us.apache.org/repos/asf/cassandra/blob/514dcd94/conf/logback.xml ---------------------------------------------------------------------- diff --git a/conf/logback.xml b/conf/logback.xml index e170d41..eb2dcd1 100644 --- a/conf/logback.xml +++ b/conf/logback.xml @@ -43,10 +43,17 @@ %-5level %date{HH:mm:ss,SSS} %msg%n - + + + + http://git-wip-us.apache.org/repos/asf/cassandra/blob/514dcd94/lib/licenses/metrics-logback-3.1.0.txt ---------------------------------------------------------------------- diff --git a/lib/licenses/metrics-logback-3.1.0.txt b/lib/licenses/metrics-logback-3.1.0.txt new file mode 100644 index 0000000..e4ba404 --- /dev/null +++ b/lib/licenses/metrics-logback-3.1.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2010-2012 Coda Hale and Yammer, Inc. + + Licensed 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. http://git-wip-us.apache.org/repos/asf/cassandra/blob/514dcd94/lib/metrics-logback-3.1.0.jar ---------------------------------------------------------------------- diff --git a/lib/metrics-logback-3.1.0.jar b/lib/metrics-logback-3.1.0.jar new file mode 100644 index 0000000..ce0bfbe Binary files /dev/null and b/lib/metrics-logback-3.1.0.jar differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/514dcd94/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java b/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java index 7038e99..26b9c07 100644 --- a/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java +++ b/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java @@ -22,9 +22,6 @@ import java.lang.reflect.Method; import java.util.Locale; import java.util.concurrent.TimeUnit; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.codahale.metrics.*; import javax.management.*; @@ -36,10 +33,9 @@ import javax.management.*; */ public class CassandraMetricsRegistry extends MetricRegistry { - protected static final Logger logger = LoggerFactory.getLogger(CassandraMetricsRegistry.class); - public static final CassandraMetricsRegistry Metrics = new CassandraMetricsRegistry(); - private MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer(); + + private final MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer(); private CassandraMetricsRegistry() { @@ -100,15 +96,12 @@ public class CassandraMetricsRegistry extends MetricRegistry try { mBeanServer.unregisterMBean(name.getMBeanName()); - } catch (InstanceNotFoundException | MBeanRegistrationException e) - { - logger.debug("Unable to remove mbean"); - } + } catch (Exception ignore) {} return removed; } - private void registerMBean(Metric metric, ObjectName name) + public void registerMBean(Metric metric, ObjectName name) { AbstractBean mbean; @@ -135,13 +128,7 @@ public class CassandraMetricsRegistry extends MetricRegistry try { mBeanServer.registerMBean(mbean, name); - } catch (InstanceAlreadyExistsException e) - { - logger.debug("Metric bean already exists", e); - } catch (MBeanRegistrationException | NotCompliantMBeanException e) - { - logger.debug("Unable to register metric bean", e); - } + } catch (Exception ignored) {} } public interface MetricMBean http://git-wip-us.apache.org/repos/asf/cassandra/blob/514dcd94/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index 70420a9..59ecca7 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -30,13 +30,18 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import javax.management.StandardMBean; import javax.management.remote.JMXConnectorServer; import javax.management.remote.JMXServiceURL; import javax.management.remote.rmi.RMIConnectorServer; +import com.codahale.metrics.Meter; +import com.codahale.metrics.MetricRegistryListener; +import com.codahale.metrics.SharedMetricRegistries; import com.google.common.util.concurrent.Uninterruptibles; +import org.apache.cassandra.metrics.DefaultNameFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +75,25 @@ public class CassandraDaemon public static final String MBEAN_NAME = "org.apache.cassandra.db:type=NativeAccess"; private static JMXConnectorServer jmxServer = null; - private static final Logger logger = LoggerFactory.getLogger(CassandraDaemon.class); + private static final Logger logger; + static { + // Need to register metrics before instrumented appender is created(first access to LoggerFactory). + SharedMetricRegistries.getOrCreate("logback-metrics").addListener(new MetricRegistryListener.Base() + { + @Override + public void onMeterAdded(String metricName, Meter meter) + { + // Given metricName consists of appender name in logback.xml + "." + metric name. + // We first separate appender name + int separator = metricName.lastIndexOf('.'); + String appenderName = metricName.substring(0, separator); + String metric = metricName.substring(separator + 1); // remove "." + ObjectName name = DefaultNameFactory.createMetricName(appenderName, metric, null).getMBeanName(); + CassandraMetricsRegistry.Metrics.registerMBean(meter, name); + } + }); + logger = LoggerFactory.getLogger(CassandraDaemon.class); + } private static void maybeInitJmx() {