Logging emitter to publish query and other metric events as valid json objects

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;
       }
     }

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;

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<MovingAverageQuery> implements
     MovingAverageQueryMetrics
 {
-
-  public DefaultMovingAverageQueryMetrics(ObjectMapper jsonMapper)
-  {
-    super(jsonMapper);
-  }
-
   @Override
   public void query(MovingAverageQuery query)
   {

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();
   }
 }

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;
@@ -2578,7 +2577,7 @@ public <T> QueryRunner<T> decorate(QueryRunner<T> delegate, QueryToolChest<T, ?
                 new ScanQueryRunnerFactory(
                     new ScanQueryQueryToolChest(
                         new ScanQueryConfig(),
-                        new DefaultGenericQueryMetricsFactory(TestHelper.makeJsonMapper())
+                        new DefaultGenericQueryMetricsFactory()
                     ),
                     new ScanQueryEngine(),
                     new ScanQueryConfig()

processing/src/main/java/org/apache/druid/query/DefaultGenericQueryMetricsFactory.java

@@ -19,18 +19,14 @@
 
 package org.apache.druid.query;
 
-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 DefaultGenericQueryMetricsFactory implements GenericQueryMetricsFactory
 {
   private static final GenericQueryMetricsFactory INSTANCE =
-      new DefaultGenericQueryMetricsFactory(new DefaultObjectMapper());
+      new DefaultGenericQueryMetricsFactory();
 
   /**
    * Should be used only in tests, directly or indirectly (e. g. in {@link
@@ -42,18 +38,10 @@ public static GenericQueryMetricsFactory instance()
     return INSTANCE;
   }
 
-  private final ObjectMapper jsonMapper;
-
-  @Inject
-  public DefaultGenericQueryMetricsFactory(@Json ObjectMapper jsonMapper)
-  {
-    this.jsonMapper = jsonMapper;
-  }
-
   @Override
   public QueryMetrics<Query<?>> makeMetrics(Query<?> query)
   {
-    DefaultQueryMetrics<Query<?>> queryMetrics = new DefaultQueryMetrics<>(jsonMapper);
+    DefaultQueryMetrics<Query<?>> queryMetrics = new DefaultQueryMetrics<>();
     queryMetrics.query(query);
     return queryMetrics;
   }

processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java

@@ -19,8 +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;
 import org.apache.druid.java.util.common.StringUtils;
@@ -41,18 +39,12 @@
  */
 public class DefaultQueryMetrics<QueryType extends Query<?>> implements QueryMetrics<QueryType>
 {
-  protected final ObjectMapper jsonMapper;
   protected final ServiceMetricEvent.Builder builder = new ServiceMetricEvent.Builder();
   protected final Map<String, Number> 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) {
@@ -64,7 +56,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 +123,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

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<GroupByQuery> implements GroupByQueryMetrics
 {
-
-  public DefaultGroupByQueryMetrics(ObjectMapper jsonMapper)
-  {
-    super(jsonMapper);
-  }
-
   @Override
   public void query(GroupByQuery query)
   {

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();
   }
 }

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<TimeseriesQuery>
     implements TimeseriesQueryMetrics
 {
-  public DefaultTimeseriesQueryMetrics(ObjectMapper jsonMapper)
-  {
-    super(jsonMapper);
-  }
-
   @Override
   public void query(TimeseriesQuery query)
   {

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();
   }
 }

processing/src/main/java/org/apache/druid/query/topn/DefaultTopNQueryMetrics.java

@@ -19,20 +19,13 @@
 
 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;
 import org.apache.druid.segment.Cursor;
 
 public class DefaultTopNQueryMetrics extends DefaultQueryMetrics<TopNQuery> implements TopNQueryMetrics
 {
-
-  public DefaultTopNQueryMetrics(ObjectMapper jsonMapper)
-  {
-    super(jsonMapper);
-  }
-
   @Override
   public void query(TopNQuery query)
   {

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();
   }
 }