From b985673462524acf3f43c916f9e981a617c063a5 Mon Sep 17 00:00:00 2001 From: Himanshu Gupta Date: Tue, 20 Aug 2019 15:25:53 -0700 Subject: [PATCH 1/6] LoggingEmitter: print event as json --- .../druid/java/util/emitter/core/LoggingEmitter.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java b/core/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java index 0fc9f83b15d7..f3d4edf0ad9f 100644 --- a/core/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java +++ b/core/src/main/java/org/apache/druid/java/util/emitter/core/LoggingEmitter.java @@ -95,28 +95,27 @@ public void emit(Event event) } } try { - final String message = "Event [%s]"; switch (level) { case TRACE: if (log.isTraceEnabled()) { - log.trace(message, jsonMapper.writeValueAsString(event)); + log.trace(jsonMapper.writeValueAsString(event)); } break; case DEBUG: if (log.isDebugEnabled()) { - log.debug(message, jsonMapper.writeValueAsString(event)); + log.debug(jsonMapper.writeValueAsString(event)); } break; case INFO: if (log.isInfoEnabled()) { - log.info(message, jsonMapper.writeValueAsString(event)); + log.info(jsonMapper.writeValueAsString(event)); } break; case WARN: - log.warn(message, jsonMapper.writeValueAsString(event)); + log.warn(jsonMapper.writeValueAsString(event)); break; case ERROR: - log.error(message, jsonMapper.writeValueAsString(event)); + log.error(jsonMapper.writeValueAsString(event)); break; } } From b68e79aef2218fcdae9ef44810738da7879ca21c Mon Sep 17 00:00:00 2001 From: Himanshu Gupta Date: Tue, 20 Aug 2019 15:30:21 -0700 Subject: [PATCH 2/6] use DefaultRequestLogEventBuilderFactory in emitting request logger by default --- .../server/log/DefaultRequestLogEventBuilderFactory.java | 5 +++++ .../druid/server/log/EmittingRequestLoggerProvider.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java b/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java index 08eb2b72830d..0bfac679c499 100644 --- a/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java +++ b/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java @@ -32,6 +32,11 @@ public final class DefaultRequestLogEventBuilderFactory implements RequestLogEve private static final DefaultRequestLogEventBuilderFactory INSTANCE = new DefaultRequestLogEventBuilderFactory(); @JsonCreator + public static DefaultRequestLogEventBuilderFactory instance(String ignored) + { + return INSTANCE; + } + public static DefaultRequestLogEventBuilderFactory instance() { return INSTANCE; diff --git a/server/src/main/java/org/apache/druid/server/log/EmittingRequestLoggerProvider.java b/server/src/main/java/org/apache/druid/server/log/EmittingRequestLoggerProvider.java index 0f140f0ca2e8..9dbb93c2c5a8 100644 --- a/server/src/main/java/org/apache/druid/server/log/EmittingRequestLoggerProvider.java +++ b/server/src/main/java/org/apache/druid/server/log/EmittingRequestLoggerProvider.java @@ -42,7 +42,7 @@ public class EmittingRequestLoggerProvider implements RequestLoggerProvider @JsonProperty @NotNull - private RequestLogEventBuilderFactory requestLogEventBuilderFactory = null; + private RequestLogEventBuilderFactory requestLogEventBuilderFactory = DefaultRequestLogEventBuilderFactory.instance(); @JacksonInject @NotNull From d941d0a727c36e770c7a1872a18cefb9034051b3 Mon Sep 17 00:00:00 2001 From: Himanshu Gupta Date: Tue, 20 Aug 2019 21:56:39 -0700 Subject: [PATCH 3/6] print context in query metric as json --- .../util/emitter/service/ServiceMetricEvent.java | 2 +- .../org/apache/druid/query/DefaultQueryMetrics.java | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java b/core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java index d50ddf899591..65ddc70341cb 100644 --- a/core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java +++ b/core/src/main/java/org/apache/druid/java/util/emitter/service/ServiceMetricEvent.java @@ -146,7 +146,7 @@ public Builder setDimension(String dim, String[] values) return this; } - public Builder setDimension(String dim, String value) + public Builder setDimension(String dim, Object value) { userDims.put(dim, value); return this; diff --git a/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java index 4d5e3c5a71ac..5b00f7509e68 100644 --- a/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java @@ -19,7 +19,6 @@ package org.apache.druid.query; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import org.apache.druid.collections.bitmap.BitmapFactory; @@ -64,7 +63,7 @@ protected void checkModifiedFromOwnerThread() } } - protected void setDimension(String dimension, String value) + protected void setDimension(String dimension, Object value) { checkModifiedFromOwnerThread(); builder.setDimension(dimension, value); @@ -131,15 +130,7 @@ public void sqlQueryId(QueryType query) @Override public void context(QueryType query) { - try { - setDimension( - "context", - jsonMapper.writeValueAsString(query.getContext() == null ? ImmutableMap.of() : query.getContext()) - ); - } - catch (JsonProcessingException e) { - throw new RuntimeException(e); - } + setDimension("context", query.getContext() == null ? ImmutableMap.of() : query.getContext()); } @Override From 79b7bddf095034476f57cbb51517c75f3a36303b Mon Sep 17 00:00:00 2001 From: Himanshu Gupta Date: Wed, 21 Aug 2019 12:15:15 -0700 Subject: [PATCH 4/6] removed unused jsonMapper from DefaultQueryMetrics --- .../DefaultMovingAverageQueryMetrics.java | 7 ------- .../DefaultMovingAverageQueryMetricsFactory.java | 16 ++-------------- .../druid/indexing/kafka/KafkaIndexTaskTest.java | 3 +-- .../query/DefaultGenericQueryMetricsFactory.java | 16 ++-------------- .../apache/druid/query/DefaultQueryMetrics.java | 7 ------- .../groupby/DefaultGroupByQueryMetrics.java | 7 ------- .../DefaultGroupByQueryMetricsFactory.java | 16 ++-------------- .../DefaultTimeseriesQueryMetrics.java | 6 ------ .../DefaultTimeseriesQueryMetricsFactory.java | 16 ++-------------- .../query/topn/DefaultTopNQueryMetrics.java | 7 ------- .../topn/DefaultTopNQueryMetricsFactory.java | 16 ++-------------- .../druid/query/DefaultQueryMetricsTest.java | 5 ++--- .../groupby/DefaultGroupByQueryMetricsTest.java | 5 ++--- .../DefaultTimeseriesQueryMetricsTest.java | 5 ++--- .../query/topn/DefaultTopNQueryMetricsTest.java | 5 ++--- .../appenderator/AppenderatorTester.java | 3 +-- .../server/AsyncQueryForwardingServletTest.java | 4 ++-- .../apache/druid/server/QueryResourceTest.java | 16 ++++++++-------- .../server/coordination/ServerManagerTest.java | 2 +- .../druid/sql/calcite/util/CalciteTests.java | 4 ++-- 20 files changed, 33 insertions(+), 133 deletions(-) diff --git a/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/DefaultMovingAverageQueryMetrics.java b/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/DefaultMovingAverageQueryMetrics.java index 8dced39ccc97..8ff5ade430e9 100644 --- a/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/DefaultMovingAverageQueryMetrics.java +++ b/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/DefaultMovingAverageQueryMetrics.java @@ -19,19 +19,12 @@ package org.apache.druid.query.movingaverage; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.druid.query.DefaultQueryMetrics; import org.apache.druid.query.DruidMetrics; public class DefaultMovingAverageQueryMetrics extends DefaultQueryMetrics implements MovingAverageQueryMetrics { - - public DefaultMovingAverageQueryMetrics(ObjectMapper jsonMapper) - { - super(jsonMapper); - } - @Override public void query(MovingAverageQuery query) { diff --git a/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/DefaultMovingAverageQueryMetricsFactory.java b/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/DefaultMovingAverageQueryMetricsFactory.java index c9efb8bc25d3..6f2cc3446be8 100644 --- a/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/DefaultMovingAverageQueryMetricsFactory.java +++ b/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/DefaultMovingAverageQueryMetricsFactory.java @@ -19,19 +19,15 @@ package org.apache.druid.query.movingaverage; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; -import com.google.inject.Inject; import org.apache.druid.guice.LazySingleton; -import org.apache.druid.guice.annotations.Json; -import org.apache.druid.jackson.DefaultObjectMapper; @LazySingleton public class DefaultMovingAverageQueryMetricsFactory implements MovingAverageQueryMetricsFactory { private static final MovingAverageQueryMetricsFactory INSTANCE = - new DefaultMovingAverageQueryMetricsFactory(new DefaultObjectMapper()); + new DefaultMovingAverageQueryMetricsFactory(); /** * Should be used only in tests, directly or indirectly (via {@link @@ -43,17 +39,9 @@ public static MovingAverageQueryMetricsFactory instance() return INSTANCE; } - private final ObjectMapper jsonMapper; - - @Inject - public DefaultMovingAverageQueryMetricsFactory(@Json ObjectMapper jsonMapper) - { - this.jsonMapper = jsonMapper; - } - @Override public MovingAverageQueryMetrics makeMetrics() { - return new DefaultMovingAverageQueryMetrics(jsonMapper); + return new DefaultMovingAverageQueryMetrics(); } } diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java index bc019dec0ad3..e329c86242b9 100644 --- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java +++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java @@ -135,7 +135,6 @@ import org.apache.druid.segment.DimensionHandlerUtils; import org.apache.druid.segment.IndexIO; import org.apache.druid.segment.QueryableIndex; -import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.column.DictionaryEncodedColumn; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; @@ -2588,7 +2587,7 @@ public QueryRunner decorate(QueryRunner delegate, QueryToolChest> makeMetrics(Query query) { - DefaultQueryMetrics> queryMetrics = new DefaultQueryMetrics<>(jsonMapper); + DefaultQueryMetrics> queryMetrics = new DefaultQueryMetrics<>(); queryMetrics.query(query); return queryMetrics; } diff --git a/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java index 5b00f7509e68..db13df7386b5 100644 --- a/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java @@ -19,7 +19,6 @@ package org.apache.druid.query; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import org.apache.druid.collections.bitmap.BitmapFactory; import org.apache.druid.java.util.common.StringUtils; @@ -40,18 +39,12 @@ */ public class DefaultQueryMetrics> implements QueryMetrics { - protected final ObjectMapper jsonMapper; protected final ServiceMetricEvent.Builder builder = new ServiceMetricEvent.Builder(); protected final Map metrics = new HashMap<>(); /** Non final to give subclasses ability to reassign it. */ protected Thread ownerThread = Thread.currentThread(); - public DefaultQueryMetrics(ObjectMapper jsonMapper) - { - this.jsonMapper = jsonMapper; - } - protected void checkModifiedFromOwnerThread() { if (Thread.currentThread() != ownerThread) { diff --git a/processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetrics.java index e1cd7de50821..6b02d8c29bb3 100644 --- a/processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetrics.java @@ -19,18 +19,11 @@ package org.apache.druid.query.groupby; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.druid.query.DefaultQueryMetrics; import org.apache.druid.query.DruidMetrics; public class DefaultGroupByQueryMetrics extends DefaultQueryMetrics implements GroupByQueryMetrics { - - public DefaultGroupByQueryMetrics(ObjectMapper jsonMapper) - { - super(jsonMapper); - } - @Override public void query(GroupByQuery query) { diff --git a/processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsFactory.java index 045f27ab7fd2..1c06f2785baa 100644 --- a/processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsFactory.java @@ -19,18 +19,14 @@ package org.apache.druid.query.groupby; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; -import com.google.inject.Inject; import org.apache.druid.guice.LazySingleton; -import org.apache.druid.guice.annotations.Json; -import org.apache.druid.jackson.DefaultObjectMapper; @LazySingleton public class DefaultGroupByQueryMetricsFactory implements GroupByQueryMetricsFactory { private static final GroupByQueryMetricsFactory INSTANCE = - new DefaultGroupByQueryMetricsFactory(new DefaultObjectMapper()); + new DefaultGroupByQueryMetricsFactory(); /** * Should be used only in tests, directly or indirectly (via {@link @@ -42,17 +38,9 @@ public static GroupByQueryMetricsFactory instance() return INSTANCE; } - private final ObjectMapper jsonMapper; - - @Inject - public DefaultGroupByQueryMetricsFactory(@Json ObjectMapper jsonMapper) - { - this.jsonMapper = jsonMapper; - } - @Override public GroupByQueryMetrics makeMetrics() { - return new DefaultGroupByQueryMetrics(jsonMapper); + return new DefaultGroupByQueryMetrics(); } } diff --git a/processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetrics.java index d682d34d7eed..5eb4c7470b3a 100644 --- a/processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetrics.java @@ -19,18 +19,12 @@ package org.apache.druid.query.timeseries; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.druid.query.DefaultQueryMetrics; import org.apache.druid.query.DruidMetrics; public class DefaultTimeseriesQueryMetrics extends DefaultQueryMetrics implements TimeseriesQueryMetrics { - public DefaultTimeseriesQueryMetrics(ObjectMapper jsonMapper) - { - super(jsonMapper); - } - @Override public void query(TimeseriesQuery query) { diff --git a/processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsFactory.java index 12124ebfae31..2bdece360262 100644 --- a/processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsFactory.java @@ -19,18 +19,14 @@ package org.apache.druid.query.timeseries; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; -import com.google.inject.Inject; import org.apache.druid.guice.LazySingleton; -import org.apache.druid.guice.annotations.Json; -import org.apache.druid.jackson.DefaultObjectMapper; @LazySingleton public class DefaultTimeseriesQueryMetricsFactory implements TimeseriesQueryMetricsFactory { private static final TimeseriesQueryMetricsFactory INSTANCE = - new DefaultTimeseriesQueryMetricsFactory(new DefaultObjectMapper()); + new DefaultTimeseriesQueryMetricsFactory(); /** * Should be used only in tests, directly or indirectly (via {@link @@ -42,17 +38,9 @@ public static TimeseriesQueryMetricsFactory instance() return INSTANCE; } - private final ObjectMapper jsonMapper; - - @Inject - public DefaultTimeseriesQueryMetricsFactory(@Json ObjectMapper jsonMapper) - { - this.jsonMapper = jsonMapper; - } - @Override public TimeseriesQueryMetrics makeMetrics() { - return new DefaultTimeseriesQueryMetrics(jsonMapper); + return new DefaultTimeseriesQueryMetrics(); } } diff --git a/processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetrics.java index ce70ee9b0f6c..f9ebf4f4110b 100644 --- a/processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetrics.java +++ b/processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetrics.java @@ -19,7 +19,6 @@ package org.apache.druid.query.topn; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.druid.query.DefaultQueryMetrics; import org.apache.druid.query.DruidMetrics; import org.apache.druid.segment.ColumnValueSelector; @@ -27,12 +26,6 @@ public class DefaultTopNQueryMetrics extends DefaultQueryMetrics implements TopNQueryMetrics { - - public DefaultTopNQueryMetrics(ObjectMapper jsonMapper) - { - super(jsonMapper); - } - @Override public void query(TopNQuery query) { diff --git a/processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsFactory.java b/processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsFactory.java index 5bef30d95ce3..8f23a460cfd3 100644 --- a/processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsFactory.java +++ b/processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsFactory.java @@ -19,17 +19,13 @@ package org.apache.druid.query.topn; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; -import com.google.inject.Inject; import org.apache.druid.guice.LazySingleton; -import org.apache.druid.guice.annotations.Json; -import org.apache.druid.jackson.DefaultObjectMapper; @LazySingleton public class DefaultTopNQueryMetricsFactory implements TopNQueryMetricsFactory { - private static final TopNQueryMetricsFactory INSTANCE = new DefaultTopNQueryMetricsFactory(new DefaultObjectMapper()); + private static final TopNQueryMetricsFactory INSTANCE = new DefaultTopNQueryMetricsFactory(); /** * Should be used only in tests, directly or indirectly (via {@link TopNQueryQueryToolChest#TopNQueryQueryToolChest}). @@ -40,17 +36,9 @@ public static TopNQueryMetricsFactory instance() return INSTANCE; } - private final ObjectMapper jsonMapper; - - @Inject - public DefaultTopNQueryMetricsFactory(@Json ObjectMapper jsonMapper) - { - this.jsonMapper = jsonMapper; - } - @Override public TopNQueryMetrics makeMetrics() { - return new DefaultTopNQueryMetrics(jsonMapper); + return new DefaultTopNQueryMetrics(); } } diff --git a/processing/src/test/java/org/apache/druid/query/DefaultQueryMetricsTest.java b/processing/src/test/java/org/apache/druid/query/DefaultQueryMetricsTest.java index fad50e3c9702..a4eb6b2b365f 100644 --- a/processing/src/test/java/org/apache/druid/query/DefaultQueryMetricsTest.java +++ b/processing/src/test/java/org/apache/druid/query/DefaultQueryMetricsTest.java @@ -28,7 +28,6 @@ import org.apache.druid.query.filter.SelectorDimFilter; import org.apache.druid.query.topn.TopNQuery; import org.apache.druid.query.topn.TopNQueryBuilder; -import org.apache.druid.segment.TestHelper; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; @@ -49,7 +48,7 @@ public void testDefaultQueryMetricsQuery() { CachingEmitter cachingEmitter = new CachingEmitter(); ServiceEmitter serviceEmitter = new ServiceEmitter("", "", cachingEmitter); - DefaultQueryMetrics> queryMetrics = new DefaultQueryMetrics<>(TestHelper.makeJsonMapper()); + DefaultQueryMetrics> queryMetrics = new DefaultQueryMetrics<>(); TopNQuery query = new TopNQueryBuilder() .dataSource("xx") .granularity(Granularities.ALL) @@ -90,7 +89,7 @@ public void testDefaultQueryMetricsMetricNamesAndUnits() { CachingEmitter cachingEmitter = new CachingEmitter(); ServiceEmitter serviceEmitter = new ServiceEmitter("", "", cachingEmitter); - DefaultQueryMetrics> queryMetrics = new DefaultQueryMetrics<>(TestHelper.makeJsonMapper()); + DefaultQueryMetrics> queryMetrics = new DefaultQueryMetrics<>(); testQueryMetricsDefaultMetricNamesAndUnits(cachingEmitter, serviceEmitter, queryMetrics); } diff --git a/processing/src/test/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsTest.java b/processing/src/test/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsTest.java index 379c7e04d315..fbad96b83739 100644 --- a/processing/src/test/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsTest.java +++ b/processing/src/test/java/org/apache/druid/query/groupby/DefaultGroupByQueryMetricsTest.java @@ -32,7 +32,6 @@ import org.apache.druid.query.extraction.MapLookupExtractor; import org.apache.druid.query.filter.SelectorDimFilter; import org.apache.druid.query.lookup.LookupExtractionFn; -import org.apache.druid.segment.TestHelper; import org.joda.time.Interval; import org.joda.time.Period; import org.junit.Assert; @@ -53,7 +52,7 @@ public void testDefaultGroupByQueryMetricsQuery() { CachingEmitter cachingEmitter = new CachingEmitter(); ServiceEmitter serviceEmitter = new ServiceEmitter("", "", cachingEmitter); - DefaultGroupByQueryMetrics queryMetrics = new DefaultGroupByQueryMetrics(TestHelper.makeJsonMapper()); + DefaultGroupByQueryMetrics queryMetrics = new DefaultGroupByQueryMetrics(); GroupByQuery.Builder builder = GroupByQuery .builder() .setDataSource(QueryRunnerTestHelper.dataSource) @@ -104,7 +103,7 @@ public void testDefaultGroupByQueryMetricsMetricNamesAndUnits() { CachingEmitter cachingEmitter = new CachingEmitter(); ServiceEmitter serviceEmitter = new ServiceEmitter("", "", cachingEmitter); - DefaultGroupByQueryMetrics queryMetrics = new DefaultGroupByQueryMetrics(TestHelper.makeJsonMapper()); + DefaultGroupByQueryMetrics queryMetrics = new DefaultGroupByQueryMetrics(); DefaultQueryMetricsTest.testQueryMetricsDefaultMetricNamesAndUnits(cachingEmitter, serviceEmitter, queryMetrics); } } diff --git a/processing/src/test/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsTest.java b/processing/src/test/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsTest.java index e29599f3f789..3cecf5e34d79 100644 --- a/processing/src/test/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsTest.java +++ b/processing/src/test/java/org/apache/druid/query/timeseries/DefaultTimeseriesQueryMetricsTest.java @@ -25,7 +25,6 @@ import org.apache.druid.query.DruidMetrics; import org.apache.druid.query.Druids; import org.apache.druid.query.QueryRunnerTestHelper; -import org.apache.druid.segment.TestHelper; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; @@ -46,7 +45,7 @@ public void testDefaultTimeseriesQueryMetricsQuery() { CachingEmitter cachingEmitter = new CachingEmitter(); ServiceEmitter serviceEmitter = new ServiceEmitter("", "", cachingEmitter); - DefaultTimeseriesQueryMetrics queryMetrics = new DefaultTimeseriesQueryMetrics(TestHelper.makeJsonMapper()); + DefaultTimeseriesQueryMetrics queryMetrics = new DefaultTimeseriesQueryMetrics(); TimeseriesQuery query = Druids .newTimeseriesQueryBuilder() .dataSource(QueryRunnerTestHelper.dataSource) @@ -89,7 +88,7 @@ public void testDefaultTimeseriesQueryMetricsMetricNamesAndUnits() { CachingEmitter cachingEmitter = new CachingEmitter(); ServiceEmitter serviceEmitter = new ServiceEmitter("", "", cachingEmitter); - DefaultTimeseriesQueryMetrics queryMetrics = new DefaultTimeseriesQueryMetrics(TestHelper.makeJsonMapper()); + DefaultTimeseriesQueryMetrics queryMetrics = new DefaultTimeseriesQueryMetrics(); DefaultQueryMetricsTest.testQueryMetricsDefaultMetricNamesAndUnits(cachingEmitter, serviceEmitter, queryMetrics); } } diff --git a/processing/src/test/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsTest.java b/processing/src/test/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsTest.java index 4f59e561b1d4..e9bcca3aa173 100644 --- a/processing/src/test/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsTest.java +++ b/processing/src/test/java/org/apache/druid/query/topn/DefaultTopNQueryMetricsTest.java @@ -30,7 +30,6 @@ import org.apache.druid.query.dimension.DefaultDimensionSpec; import org.apache.druid.query.dimension.ListFilteredDimensionSpec; import org.apache.druid.query.filter.SelectorDimFilter; -import org.apache.druid.segment.TestHelper; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; @@ -51,7 +50,7 @@ public void testDefaultTopNQueryMetricsQuery() { CachingEmitter cachingEmitter = new CachingEmitter(); ServiceEmitter serviceEmitter = new ServiceEmitter("", "", cachingEmitter); - DefaultTopNQueryMetrics queryMetrics = new DefaultTopNQueryMetrics(TestHelper.makeJsonMapper()); + DefaultTopNQueryMetrics queryMetrics = new DefaultTopNQueryMetrics(); TopNQuery query = new TopNQueryBuilder() .dataSource("xx") .granularity(Granularities.ALL) @@ -101,7 +100,7 @@ public void testDefaultTopNQueryMetricsMetricNamesAndUnits() { CachingEmitter cachingEmitter = new CachingEmitter(); ServiceEmitter serviceEmitter = new ServiceEmitter("", "", cachingEmitter); - DefaultTopNQueryMetrics queryMetrics = new DefaultTopNQueryMetrics(TestHelper.makeJsonMapper()); + DefaultTopNQueryMetrics queryMetrics = new DefaultTopNQueryMetrics(); DefaultQueryMetricsTest.testQueryMetricsDefaultMetricNamesAndUnits(cachingEmitter, serviceEmitter, queryMetrics); } } diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTester.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTester.java index 0d6cac57cca4..2bca96ac7486 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTester.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTester.java @@ -54,7 +54,6 @@ import org.apache.druid.segment.IndexIO; import org.apache.druid.segment.IndexMerger; import org.apache.druid.segment.IndexMergerV9; -import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.column.ColumnConfig; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeTuningConfig; @@ -253,7 +252,7 @@ TimeseriesQuery.class, new TimeseriesQueryRunnerFactory( ScanQuery.class, new ScanQueryRunnerFactory( new ScanQueryQueryToolChest( new ScanQueryConfig(), - new DefaultGenericQueryMetricsFactory(TestHelper.makeJsonMapper()) + new DefaultGenericQueryMetricsFactory() ), new ScanQueryEngine(), new ScanQueryConfig() diff --git a/server/src/test/java/org/apache/druid/server/AsyncQueryForwardingServletTest.java b/server/src/test/java/org/apache/druid/server/AsyncQueryForwardingServletTest.java index 7cff40004ce7..ab2a322fcf9b 100644 --- a/server/src/test/java/org/apache/druid/server/AsyncQueryForwardingServletTest.java +++ b/server/src/test/java/org/apache/druid/server/AsyncQueryForwardingServletTest.java @@ -255,7 +255,7 @@ public int read() null, new NoopServiceEmitter(), new NoopRequestLogger(), - new DefaultGenericQueryMetricsFactory(jsonMapper), + new DefaultGenericQueryMetricsFactory(), new AuthenticatorMapper(ImmutableMap.of()) ) { @@ -347,7 +347,7 @@ public Collection getAllServers() injector.getInstance(DruidHttpClientConfig.class), new NoopServiceEmitter(), new NoopRequestLogger(), - new DefaultGenericQueryMetricsFactory(jsonMapper), + new DefaultGenericQueryMetricsFactory(), new AuthenticatorMapper(ImmutableMap.of()) ) { diff --git a/server/src/test/java/org/apache/druid/server/QueryResourceTest.java b/server/src/test/java/org/apache/druid/server/QueryResourceTest.java index d1820cd70f62..5d0571c03ef7 100644 --- a/server/src/test/java/org/apache/druid/server/QueryResourceTest.java +++ b/server/src/test/java/org/apache/druid/server/QueryResourceTest.java @@ -131,7 +131,7 @@ public void setup() new QueryLifecycleFactory( warehouse, testSegmentWalker, - new DefaultGenericQueryMetricsFactory(jsonMapper), + new DefaultGenericQueryMetricsFactory(), new NoopServiceEmitter(), testRequestLogger, new AuthConfig(), @@ -142,7 +142,7 @@ public void setup() queryManager, new AuthConfig(), null, - new DefaultGenericQueryMetricsFactory(jsonMapper) + new DefaultGenericQueryMetricsFactory() ); } @@ -353,7 +353,7 @@ public Access authorize(AuthenticationResult authenticationResult, Resource reso new QueryLifecycleFactory( warehouse, testSegmentWalker, - new DefaultGenericQueryMetricsFactory(jsonMapper), + new DefaultGenericQueryMetricsFactory(), new NoopServiceEmitter(), testRequestLogger, new AuthConfig(), @@ -364,7 +364,7 @@ public Access authorize(AuthenticationResult authenticationResult, Resource reso queryManager, new AuthConfig(), authMapper, - new DefaultGenericQueryMetricsFactory(jsonMapper) + new DefaultGenericQueryMetricsFactory() ); @@ -467,7 +467,7 @@ public Access authorize(AuthenticationResult authenticationResult, Resource reso new QueryLifecycleFactory( warehouse, testSegmentWalker, - new DefaultGenericQueryMetricsFactory(jsonMapper), + new DefaultGenericQueryMetricsFactory(), new NoopServiceEmitter(), testRequestLogger, new AuthConfig(), @@ -478,7 +478,7 @@ public Access authorize(AuthenticationResult authenticationResult, Resource reso queryManager, new AuthConfig(), authMapper, - new DefaultGenericQueryMetricsFactory(jsonMapper) + new DefaultGenericQueryMetricsFactory() ); final String queryString = "{\"queryType\":\"timeBoundary\", \"dataSource\":\"allow\"," @@ -589,7 +589,7 @@ public Access authorize(AuthenticationResult authenticationResult, Resource reso new QueryLifecycleFactory( warehouse, testSegmentWalker, - new DefaultGenericQueryMetricsFactory(jsonMapper), + new DefaultGenericQueryMetricsFactory(), new NoopServiceEmitter(), testRequestLogger, new AuthConfig(), @@ -600,7 +600,7 @@ public Access authorize(AuthenticationResult authenticationResult, Resource reso queryManager, new AuthConfig(), authMapper, - new DefaultGenericQueryMetricsFactory(jsonMapper) + new DefaultGenericQueryMetricsFactory() ); final String queryString = "{\"queryType\":\"timeBoundary\", \"dataSource\":\"allow\"," diff --git a/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java b/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java index 636e69eb56b3..6be9055be70a 100644 --- a/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java +++ b/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java @@ -579,7 +579,7 @@ public QueryRunner mergeResults(QueryRunner runner) @Override public QueryMetrics> makeMetrics(QueryType query) { - return new DefaultQueryMetrics<>(new DefaultObjectMapper()); + return new DefaultQueryMetrics<>(); } @Override diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java index 583c1f5c7994..0cda7526ab4a 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java @@ -531,7 +531,7 @@ public int getNumMergeBuffers() new ScanQueryRunnerFactory( new ScanQueryQueryToolChest( new ScanQueryConfig(), - new DefaultGenericQueryMetricsFactory(TestHelper.makeJsonMapper()) + new DefaultGenericQueryMetricsFactory() ), new ScanQueryEngine(), new ScanQueryConfig() @@ -588,7 +588,7 @@ public > QueryToolChest getToolChest } }, walker, - new DefaultGenericQueryMetricsFactory(INJECTOR.getInstance(Key.get(ObjectMapper.class, Json.class))), + new DefaultGenericQueryMetricsFactory(), new ServiceEmitter("dummy", "dummy", new NoopEmitter()), new NoopRequestLogger(), new AuthConfig(), From 07181864d41baed3b69206fcb05bc5a7369ba1d7 Mon Sep 17 00:00:00 2001 From: Himanshu Gupta Date: Sun, 25 Aug 2019 17:44:14 -0700 Subject: [PATCH 5/6] add comment --- .../server/log/DefaultRequestLogEventBuilderFactory.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java b/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java index 0bfac679c499..c140dedf3f21 100644 --- a/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java +++ b/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java @@ -31,6 +31,10 @@ public final class DefaultRequestLogEventBuilderFactory implements RequestLogEve { private static final DefaultRequestLogEventBuilderFactory INSTANCE = new DefaultRequestLogEventBuilderFactory(); + /** + * With property "druid.request.logging.requestLogEventBuilderFactory=xyz" in the configuration, jackson + * tries to find factory method where it could pass the argument "xyz" Or else fails with an exception. + */ @JsonCreator public static DefaultRequestLogEventBuilderFactory instance(String ignored) { From f47a695dd0ec938faa9d195b64547dd973ab12fa Mon Sep 17 00:00:00 2001 From: Himanshu Gupta Date: Mon, 26 Aug 2019 15:56:07 -0700 Subject: [PATCH 6/6] remove change to DefaultRequestLogEventBuilderFactory.java --- .../server/log/DefaultRequestLogEventBuilderFactory.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java b/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java index c140dedf3f21..08eb2b72830d 100644 --- a/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java +++ b/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java @@ -31,16 +31,7 @@ public final class DefaultRequestLogEventBuilderFactory implements RequestLogEve { private static final DefaultRequestLogEventBuilderFactory INSTANCE = new DefaultRequestLogEventBuilderFactory(); - /** - * With property "druid.request.logging.requestLogEventBuilderFactory=xyz" in the configuration, jackson - * tries to find factory method where it could pass the argument "xyz" Or else fails with an exception. - */ @JsonCreator - public static DefaultRequestLogEventBuilderFactory instance(String ignored) - { - return INSTANCE; - } - public static DefaultRequestLogEventBuilderFactory instance() { return INSTANCE;