kgyrtkirk commented on code in PR #18121: URL: https://github.com/apache/druid/pull/18121#discussion_r2181928552
########## extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQMetricUtils.java: ########## @@ -0,0 +1,137 @@ +/* + * 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.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.DruidMetrics; +import org.apache.druid.query.QueryContext; +import org.joda.time.Interval; + +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 setDartDimensions( Review Comment: nit: these `setX` methods could live inside some `MSQMetriceEventBuilder` class which should be a sublass of `ServiceMetricEvent.Builder` ########## extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java: ########## @@ -394,6 +433,17 @@ private void handleNewWorkOrder( kernelHolder.partitionBoundariesFuture = runWorkOrder.getStagePartitionBoundariesFuture(); } + @SuppressWarnings("unchecked") + private void updateMetricDimensions(QueryDefinition queryDef) + { + Set<String> datasourceDim = (Set<String>) queryMetricDimensions.computeIfAbsent(DruidMetrics.DATASOURCE, s -> new HashSet<>()); + Set<Interval> intervalDim = (Set<Interval>) queryMetricDimensions.computeIfAbsent(DruidMetrics.INTERVAL, s -> new HashSet<>()); + for (StageDefinition stageDef : queryDef.getStageDefinitions()) { + datasourceDim.addAll(MSQMetricUtils.getDatasources(stageDef)); Review Comment: nit: is this a one time need - or maybe there should be `queryDef.getDatasources` ? ########## extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java: ########## @@ -394,6 +433,17 @@ private void handleNewWorkOrder( kernelHolder.partitionBoundariesFuture = runWorkOrder.getStagePartitionBoundariesFuture(); } + @SuppressWarnings("unchecked") + private void updateMetricDimensions(QueryDefinition queryDef) + { + Set<String> datasourceDim = (Set<String>) queryMetricDimensions.computeIfAbsent(DruidMetrics.DATASOURCE, s -> new HashSet<>()); Review Comment: note: I think it's true that all `workOrder`-s will be for the same `queryDef` - is that correct ? ########## extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQMetricUtils.java: ########## @@ -0,0 +1,137 @@ +/* + * 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.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.DruidMetrics; +import org.apache.druid.query.QueryContext; +import org.joda.time.Interval; + +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 setDartDimensions( + 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> + * <li>taskId</li> + * <li>taskType</li> + * <li>dataSource</li> + * <li>tags</li> + * <li>groupId</li> + * </ul> + */ + public static void setTaskDimensions( + final ServiceMetricEvent.Builder metricBuilder, + final Task task, + final QueryContext queryContext + ) + { + setQueryIdDimensions(metricBuilder, queryContext); + metricBuilder.setDimension(DruidMetrics.TASK_ID, task.getId()); + metricBuilder.setDimension(DruidMetrics.TASK_TYPE, task.getType()); + + // Set datasource only if it has not already been set. + if (metricBuilder.getDimension(DruidMetrics.DATASOURCE) == null) { + metricBuilder.setDimension(DruidMetrics.DATASOURCE, task.getDataSource()); + } + + metricBuilder.setDimensionIfNotNull( + DruidMetrics.TAGS, + task.<Map<String, Object>>getContextValue(DruidMetrics.TAGS) + ); + metricBuilder.setDimensionIfNotNull(DruidMetrics.GROUP_ID, task.getGroupId()); + metricBuilder.setDimension(DruidMetrics.ENGINE, MSQTaskSqlEngine.NAME); + } + + /** + * Returns a set of all datasources of all {@link TableInputSpec} in the stageDefinition. + */ + public static Set<String> getDatasources(final StageDefinition stageDefinition) Review Comment: nit: seems like this could naturally live as `StageDefintion#getDatasources` ? ########## extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestOverlordServiceClient.java: ########## @@ -379,4 +386,12 @@ public void closeTask(String taskId) taskDetailsByTaskId.get(taskId).close(); } + + /** + * + */ Review Comment: nit: remove? ########## extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java: ########## @@ -569,6 +578,7 @@ public void test_doPost_regularUser_runtimeError() throws IOException assertThat((String) e.get("errorMessage"), CoreMatchers.startsWith("InvalidNullByte: ")); } + @Test Review Comment: good catch :) -- 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]
