[dropwizard-metrics] 01/05: Merge tag 'upstream/3.1.2'

Christopher Hoskin christopher.hoskin at gmail.com
Sat Nov 26 13:24:59 UTC 2016


This is an automated email from the git hooks/post-receive script.

grinorcole-guest pushed a commit to branch master
in repository dropwizard-metrics.

commit 0800286097ee8557c3d98bb63a12d0a63753edd9
Merge: e2b18e7 e646677
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Sat Nov 26 10:45:05 2016 +0000

    Merge tag 'upstream/3.1.2'
    
    Upstream version 3.1.2

 .gitignore                                         |   1 +
 .travis.yml                                        |   6 +-
 README.md                                          |   4 +-
 docs/source/_themes/metrics/layout.html            |   1 +
 docs/source/_themes/metrics/theme.conf             |   1 +
 docs/source/about/contributors.rst                 |   1 +
 docs/source/about/release-notes.rst                |  11 -
 docs/source/conf.py                                |  11 +-
 docs/source/getting-started.rst                    | 132 ++++++--
 docs/source/manual/core.rst                        |   6 +-
 docs/source/manual/graphite.rst                    |  13 +
 docs/source/manual/httpclient.rst                  |  12 +-
 docs/source/manual/jersey.rst                      |  67 +++-
 docs/source/manual/jetty.rst                       |   3 +-
 docs/source/manual/log4j.rst                       |  29 +-
 docs/source/manual/servlet.rst                     |  25 +-
 docs/source/manual/servlets.rst                    |  43 ++-
 docs/source/manual/third-party.rst                 |  24 +-
 metrics-annotation/pom.xml                         |   2 +-
 .../codahale/metrics/annotation/CachedGauge.java   |  53 +++
 .../com/codahale/metrics/annotation/Counted.java   |  53 +++
 .../metrics/annotation/ExceptionMetered.java       |  14 +-
 .../com/codahale/metrics/annotation/Gauge.java     |   6 +-
 .../com/codahale/metrics/annotation/Metered.java   |  12 +-
 .../com/codahale/metrics/annotation/Metric.java    |  63 ++++
 .../com/codahale/metrics/annotation/Timed.java     |  12 +-
 metrics-benchmarks/README.md                       |  24 ++
 metrics-benchmarks/findbugs-exclude.xml            |   8 +
 metrics-benchmarks/pom.xml                         |  51 ++-
 .../metrics/benchmarks/CounterBenchmark.java       |  40 ++-
 .../metrics/benchmarks/MeterBenchmark.java         |  40 ++-
 .../metrics/benchmarks/ReservoirBenchmark.java     |  71 ++--
 metrics-core/pom.xml                               |   2 +-
 .../codahale/metrics/DefaultObjectNameFactory.java |  31 ++
 .../metrics/ExponentiallyDecayingReservoir.java    |  26 +-
 .../metrics/InstrumentedExecutorService.java       | 205 ++++++++++++
 .../InstrumentedScheduledExecutorService.java      | 291 ++++++++++++++++
 .../metrics/InstrumentedThreadFactory.java         |  73 ++++
 .../com/codahale/metrics/JmxAttributeGauge.java    |  17 +-
 .../java/com/codahale/metrics/JmxReporter.java     | 112 ++++---
 .../com/codahale/metrics/JvmAttributeGaugeSet.java |   1 +
 .../java/com/codahale/metrics/MetricRegistry.java  |  20 +-
 .../com/codahale/metrics/ObjectNameFactory.java    |   8 +
 .../main/java/com/codahale/metrics/Reporter.java   |   8 +
 .../com/codahale/metrics/ScheduledReporter.java    |  71 +++-
 .../java/com/codahale/metrics/Slf4jReporter.java   | 289 ++++++++++++----
 .../metrics/SlidingTimeWindowReservoir.java        |   6 +-
 .../codahale/metrics/SlidingWindowReservoir.java   |   2 +-
 .../main/java/com/codahale/metrics/Snapshot.java   | 145 ++------
 .../src/main/java/com/codahale/metrics/Timer.java  |   6 +-
 .../com/codahale/metrics/UniformReservoir.java     |   2 +-
 .../{Snapshot.java => UniformSnapshot.java}        |  83 ++---
 .../{Snapshot.java => WeightedSnapshot.java}       | 163 ++++-----
 .../java/com/codahale/metrics/CachedGaugeTest.java |   2 +-
 .../test/java/com/codahale/metrics/ClockTest.java  |   4 +-
 .../com/codahale/metrics/ConsoleReporterTest.java  |   2 +-
 .../java/com/codahale/metrics/CounterTest.java     |   2 +-
 .../java/com/codahale/metrics/CsvReporterTest.java |   2 +-
 .../metrics/DefaultObjectNameFactoryTest.java      |  24 ++
 .../com/codahale/metrics/DerivativeGaugeTest.java  |   2 +-
 .../test/java/com/codahale/metrics/EWMATest.java   |   4 +-
 .../ExponentiallyDecayingReservoirTest.java        |  83 ++++-
 .../java/com/codahale/metrics/HistogramTest.java   |   2 +-
 .../metrics/InstrumentedExecutorServiceTest.java   |  56 ++++
 .../InstrumentedScheduledExecutorServiceTest.java  | 263 +++++++++++++++
 .../metrics/InstrumentedThreadFactoryTest.java     |  91 +++++
 .../codahale/metrics/JmxAttributeGaugeTest.java    |   2 +-
 .../java/com/codahale/metrics/JmxReporterTest.java |  66 +++-
 .../codahale/metrics/JvmAttributeGaugeSetTest.java |   2 +-
 .../java/com/codahale/metrics/ManualClock.java     |   4 +
 .../codahale/metrics/MeterApproximationTest.java   |   4 +-
 .../test/java/com/codahale/metrics/MeterTest.java  |   4 +-
 .../com/codahale/metrics/MetricFilterTest.java     |   2 +-
 .../com/codahale/metrics/MetricRegistryTest.java   |   7 +-
 .../java/com/codahale/metrics/RatioGaugeTest.java  |   2 +-
 .../metrics/SharedMetricRegistriesTest.java        |   2 +-
 .../com/codahale/metrics/Slf4jReporterTest.java    | 316 +++++++++++++-----
 .../metrics/SlidingTimeWindowReservoirTest.java    |   2 +-
 .../metrics/SlidingWindowReservoirTest.java        |   2 +-
 .../test/java/com/codahale/metrics/TimerTest.java  |   4 +-
 .../com/codahale/metrics/UniformReservoirTest.java |   2 +-
 ...{SnapshotTest.java => UniformSnapshotTest.java} |  49 ++-
 .../com/codahale/metrics/WeightedSnapshotTest.java | 217 ++++++++++++
 metrics-ehcache/pom.xml                            |   6 +-
 .../metrics/ehcache/InstrumentedEhcache.java       |  62 ++--
 .../InstrumentedCacheDecoratorFactoryTest.java     |   2 +-
 .../metrics/ehcache/InstrumentedEhcacheTest.java   |   2 +-
 metrics-ganglia/pom.xml                            |   4 +-
 .../codahale/metrics/ganglia/GangliaReporter.java  | 130 +++++---
 .../metrics/ganglia/GangliaReporterTest.java       |  12 +
 metrics-graphite/pom.xml                           |  14 +-
 .../com/codahale/metrics/graphite/Graphite.java    | 108 ++++--
 .../metrics/graphite/GraphiteRabbitMQ.java         | 167 ++++++++++
 .../metrics/graphite/GraphiteReporter.java         |  39 ++-
 .../codahale/metrics/graphite/GraphiteSender.java  |  46 +++
 .../com/codahale/metrics/graphite/GraphiteUDP.java | 117 +++++++
 .../codahale/metrics/graphite/PickledGraphite.java | 366 +++++++++++++++++++++
 .../metrics/graphite/GraphiteRabbitMQTest.java     | 127 +++++++
 .../metrics/graphite/GraphiteReporterTest.java     |  58 +++-
 .../codahale/metrics/graphite/GraphiteTest.java    |  93 +++++-
 .../metrics/graphite/PickledGraphiteTest.java      | 202 ++++++++++++
 metrics-healthchecks/pom.xml                       |   2 +-
 .../metrics/health/HealthCheckRegistry.java        |   2 +-
 .../health/SharedHealthCheckRegistries.java        |  46 +++
 .../metrics/health/HealthCheckRegistryTest.java    |   2 +-
 .../codahale/metrics/health/HealthCheckTest.java   |   2 +-
 .../metrics/health/SharedMetricRegistriesTest.java |  54 +++
 .../health/jvm/ThreadDeadlockHealthCheckTest.java  |   2 +-
 .../pom.xml                                        |  20 +-
 .../InstrumentedNClientConnManager.java            |  55 ++++
 .../InstrumentedNHttpClientBuilder.java            |  85 +++++
 .../InstrumentedHttpClientsTest.java               |  20 +-
 metrics-httpclient/pom.xml                         |   4 +-
 .../httpclient/InstrumentedClientConnManager.java  |  76 -----
 .../metrics/httpclient/InstrumentedHttpClient.java |  91 -----
 .../InstrumentedHttpClientConnectionManager.java   | 105 ++++++
 .../httpclient/InstrumentedHttpClients.java        |  35 ++
 .../InstrumentedHttpRequestExecutor.java           |  53 +++
 .../httpclient/InstrumentedRequestDirector.java    |  74 -----
 ...nstrumentedHttpClientConnectionManagerTest.java |  23 ++
 ...tTest.java => InstrumentedHttpClientsTest.java} |   7 +-
 metrics-jdbi/pom.xml                               |   4 +-
 .../jdbi/InstrumentedTimingCollectorTest.java      |   2 +-
 metrics-jersey/pom.xml                             |   8 +-
 .../metrics/jersey/SingletonMetricsJerseyTest.java |   4 +-
 metrics-jersey2/pom.xml                            |  64 ++++
 ...trumentedResourceMethodApplicationListener.java | 250 ++++++++++++++
 .../codahale/metrics/jersey2/MetricsFeature.java   |  49 +++
 .../jersey2/SingletonMetricsJerseyTest.java        | 109 ++++++
 .../jersey2/resources/InstrumentedResource.java    |  37 +++
 metrics-jetty8/pom.xml                             |   2 +-
 .../jetty8/InstrumentedQueuedThreadPool.java       |   8 +-
 {metrics-jetty9 => metrics-jetty9-legacy}/pom.xml  |  12 +-
 .../jetty9/InstrumentedConnectionFactory.java      |  43 +++
 .../metrics/jetty9/InstrumentedHandler.java        |  98 +++++-
 .../jetty9/InstrumentedQueuedThreadPool.java       |   6 +
 .../jetty9/InstrumentedConnectionFactoryTest.java  |   2 +-
 .../metrics/jetty9/InstrumentedHandlerTest.java    |   8 +-
 metrics-jetty9/pom.xml                             |   6 +-
 .../metrics/jetty9/InstrumentedHandler.java        | 102 ++++--
 .../jetty9/InstrumentedQueuedThreadPool.java       |   6 +
 .../jetty9/InstrumentedConnectionFactoryTest.java  |   2 +-
 .../metrics/jetty9/InstrumentedHandlerTest.java    |   8 +-
 metrics-json/pom.xml                               |   2 +-
 .../com/codahale/metrics/json/MetricsModule.java   |  26 +-
 .../metrics/json/HealthCheckModuleTest.java        |   2 +-
 .../codahale/metrics/json/MetricsModuleTest.java   |   8 +-
 metrics-jvm/pom.xml                                |   2 +-
 .../metrics/jvm/CachedThreadStatesGaugeSet.java    |  53 +++
 .../codahale/metrics/jvm/ClassLoadingGaugeSet.java |  47 +++
 .../codahale/metrics/jvm/MemoryUsageGaugeSet.java  |  45 ++-
 .../codahale/metrics/jvm/ThreadStatesGaugeSet.java |  18 +-
 .../metrics/jvm/BufferPoolMetricSetTest.java       |   2 +-
 .../metrics/jvm/ClassLoadingGaugeSetTest.java      |  36 ++
 .../metrics/jvm/FileDescriptorRatioGaugeTest.java  |   2 +-
 .../metrics/jvm/GarbageCollectorMetricSetTest.java |   2 +-
 .../metrics/jvm/MemoryUsageGaugeSetTest.java       |  75 ++++-
 .../metrics/jvm/ThreadDeadlockDetectorTest.java    |   2 +-
 .../com/codahale/metrics/jvm/ThreadDumpTest.java   |   2 +-
 .../metrics/jvm/ThreadStatesGaugeSetTest.java      |  13 +-
 metrics-log4j/pom.xml                              |   6 +-
 .../metrics/log4j/InstrumentedAppenderTest.java    |  49 ++-
 {metrics-logback => metrics-log4j2}/pom.xml        |  21 +-
 .../metrics/log4j2/InstrumentedAppender.java       | 116 +++++++
 .../metrics/log4j2}/InstrumentedAppenderTest.java  |  78 +++--
 metrics-logback/pom.xml                            |   4 +-
 .../metrics/logback/InstrumentedAppender.java      |  14 +-
 .../metrics/logback/InstrumentedAppenderTest.java  |  73 +++-
 metrics-servlet/pom.xml                            |   2 +-
 .../servlet/AbstractInstrumentedFilter.java        |  21 +-
 .../servlet/InstrumentedFilterContextListener.java |   2 +-
 metrics-servlets/pom.xml                           |   2 +-
 .../codahale/metrics/servlets/AdminServlet.java    |  19 +-
 .../servlets/AdminServletContextListener.java      |   6 +-
 .../metrics/servlets/HealthCheckServlet.java       |   4 +-
 .../codahale/metrics/servlets/MetricsServlet.java  |  86 +++--
 .../metrics/servlets/ThreadDumpServlet.java        |  20 +-
 .../metrics/servlets/AdminServletTest.java         |   4 +-
 .../metrics/servlets/HealthCheckServletTest.java   |   2 +-
 .../MetricsServletContextListenerTest.java         | 170 ++++++++++
 .../metrics/servlets/MetricsServletTest.java       |  73 +++-
 .../codahale/metrics/servlets/PingServletTest.java |   2 +-
 .../metrics/servlets/ThreadDumpServletTest.java    |   2 +-
 pom.xml                                            |  71 +++-
 184 files changed, 6569 insertions(+), 1382 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dropwizard-metrics.git



More information about the pkg-java-commits mailing list