chia7712 commented on code in PR #19050: URL: https://github.com/apache/kafka/pull/19050#discussion_r2044367536
########## server/src/test/java/org/apache/kafka/server/MonitorablePluginsIntegrationTest.java: ########## @@ -0,0 +1,111 @@ +/* + * 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.kafka.server; + +import org.apache.kafka.common.MetricName; +import org.apache.kafka.common.metrics.Measurable; +import org.apache.kafka.common.metrics.Metrics; +import org.apache.kafka.common.metrics.Monitorable; +import org.apache.kafka.common.metrics.PluginMetrics; +import org.apache.kafka.common.replica.RackAwareReplicaSelector; +import org.apache.kafka.common.test.ClusterInstance; +import org.apache.kafka.common.test.api.ClusterConfigProperty; +import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.api.Type; +import org.apache.kafka.metadata.authorizer.StandardAuthorizer; + +import java.util.LinkedHashMap; +import java.util.Map; + +import static org.apache.kafka.server.config.ReplicationConfigs.REPLICA_SELECTOR_CLASS_CONFIG; +import static org.apache.kafka.server.config.ServerConfigs.AUTHORIZER_CLASS_NAME_CONFIG; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class MonitorablePluginsIntegrationTest { + + private static int controllerId(Type type) { + return type == Type.KRAFT ? 3000 : 0; + } + + private static Map<String, String> expectedTags(String config, String clazz) { + return expectedTags(config, clazz, Map.of()); + } + + private static Map<String, String> expectedTags(String config, String clazz, Map<String, String> extraTags) { + Map<String, String> tags = new LinkedHashMap<>(); + tags.put("config", config); + tags.put("class", clazz); + tags.putAll(extraTags); + return tags; + } + + @ClusterTest( + types = {Type.KRAFT, Type.CO_KRAFT}, + serverProperties = { + @ClusterConfigProperty(key = StandardAuthorizer.SUPER_USERS_CONFIG, value = "User:ANONYMOUS"), + @ClusterConfigProperty(key = AUTHORIZER_CLASS_NAME_CONFIG, value = "org.apache.kafka.metadata.authorizer.StandardAuthorizer"), + @ClusterConfigProperty(key = REPLICA_SELECTOR_CLASS_CONFIG, value = "org.apache.kafka.server.MonitorablePluginsIntegrationTest$MonitorableReplicaSelector") + } + ) + public void testMonitorableServerPlugins(ClusterInstance clusterInstance) { + assertAuthorizerMetrics(clusterInstance); + assertReplicaSelectorMetrics(clusterInstance); + } + + private void assertAuthorizerMetrics(ClusterInstance clusterInstance) { + assertMetrics( + clusterInstance.brokers().get(0).metrics(), + 4, + expectedTags(AUTHORIZER_CLASS_NAME_CONFIG, "StandardAuthorizer", Map.of("role", "broker"))); + + assertMetrics( + clusterInstance.controllers().get(controllerId(clusterInstance.type())).metrics(), + 4, + expectedTags(AUTHORIZER_CLASS_NAME_CONFIG, "StandardAuthorizer", Map.of("role", "controller"))); + } + + private void assertReplicaSelectorMetrics(ClusterInstance clusterInstance) { + assertMetrics( + clusterInstance.brokers().get(0).metrics(), + MonitorableReplicaSelector.METRICS_COUNT, + expectedTags(REPLICA_SELECTOR_CLASS_CONFIG, MonitorableReplicaSelector.class.getSimpleName())); + } + + private void assertMetrics(Metrics metrics, int expected, Map<String, String> expectedTags) { + int found = 0; + for (MetricName metricName : metrics.metrics().keySet()) { + if (metricName.group().equals("plugins")) { + Map<String, String> tags = metricName.tags(); + if (expectedTags.equals(tags)) { + found++; + } + } + } + assertEquals(expected, found); + } + + public static class MonitorableReplicaSelector extends RackAwareReplicaSelector implements Monitorable { + + private static final int METRICS_COUNT = 1; Review Comment: Excuse me, why to set a static constant in a inner class? Maybe it can be moved to `MonitorablePluginsIntegrationTest`? ########## metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizer.java: ########## @@ -207,4 +216,45 @@ static AuthorizationResult getDefaultResult(Map<String, ?> configs) { if (configValue == null) return DENIED; return Boolean.parseBoolean(configValue.toString().trim()) ? ALLOWED : DENIED; } + + @Override + public void withPluginMetrics(PluginMetrics metrics) { + this.authorizerMetrics = new AuthorizerMetrics(metrics); + } + + private class AuthorizerMetrics { + private final Sensor authorizationAllowedSensor; + private final Sensor authorizationDeniedSensor; + private final Sensor authorizationRequestSensor; + + private AuthorizerMetrics(PluginMetrics metrics) { + authorizationAllowedSensor = metrics.addSensor("authorizer-authorization-allowed"); Review Comment: those metrics are bound with `StandardAuthorizer`, and maybe the metrics in KIP-877 should use the explicit authorizer name. ``` kafka.server:type=plugins,config=authorizer.class.name,class=StandardAuthorizer,name=acls-total-count ``` -- 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: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
