From b72ee31b7654713d94ba8f7f125d24c78e73c201 Mon Sep 17 00:00:00 2001 From: Prithvi Raj <p.r@uber.com> Date: Wed, 5 Oct 2016 14:44:21 -0400 Subject: [PATCH 1/2] Fix typo in configuration and add convenience setter for metricRegistry - dropwizard configuration users can easily set a dropwizard metricRegistry --- jaeger-core/src/main/java/com/uber/jaeger/Configuration.java | 5 +++++ .../main/java/com/uber/jaeger/dropwizard/Configuration.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/jaeger-core/src/main/java/com/uber/jaeger/Configuration.java b/jaeger-core/src/main/java/com/uber/jaeger/Configuration.java index 156002e54..ff45be740 100644 --- a/jaeger-core/src/main/java/com/uber/jaeger/Configuration.java +++ b/jaeger-core/src/main/java/com/uber/jaeger/Configuration.java @@ -98,10 +98,15 @@ synchronized public io.opentracing.Tracer getTracer() { return tracer; } + @Deprecated public void setStatsFactor(StatsFactory statsFactory) { this.statsFactory = statsFactory; } + public void setStatsFactory(StatsFactory statsFactory) { + this.statsFactory = statsFactory; + } + /** * SamplerConfiguration allows to configure which sampler the tracer will use. */ diff --git a/jaeger-dropwizard/src/main/java/com/uber/jaeger/dropwizard/Configuration.java b/jaeger-dropwizard/src/main/java/com/uber/jaeger/dropwizard/Configuration.java index d72acc382..03a396907 100644 --- a/jaeger-dropwizard/src/main/java/com/uber/jaeger/dropwizard/Configuration.java +++ b/jaeger-dropwizard/src/main/java/com/uber/jaeger/dropwizard/Configuration.java @@ -21,6 +21,7 @@ */ package com.uber.jaeger.dropwizard; +import com.codahale.metrics.MetricRegistry; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -51,4 +52,8 @@ synchronized public Tracer getTracer() { } return super.getTracer(); } + + public void setMetricRegistry(MetricRegistry metricRegistry) { + setStatsFactory(new StatsFactory(metricRegistry)); + } } From a66b7575ee62d9da609044442a6ca688beddfe90 Mon Sep 17 00:00:00 2001 From: Prithvi Raj <p.r@uber.com> Date: Wed, 5 Oct 2016 14:51:07 -0400 Subject: [PATCH 2/2] Add javadoc --- jaeger-core/src/main/java/com/uber/jaeger/Configuration.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jaeger-core/src/main/java/com/uber/jaeger/Configuration.java b/jaeger-core/src/main/java/com/uber/jaeger/Configuration.java index ff45be740..948656021 100644 --- a/jaeger-core/src/main/java/com/uber/jaeger/Configuration.java +++ b/jaeger-core/src/main/java/com/uber/jaeger/Configuration.java @@ -98,6 +98,9 @@ synchronized public io.opentracing.Tracer getTracer() { return tracer; } + /** + * @deprecated Use {@link #setStatsFactory(StatsFactory)} instead + */ @Deprecated public void setStatsFactor(StatsFactory statsFactory) { this.statsFactory = statsFactory;