jiajunwang commented on a change in pull request #1357: URL: https://github.com/apache/helix/pull/1357#discussion_r492250473
########## File path: helix-rest/src/main/java/org/apache/helix/rest/server/HelixRestObjectNameFactory.java ########## @@ -0,0 +1,90 @@ +package org.apache.helix.rest.server; + +/* + * 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. + */ + +import java.util.Hashtable; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +import com.codahale.metrics.jmx.ObjectNameFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Creates an {@link ObjectName} that has "name", "type" and "namespace" properties + * for metrics registry in Helix rest service. + * + * <p>It is recommended to only be used within Helix REST. + */ +class HelixRestObjectNameFactory implements ObjectNameFactory { + private static final Logger LOG = LoggerFactory.getLogger(HelixRestObjectNameFactory.class); + + private static final String KEY_NAME = "name"; + private static final String KEY_TYPE = "type"; + private static final String KEY_NAMESPACE = "namespace"; + + private final String _namespace; + + HelixRestObjectNameFactory(String nameSpace) { + _namespace = nameSpace; + } + + public ObjectName createName(String type, String domain, String name) { Review comment: Do we allow null string input or not? ########## File path: helix-rest/src/main/java/org/apache/helix/rest/server/HelixRestServer.java ########## @@ -162,6 +168,24 @@ protected ResourceConfig getResourceConfig(HelixRestNamespace namespace, Servlet return cfg; } + /* + * Initialize metric registry and jmx reporter for each namespace. + */ + private void initMetricRegistry(ResourceConfig cfg, String namespace) { Review comment: When this one is called? Do we need concurrency control? ########## File path: helix-rest/src/main/java/org/apache/helix/rest/server/HelixRestObjectNameFactory.java ########## @@ -0,0 +1,86 @@ +package org.apache.helix.rest.server; + +/* + * 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. + */ + +import java.util.Hashtable; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +import com.codahale.metrics.jmx.ObjectNameFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Creates an {@link ObjectName} that has "name", "type", "namespace" properties + * for metrics registry in Helix rest service. + * + * <p>It is recommended to only be used within Helix REST. + */ +class HelixRestObjectNameFactory implements ObjectNameFactory { + private static final Logger LOG = LoggerFactory.getLogger(HelixRestObjectNameFactory.class); + + private static final String KEY_NAME = "name"; + private static final String KEY_TYPE = "type"; + private static final String KEY_NAMESPACE = "namespace"; + + public ObjectName createName(String type, String domainNameSpace, String name) { + String[] splits = domainNameSpace.split(":"); + String domain = splits[0]; + String namespace = splits[1]; + + try { + Hashtable<String, String> properties = new Hashtable<>(); + properties.put(KEY_NAME, name); + properties.put(KEY_TYPE, type); + properties.put(KEY_NAMESPACE, namespace); + + /* + * The only way we can find out if we need to quote the properties is by Review comment: I personally prefer less protection so the logic fails earlier during test. But no strong preference here. ########## File path: helix-rest/src/main/java/org/apache/helix/rest/server/HelixRestObjectNameFactory.java ########## @@ -0,0 +1,90 @@ +package org.apache.helix.rest.server; + +/* + * 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. + */ + +import java.util.Hashtable; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +import com.codahale.metrics.jmx.ObjectNameFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Creates an {@link ObjectName} that has "name", "type" and "namespace" properties + * for metrics registry in Helix rest service. + * + * <p>It is recommended to only be used within Helix REST. + */ +class HelixRestObjectNameFactory implements ObjectNameFactory { + private static final Logger LOG = LoggerFactory.getLogger(HelixRestObjectNameFactory.class); + + private static final String KEY_NAME = "name"; + private static final String KEY_TYPE = "type"; + private static final String KEY_NAMESPACE = "namespace"; + + private final String _namespace; + + HelixRestObjectNameFactory(String nameSpace) { + _namespace = nameSpace; + } + + public ObjectName createName(String type, String domain, String name) { + Hashtable<String, String> properties = new Hashtable<>(); + + properties.put(KEY_NAME, name); + properties.put(KEY_TYPE, type); + properties.put(KEY_NAMESPACE, _namespace); + + try { + /* + * The only way we can find out if we need to quote the properties is by + * checking an ObjectName that we've constructed. Eg. when regex is used in + * object name, quoting is needed. + */ + ObjectName objectName = new ObjectName(domain, properties); + boolean needQuote = false; + + if (objectName.isDomainPattern()) { + domain = ObjectName.quote(domain); + needQuote = true; + } + + if (objectName.isPropertyValuePattern(KEY_NAME)) { + properties.put(KEY_NAME, ObjectName.quote(name)); + needQuote = true; + } + + if (objectName.isPropertyValuePattern(KEY_TYPE)) { + properties.put(KEY_TYPE, ObjectName.quote(type)); + needQuote = true; + } + + return needQuote ? new ObjectName(domain, properties) : objectName; + } catch (MalformedObjectNameException e) { + try { + return new ObjectName(domain, KEY_NAME, ObjectName.quote(name)); Review comment: If you ignore 2 types of info out of 3, then this ObjectName probably does not help us monitoring. So just throw Exception? ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
