gianm commented on code in PR #18121: URL: https://github.com/apache/druid/pull/18121#discussion_r2176852696
########## extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQMetricUtils.java: ########## @@ -0,0 +1,147 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +package org.apache.druid.msq.exec; + +import org.apache.druid.indexing.common.task.IndexTaskUtils; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.msq.dart.controller.sql.DartSqlEngine; +import org.apache.druid.msq.input.InputSpec; +import org.apache.druid.msq.input.table.TableInputSpec; +import org.apache.druid.msq.kernel.StageDefinition; +import org.apache.druid.msq.sql.MSQTaskSqlEngine; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.DefaultQueryMetrics; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.query.QueryContext; +import org.joda.time.Interval; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +/** + * Utility methods for setting up dimensions on metrics. + */ +public class MSQMetricUtils +{ + /** + * Sets dimensions for Dart queries, as well as some common dimensions. Sets the following dimensions: + * <ul> + * <li>queryId</li> + * <li>sqlQueryId</li> + * <li>type</li> + * <li>engine</li> + * </ul> + */ + public static void setDartQueryIdDimensions( + final ServiceMetricEvent.Builder metricBuilder, + final QueryContext queryContext + ) + { + setQueryIdDimensions(metricBuilder, queryContext); + metricBuilder.setDimension(DruidMetrics.ENGINE, DartSqlEngine.NAME); + } + + /** + * Sets dimensions for MSQ task queries, as well as some common dimensions. Sets the following dimensions: + * <ul> + * <li>queryId</li> + * <li>sqlQueryId</li> + * <li>type</li> + * <li>engine</li> + * </ul> + */ + public static void setTaskQueryIdDimensions( Review Comment: Similar to the other one, how about calling this `setTaskDimensions`? Also, the javadoc isn't quite accurate, it's missing a few dimensions. ########## extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQMetricUtils.java: ########## @@ -0,0 +1,147 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +package org.apache.druid.msq.exec; + +import org.apache.druid.indexing.common.task.IndexTaskUtils; +import org.apache.druid.indexing.common.task.Task; +import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; +import org.apache.druid.msq.dart.controller.sql.DartSqlEngine; +import org.apache.druid.msq.input.InputSpec; +import org.apache.druid.msq.input.table.TableInputSpec; +import org.apache.druid.msq.kernel.StageDefinition; +import org.apache.druid.msq.sql.MSQTaskSqlEngine; +import org.apache.druid.query.BaseQuery; +import org.apache.druid.query.DefaultQueryMetrics; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.query.QueryContext; +import org.joda.time.Interval; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +/** + * Utility methods for setting up dimensions on metrics. + */ +public class MSQMetricUtils +{ + /** + * Sets dimensions for Dart queries, as well as some common dimensions. Sets the following dimensions: + * <ul> + * <li>queryId</li> + * <li>sqlQueryId</li> + * <li>type</li> + * <li>engine</li> + * </ul> + */ + public static void setDartQueryIdDimensions( Review Comment: The name of this method is a bit odd. It definitely sets more than the "query id dimensions". How about calling it `setDartDimensions`. ########## extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java: ########## @@ -553,11 +554,31 @@ private MSQTaskReportPayload runInternal(final QueryListener queryListener, fina countersSnapshot, null ); - // Emit summary metrics + // Emit metrics + emitQueryMetrics(queryDef, taskStateForReport.isSuccess()); emitSummaryMetrics(msqTaskReportPayload, querySpec); return msqTaskReportPayload; } + private void emitQueryMetrics(@Nullable final QueryDefinition queryDef, final boolean success) + { + final Set<String> datasources = new HashSet<>(); + final Set<Interval> intervals = new HashSet<>(); + if (queryDef != null) { + for (StageDefinition stageDefinition : queryDef.getStageDefinitions()) { + datasources.addAll(MSQMetricUtils.getDatasources(stageDefinition)); + intervals.addAll(MSQMetricUtils.getIntervals(stageDefinition)); + } + } + + long startTime = DateTimeUtils.getInstantMillis(MultiStageQueryContext.getStartTime(querySpec.getContext())); + context.emitMetric( + "query/time", + MSQMetricUtils.createQueryMetricDimensions(datasources, intervals, success), + startTime - System.currentTimeMillis() Review Comment: This looks backwards. ########## extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerContext.java: ########## @@ -56,6 +58,12 @@ public interface WorkerContext extends Closeable // Using an Injector directly because tasks do not have a way to provide their own Guice modules. Injector injector(); + /** + * Emit a metric using a {@link ServiceEmitter}. The dimensions passed as an argument are also emitted with the + * metrics. These are can override any already existing context specific dimensions. + */ + void emitMetric(String metric, Map<String, Object> overrideDimension, Number value); Review Comment: `overrideDimensions` (spelling) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
