RockteMQ-AI commented on code in PR #495: URL: https://github.com/apache/rocketmq-connect/pull/495#discussion_r3902594974
########## metric-exporter/src/main/java/org/apache/rocketmq/connect/metrics/DropwizardExports.java: ########## @@ -0,0 +1,234 @@ +/* + * 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.rocketmq.connect.metrics; + +import com.codahale.metrics.Counter; +import com.codahale.metrics.Gauge; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.Meter; +import com.codahale.metrics.Metric; +import com.codahale.metrics.MetricFilter; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Snapshot; +import com.codahale.metrics.Timer; +import io.prometheus.client.dropwizard.samplebuilder.DefaultSampleBuilder; +import io.prometheus.client.dropwizard.samplebuilder.SampleBuilder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.rocketmq.connect.metrics.stats.Stat; + +/** + * Collect Dropwizard metrics from a MetricRegistry. + */ +public class DropwizardExports extends io.prometheus.client.Collector implements io.prometheus.client.Collector.Describable { + private static final Logger LOGGER = Logger.getLogger(DropwizardExports.class.getName()); + private MetricRegistry registry; + private MetricFilter metricFilter; + private SampleBuilder sampleBuilder; + + /** + * Creates a new DropwizardExports with a {@link DefaultSampleBuilder} and {@link MetricFilter#ALL}. + * + * @param registry a metric registry to export in prometheus. + */ + public DropwizardExports(MetricRegistry registry) { + this.registry = registry; + this.metricFilter = MetricFilter.ALL; + this.sampleBuilder = new DefaultSampleBuilder(); + } + + /** + * Creates a new DropwizardExports with a {@link DefaultSampleBuilder} and custom {@link MetricFilter}. + * + * @param registry a metric registry to export in prometheus. + * @param metricFilter a custom metric filter. + */ + public DropwizardExports(MetricRegistry registry, MetricFilter metricFilter) { + this.registry = registry; + this.metricFilter = metricFilter; + this.sampleBuilder = new DefaultSampleBuilder(); + } + + /** + * @param registry a metric registry to export in prometheus. + * @param sampleBuilder sampleBuilder to use to create prometheus samples. + */ + public DropwizardExports(MetricRegistry registry, SampleBuilder sampleBuilder) { + this.registry = registry; + this.metricFilter = MetricFilter.ALL; + this.sampleBuilder = sampleBuilder; + } + + /** + * @param registry a metric registry to export in prometheus. + * @param metricFilter a custom metric filter. + * @param sampleBuilder sampleBuilder to use to create prometheus samples. + */ + public DropwizardExports(MetricRegistry registry, MetricFilter metricFilter, SampleBuilder sampleBuilder) { + this.registry = registry; + this.metricFilter = metricFilter; + this.sampleBuilder = sampleBuilder; + } + + private static String getHelpMessage(String metricName, Metric metric) { + return String.format("Generated from Dropwizard metric import (metric=%s, type=%s)", metricName, metric.getClass().getName()); + } + + /** + * Export counter as Prometheus <a href="https://prometheus.io/docs/concepts/metric_types/#gauge";>Gauge</a>. + */ + MetricFamilySamples fromCounter(String dropwizardName, Counter counter) { + MetricFamilySamples.Sample sample = sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), new Long(counter.getCount()).doubleValue()); + return new MetricFamilySamples(sample.name, Type.GAUGE, getHelpMessage(dropwizardName, counter), Arrays.asList(sample)); + } + + /** + * Export gauge as a prometheus gauge. + */ + MetricFamilySamples fromGauge(String dropwizardName, Gauge gauge) { + Object obj = gauge.getValue(); + double value; + if (obj instanceof Number) { + value = ((Number) obj).doubleValue(); + } else if (obj instanceof Boolean) { + value = ((Boolean) obj) ? 1 : 0; + } else { + LOGGER.log(Level.FINE, String.format("Invalid type for Gauge %s: %s", sanitizeMetricName(dropwizardName), obj == null ? "null" : obj.getClass().getName())); + return null; + } + MetricFamilySamples.Sample sample = sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), value); + return new MetricFamilySamples(sample.name, Type.GAUGE, getHelpMessage(dropwizardName, gauge), Arrays.asList(sample)); + } + + /** + * Export a histogram snapshot as a prometheus SUMMARY. + * + * @param dropwizardName metric name. + * @param snapshot the histogram snapshot. + * @param count the total sample count for this snapshot. + * @param factor a factor to apply to histogram values. + */ + MetricFamilySamples fromSnapshotAndCount(String dropwizardName, Snapshot snapshot, long count, double factor, + String helpMessage) { + MetricName metricName = MetricUtils.stringToMetricName(dropwizardName); + Stat.HistogramType histogramType = Stat.HistogramType.valueOf(metricName.getType()); + List<MetricFamilySamples.Sample> samples = new ArrayList<>(); + switch (histogramType) { + case Avg: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), snapshot.getMean() * factor)); + break; + case Min: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), snapshot.getMin() * factor)); + break; + case Max: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), snapshot.getMax() * factor)); + break; + case Percentile_75th: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.75"), snapshot.get75thPercentile() * factor)); + break; + case Percentile_95th: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.95"), snapshot.get95thPercentile() * factor)); + break; + case Percentile_98th: Review Comment: The `default` case in `fromSnapshotAndCount` adds the median (quantile "0.5") sample **twice** — the first two entries in the `Arrays.asList(...)` are identical. This produces duplicate samples in every Prometheus scrape for any histogram type that falls through to `default`, which will confuse or error in Prometheus ingestion. ########## metric-exporter/src/main/java/org/apache/rocketmq/connect/metrics/DropwizardExports.java: ########## @@ -0,0 +1,234 @@ +/* + * 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.rocketmq.connect.metrics; + +import com.codahale.metrics.Counter; +import com.codahale.metrics.Gauge; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.Meter; +import com.codahale.metrics.Metric; +import com.codahale.metrics.MetricFilter; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Snapshot; +import com.codahale.metrics.Timer; +import io.prometheus.client.dropwizard.samplebuilder.DefaultSampleBuilder; +import io.prometheus.client.dropwizard.samplebuilder.SampleBuilder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.rocketmq.connect.metrics.stats.Stat; + +/** + * Collect Dropwizard metrics from a MetricRegistry. + */ +public class DropwizardExports extends io.prometheus.client.Collector implements io.prometheus.client.Collector.Describable { + private static final Logger LOGGER = Logger.getLogger(DropwizardExports.class.getName()); + private MetricRegistry registry; + private MetricFilter metricFilter; + private SampleBuilder sampleBuilder; + + /** + * Creates a new DropwizardExports with a {@link DefaultSampleBuilder} and {@link MetricFilter#ALL}. + * + * @param registry a metric registry to export in prometheus. + */ + public DropwizardExports(MetricRegistry registry) { + this.registry = registry; + this.metricFilter = MetricFilter.ALL; + this.sampleBuilder = new DefaultSampleBuilder(); + } + + /** + * Creates a new DropwizardExports with a {@link DefaultSampleBuilder} and custom {@link MetricFilter}. + * + * @param registry a metric registry to export in prometheus. + * @param metricFilter a custom metric filter. + */ + public DropwizardExports(MetricRegistry registry, MetricFilter metricFilter) { + this.registry = registry; + this.metricFilter = metricFilter; + this.sampleBuilder = new DefaultSampleBuilder(); + } + + /** + * @param registry a metric registry to export in prometheus. + * @param sampleBuilder sampleBuilder to use to create prometheus samples. + */ + public DropwizardExports(MetricRegistry registry, SampleBuilder sampleBuilder) { + this.registry = registry; + this.metricFilter = MetricFilter.ALL; + this.sampleBuilder = sampleBuilder; + } + + /** + * @param registry a metric registry to export in prometheus. + * @param metricFilter a custom metric filter. + * @param sampleBuilder sampleBuilder to use to create prometheus samples. + */ + public DropwizardExports(MetricRegistry registry, MetricFilter metricFilter, SampleBuilder sampleBuilder) { + this.registry = registry; + this.metricFilter = metricFilter; + this.sampleBuilder = sampleBuilder; + } + + private static String getHelpMessage(String metricName, Metric metric) { + return String.format("Generated from Dropwizard metric import (metric=%s, type=%s)", metricName, metric.getClass().getName()); + } + + /** + * Export counter as Prometheus <a href="https://prometheus.io/docs/concepts/metric_types/#gauge";>Gauge</a>. + */ + MetricFamilySamples fromCounter(String dropwizardName, Counter counter) { + MetricFamilySamples.Sample sample = sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), new Long(counter.getCount()).doubleValue()); + return new MetricFamilySamples(sample.name, Type.GAUGE, getHelpMessage(dropwizardName, counter), Arrays.asList(sample)); + } + + /** + * Export gauge as a prometheus gauge. + */ + MetricFamilySamples fromGauge(String dropwizardName, Gauge gauge) { + Object obj = gauge.getValue(); + double value; + if (obj instanceof Number) { + value = ((Number) obj).doubleValue(); + } else if (obj instanceof Boolean) { + value = ((Boolean) obj) ? 1 : 0; + } else { + LOGGER.log(Level.FINE, String.format("Invalid type for Gauge %s: %s", sanitizeMetricName(dropwizardName), obj == null ? "null" : obj.getClass().getName())); + return null; + } + MetricFamilySamples.Sample sample = sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), value); + return new MetricFamilySamples(sample.name, Type.GAUGE, getHelpMessage(dropwizardName, gauge), Arrays.asList(sample)); + } + + /** + * Export a histogram snapshot as a prometheus SUMMARY. Review Comment: `Stat.HistogramType.valueOf(metricName.getType())` will throw `IllegalArgumentException` if the metric's type string doesn't exactly match an enum constant. There is no try/catch, so a single unrecognized histogram metric name will abort the entire `collect()` call, breaking the whole `/metrics` endpoint. Wrap this in a try/catch and log+skip the offending metric. ########## metric-exporter/src/main/java/org/apache/rocketmq/connect/metrics/PrometheusSampleBuilder.java: ########## @@ -0,0 +1,59 @@ +/* + * 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.rocketmq.connect.metrics; + +import io.prometheus.client.Collector; +import io.prometheus.client.dropwizard.samplebuilder.SampleBuilder; +import java.util.Arrays; +import java.util.List; +import org.apache.commons.lang3.StringUtils; + +public class PrometheusSampleBuilder implements SampleBuilder { + private static final List<String> SOURCE_TASK_LABEL_NAMES = Arrays.asList("metric_group", "data_type", "connector", "task"); + + @Override + public Collector.MetricFamilySamples.Sample createSample(String dropwizardName, String nameSuffix, + List<String> additionalLabelNames, List<String> additionalLabelValues, double value) { + String suffix = nameSuffix == null ? "" : nameSuffix; + List<String> labelValues = sanitizeLabelValues(dropwizardName); + return new Collector.MetricFamilySamples.Sample(sanitizeMetricName(dropwizardName + suffix), SOURCE_TASK_LABEL_NAMES, labelValues, value); + } + Review Comment: `sanitizeMetricName` splits on `":"` then `","` and accesses index `[1]` without bounds checking. If any Dropwizard metric name doesn't follow the exact expected format (e.g. internal JVM metrics, or third-party metrics), this throws `ArrayIndexOutOfBoundsException` and crashes the scrape. Add defensive parsing with a fallback. ########## metric-exporter/src/main/java/org/apache/rocketmq/connect/metrics/PrometheusSampleBuilder.java: ########## @@ -0,0 +1,59 @@ +/* + * 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.rocketmq.connect.metrics; + +import io.prometheus.client.Collector; +import io.prometheus.client.dropwizard.samplebuilder.SampleBuilder; +import java.util.Arrays; +import java.util.List; +import org.apache.commons.lang3.StringUtils; + +public class PrometheusSampleBuilder implements SampleBuilder { + private static final List<String> SOURCE_TASK_LABEL_NAMES = Arrays.asList("metric_group", "data_type", "connector", "task"); + + @Override + public Collector.MetricFamilySamples.Sample createSample(String dropwizardName, String nameSuffix, + List<String> additionalLabelNames, List<String> additionalLabelValues, double value) { + String suffix = nameSuffix == null ? "" : nameSuffix; + List<String> labelValues = sanitizeLabelValues(dropwizardName); + return new Collector.MetricFamilySamples.Sample(sanitizeMetricName(dropwizardName + suffix), SOURCE_TASK_LABEL_NAMES, labelValues, value); + } + + public String sanitizeMetricName(String dropwizardName) { + return dropwizardName.split(":")[1].split(",")[1].replaceAll("-", "_"); + } + Review Comment: `sanitizeLabelValues` has the same unguarded split pattern and accesses `split[0]` through `split[4]`. Any metric name with fewer than 5 comma-separated segments will throw `ArrayIndexOutOfBoundsException`. Additionally, `split[3].substring(var3.indexOf("=") + 1)` will misbehave if `var3` doesn't contain `"="` (indexOf returns -1, yielding `substring(0)` — silently wrong rather than failing loudly). ########## rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/rest/RestHandler.java: ########## @@ -60,6 +65,21 @@ public RestHandler(AbstractConnectController connectController) { this.connectController = connectController; pluginsResource = new ConnectorPluginsResource(connectController); + Javalin embeddedApp = Javalin.create(config -> { + config.server(() -> { + Server server = new Server(connectController.getConnectConfig().getExporterPort()); + ServletContextHandler context = new ServletContextHandler(); + context.setContextPath("/"); + context.addServlet(new ServletHolder(new PrometheusMetricsServlet()), "/metrics"); + ContextHandlerCollection handlers = new ContextHandlerCollection(); + handlers.setHandlers(new Handler[]{context}); + server.setHandler(handlers); + return server; + }); Review Comment: The Prometheus Jetty `Server` is started in the constructor but the `embeddedApp` reference is local and never stored. This means: (1) there is no way to shut it down on application stop — the server and its thread pool will leak; (2) if `exporterPort` is already bound, the exception propagates uncaught from the constructor, preventing the entire Worker from starting. Store the reference and wire it into the shutdown lifecycle. ########## rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/connectorwrapper/Worker.java: ########## @@ -148,6 +151,7 @@ public Worker(WorkerConfig workerConfig, this.executor = Executors.newCachedThreadPool(); this.connectMetrics = new ConnectMetrics(workerConfig); this.stateManagementService = stateManagementService; + CollectorRegistry.defaultRegistry.register(new DropwizardExports(connectMetrics.registry(), new PrometheusSampleBuilder())); Review Comment: `CollectorRegistry.defaultRegistry.register(...)` is called with no corresponding `unregister()`. If the Worker is re-created (e.g., in tests or on restart within the same JVM), the second registration will throw `IllegalArgumentException: Collector already registered`. Use an instance-scoped `CollectorRegistry` instead of the global default, or add unregister logic on shutdown. ########## rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/rest/PrometheusMetricsServlet.java: ########## @@ -0,0 +1,127 @@ +/* + * 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.rocketmq.connect.runtime.rest; + +import io.prometheus.client.Collector; +import io.prometheus.client.CollectorRegistry; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class PrometheusMetricsServlet extends HttpServlet { + private CollectorRegistry registry; + + public PrometheusMetricsServlet() { + this(CollectorRegistry.defaultRegistry); + } + + public PrometheusMetricsServlet(CollectorRegistry registry) { + this.registry = registry; + } + + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + resp.setStatus(200); + resp.setContentType("text/plain; version=0.0.4; charset=utf-8"); + StringWriter writer = new StringWriter(); + + this.writeEscapedHelp(writer, registry); + resp.getOutputStream().print(writer.toString()); + } + + public void writeEscapedHelp(StringWriter writer, CollectorRegistry registry) throws IOException { + Enumeration<Collector.MetricFamilySamples> metricFamilySamplesEnumeration = registry.metricFamilySamples(); + List<Collector.MetricFamilySamples> list = new ArrayList<>(); Review Comment: This class hand-rolls the Prometheus text exposition format instead of using `io.prometheus.client.exporter.common.TextFormat` (which is part of `simpleclient_common`). The manual writer uses raw integer literals (`123`, `125`, `10`, `32`) instead of char literals (`'{'`, `'}'`, `'\n'`, `' '`), hurting readability. More importantly, it is missing `# HELP` and `# TYPE` lines that Prometheus expects, so the output is not fully spec-compliant. ########## rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/rest/PrometheusMetricsServlet.java: ########## @@ -0,0 +1,127 @@ +/* + * 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.rocketmq.connect.runtime.rest; + +import io.prometheus.client.Collector; +import io.prometheus.client.CollectorRegistry; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class PrometheusMetricsServlet extends HttpServlet { + private CollectorRegistry registry; + + public PrometheusMetricsServlet() { + this(CollectorRegistry.defaultRegistry); + } + + public PrometheusMetricsServlet(CollectorRegistry registry) { + this.registry = registry; + } + + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + resp.setStatus(200); + resp.setContentType("text/plain; version=0.0.4; charset=utf-8"); + StringWriter writer = new StringWriter(); + + this.writeEscapedHelp(writer, registry); + resp.getOutputStream().print(writer.toString()); + } + + public void writeEscapedHelp(StringWriter writer, CollectorRegistry registry) throws IOException { + Enumeration<Collector.MetricFamilySamples> metricFamilySamplesEnumeration = registry.metricFamilySamples(); + List<Collector.MetricFamilySamples> list = new ArrayList<>(); + while (metricFamilySamplesEnumeration.hasMoreElements()) { + Collector.MetricFamilySamples metricFamilySamples = metricFamilySamplesEnumeration.nextElement(); + list.add(metricFamilySamples); + } + writeEscapedHelp(writer, list); + } + + public void writeEscapedHelp(StringWriter writer, List<Collector.MetricFamilySamples> mfs) throws IOException { + if (Objects.nonNull(mfs) && mfs.size() != 0) { + for (Collector.MetricFamilySamples metricFamilySamples : mfs) { + for (Iterator var3 = metricFamilySamples.samples.iterator(); var3.hasNext(); writer.write(10)) { + Collector.MetricFamilySamples.Sample sample = (Collector.MetricFamilySamples.Sample) var3.next(); + writer.write(sample.name); + if (sample.labelNames.size() > 0) { + writer.write(123); + + for (int i = 0; i < sample.labelNames.size(); ++i) { + writer.write((String) sample.labelNames.get(i)); + writer.write("=\""); + writeEscapedLabelValue(writer, (String) sample.labelValues.get(i)); + writer.write("\","); + } + + writer.write(125); + } + + writer.write(32); + writer.write(Collector.doubleToGoString(sample.value)); + if (sample.timestampMs != null) { + writer.write(32); + writer.write(sample.timestampMs.toString()); + } + } + } + } + + } + + private static void writeEscapedLabelValue(Writer writer, String s) throws IOException { + for (int i = 0; i < s.length(); ++i) { + char c = s.charAt(i); + switch (c) { + case '\n': + writer.append("\\n"); + break; + case '"': + writer.append("\\\""); + break; + case '\\': + writer.append("\\\\"); + break; + default: + writer.append(c); + } + } + + } + + private Set<String> parse(HttpServletRequest req) { + String[] includedParam = req.getParameterValues("name[]"); Review Comment: The `parse()` method reads `name[]` query parameters for metric filtering but is never called anywhere. Dead code — either wire it into `doGet` to support selective metric export or remove it. ########## rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/config/WorkerConfig.java: ########## @@ -58,6 +58,8 @@ public class WorkerConfig { */ private int httpPort = 8082; + private int exporterPort = 5557; Review Comment: The `exporterPort` field (default 5557) is not populated from the properties map like other config fields (e.g., `httpPort`). There is no `buildWorkerConfig()` / init logic that reads it from a config key, so the setter is the only way to change it. Add it to the config loading path to be consistent with the rest of the class. ########## rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/rest/PrometheusMetricsServlet.java: ########## @@ -0,0 +1,127 @@ +/* + * 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.rocketmq.connect.runtime.rest; + +import io.prometheus.client.Collector; +import io.prometheus.client.CollectorRegistry; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class PrometheusMetricsServlet extends HttpServlet { + private CollectorRegistry registry; + + public PrometheusMetricsServlet() { + this(CollectorRegistry.defaultRegistry); + } + + public PrometheusMetricsServlet(CollectorRegistry registry) { + this.registry = registry; + } + + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + resp.setStatus(200); + resp.setContentType("text/plain; version=0.0.4; charset=utf-8"); + StringWriter writer = new StringWriter(); + + this.writeEscapedHelp(writer, registry); + resp.getOutputStream().print(writer.toString()); + } + + public void writeEscapedHelp(StringWriter writer, CollectorRegistry registry) throws IOException { + Enumeration<Collector.MetricFamilySamples> metricFamilySamplesEnumeration = registry.metricFamilySamples(); + List<Collector.MetricFamilySamples> list = new ArrayList<>(); + while (metricFamilySamplesEnumeration.hasMoreElements()) { + Collector.MetricFamilySamples metricFamilySamples = metricFamilySamplesEnumeration.nextElement(); + list.add(metricFamilySamples); + } + writeEscapedHelp(writer, list); + } + + public void writeEscapedHelp(StringWriter writer, List<Collector.MetricFamilySamples> mfs) throws IOException { + if (Objects.nonNull(mfs) && mfs.size() != 0) { + for (Collector.MetricFamilySamples metricFamilySamples : mfs) { + for (Iterator var3 = metricFamilySamples.samples.iterator(); var3.hasNext(); writer.write(10)) { + Collector.MetricFamilySamples.Sample sample = (Collector.MetricFamilySamples.Sample) var3.next(); + writer.write(sample.name); + if (sample.labelNames.size() > 0) { + writer.write(123); + + for (int i = 0; i < sample.labelNames.size(); ++i) { + writer.write((String) sample.labelNames.get(i)); + writer.write("=\""); + writeEscapedLabelValue(writer, (String) sample.labelValues.get(i)); + writer.write("\","); + } + + writer.write(125); + } + + writer.write(32); + writer.write(Collector.doubleToGoString(sample.value)); + if (sample.timestampMs != null) { + writer.write(32); + writer.write(sample.timestampMs.toString()); + } + } + } + } + + } + + private static void writeEscapedLabelValue(Writer writer, String s) throws IOException { + for (int i = 0; i < s.length(); ++i) { + char c = s.charAt(i); + switch (c) { + case '\n': + writer.append("\\n"); + break; + case '"': + writer.append("\\\""); + break; + case '\\': + writer.append("\\\\"); + break; + default: + writer.append(c); + } + } + + } + + private Set<String> parse(HttpServletRequest req) { + String[] includedParam = req.getParameterValues("name[]"); + return (Set) (includedParam == null ? Collections.emptySet() : new HashSet(Arrays.asList(includedParam))); + } + + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { Review Comment: `doPost` delegates to `doGet`. Exposing metrics via POST is unconventional and unnecessary — Prometheus only scrapes via GET. Remove `doPost` to reduce the attack surface. ########## metric-exporter/src/main/java/org/apache/rocketmq/connect/metrics/DropwizardExports.java: ########## @@ -0,0 +1,234 @@ +/* + * 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.rocketmq.connect.metrics; + +import com.codahale.metrics.Counter; +import com.codahale.metrics.Gauge; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.Meter; +import com.codahale.metrics.Metric; +import com.codahale.metrics.MetricFilter; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Snapshot; +import com.codahale.metrics.Timer; +import io.prometheus.client.dropwizard.samplebuilder.DefaultSampleBuilder; +import io.prometheus.client.dropwizard.samplebuilder.SampleBuilder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.rocketmq.connect.metrics.stats.Stat; + +/** + * Collect Dropwizard metrics from a MetricRegistry. + */ +public class DropwizardExports extends io.prometheus.client.Collector implements io.prometheus.client.Collector.Describable { + private static final Logger LOGGER = Logger.getLogger(DropwizardExports.class.getName()); + private MetricRegistry registry; + private MetricFilter metricFilter; + private SampleBuilder sampleBuilder; + + /** + * Creates a new DropwizardExports with a {@link DefaultSampleBuilder} and {@link MetricFilter#ALL}. + * + * @param registry a metric registry to export in prometheus. + */ + public DropwizardExports(MetricRegistry registry) { + this.registry = registry; + this.metricFilter = MetricFilter.ALL; + this.sampleBuilder = new DefaultSampleBuilder(); + } + + /** + * Creates a new DropwizardExports with a {@link DefaultSampleBuilder} and custom {@link MetricFilter}. + * + * @param registry a metric registry to export in prometheus. + * @param metricFilter a custom metric filter. + */ + public DropwizardExports(MetricRegistry registry, MetricFilter metricFilter) { + this.registry = registry; + this.metricFilter = metricFilter; + this.sampleBuilder = new DefaultSampleBuilder(); + } + + /** + * @param registry a metric registry to export in prometheus. + * @param sampleBuilder sampleBuilder to use to create prometheus samples. + */ + public DropwizardExports(MetricRegistry registry, SampleBuilder sampleBuilder) { + this.registry = registry; + this.metricFilter = MetricFilter.ALL; + this.sampleBuilder = sampleBuilder; + } + + /** + * @param registry a metric registry to export in prometheus. + * @param metricFilter a custom metric filter. + * @param sampleBuilder sampleBuilder to use to create prometheus samples. + */ + public DropwizardExports(MetricRegistry registry, MetricFilter metricFilter, SampleBuilder sampleBuilder) { + this.registry = registry; + this.metricFilter = metricFilter; + this.sampleBuilder = sampleBuilder; + } + + private static String getHelpMessage(String metricName, Metric metric) { + return String.format("Generated from Dropwizard metric import (metric=%s, type=%s)", metricName, metric.getClass().getName()); + } + + /** + * Export counter as Prometheus <a href="https://prometheus.io/docs/concepts/metric_types/#gauge";>Gauge</a>. + */ + MetricFamilySamples fromCounter(String dropwizardName, Counter counter) { + MetricFamilySamples.Sample sample = sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), new Long(counter.getCount()).doubleValue()); + return new MetricFamilySamples(sample.name, Type.GAUGE, getHelpMessage(dropwizardName, counter), Arrays.asList(sample)); + } + Review Comment: `new Long(counter.getCount()).doubleValue()` uses the deprecated `Long` constructor. Replace with `(double) counter.getCount()` or `Long.valueOf(...).doubleValue()`. ########## rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/rest/PrometheusMetricsServlet.java: ########## @@ -0,0 +1,127 @@ +/* + * 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.rocketmq.connect.runtime.rest; + +import io.prometheus.client.Collector; +import io.prometheus.client.CollectorRegistry; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class PrometheusMetricsServlet extends HttpServlet { + private CollectorRegistry registry; + + public PrometheusMetricsServlet() { + this(CollectorRegistry.defaultRegistry); Review Comment: No tests are included for any of the new classes (`DropwizardExports`, `PrometheusSampleBuilder`, `PrometheusMetricsServlet`). The PR description claims unit tests are written (>80% coverage), but no test files are present in the diff. This is a significant gap for a metrics-exporting feature where parsing bugs can silently produce wrong dashboards. ########## metric-exporter/src/main/java/org/apache/rocketmq/connect/metrics/DropwizardExports.java: ########## @@ -0,0 +1,234 @@ +/* + * 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.rocketmq.connect.metrics; + +import com.codahale.metrics.Counter; +import com.codahale.metrics.Gauge; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.Meter; +import com.codahale.metrics.Metric; +import com.codahale.metrics.MetricFilter; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Snapshot; +import com.codahale.metrics.Timer; +import io.prometheus.client.dropwizard.samplebuilder.DefaultSampleBuilder; +import io.prometheus.client.dropwizard.samplebuilder.SampleBuilder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.rocketmq.connect.metrics.stats.Stat; + +/** + * Collect Dropwizard metrics from a MetricRegistry. + */ +public class DropwizardExports extends io.prometheus.client.Collector implements io.prometheus.client.Collector.Describable { + private static final Logger LOGGER = Logger.getLogger(DropwizardExports.class.getName()); + private MetricRegistry registry; + private MetricFilter metricFilter; + private SampleBuilder sampleBuilder; + + /** + * Creates a new DropwizardExports with a {@link DefaultSampleBuilder} and {@link MetricFilter#ALL}. + * + * @param registry a metric registry to export in prometheus. + */ + public DropwizardExports(MetricRegistry registry) { + this.registry = registry; + this.metricFilter = MetricFilter.ALL; + this.sampleBuilder = new DefaultSampleBuilder(); + } + + /** + * Creates a new DropwizardExports with a {@link DefaultSampleBuilder} and custom {@link MetricFilter}. + * + * @param registry a metric registry to export in prometheus. + * @param metricFilter a custom metric filter. + */ + public DropwizardExports(MetricRegistry registry, MetricFilter metricFilter) { + this.registry = registry; + this.metricFilter = metricFilter; + this.sampleBuilder = new DefaultSampleBuilder(); + } + + /** + * @param registry a metric registry to export in prometheus. + * @param sampleBuilder sampleBuilder to use to create prometheus samples. + */ + public DropwizardExports(MetricRegistry registry, SampleBuilder sampleBuilder) { + this.registry = registry; + this.metricFilter = MetricFilter.ALL; + this.sampleBuilder = sampleBuilder; + } + + /** + * @param registry a metric registry to export in prometheus. + * @param metricFilter a custom metric filter. + * @param sampleBuilder sampleBuilder to use to create prometheus samples. + */ + public DropwizardExports(MetricRegistry registry, MetricFilter metricFilter, SampleBuilder sampleBuilder) { + this.registry = registry; + this.metricFilter = metricFilter; + this.sampleBuilder = sampleBuilder; + } + + private static String getHelpMessage(String metricName, Metric metric) { + return String.format("Generated from Dropwizard metric import (metric=%s, type=%s)", metricName, metric.getClass().getName()); + } + + /** + * Export counter as Prometheus <a href="https://prometheus.io/docs/concepts/metric_types/#gauge";>Gauge</a>. + */ + MetricFamilySamples fromCounter(String dropwizardName, Counter counter) { + MetricFamilySamples.Sample sample = sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), new Long(counter.getCount()).doubleValue()); + return new MetricFamilySamples(sample.name, Type.GAUGE, getHelpMessage(dropwizardName, counter), Arrays.asList(sample)); + } + + /** + * Export gauge as a prometheus gauge. + */ + MetricFamilySamples fromGauge(String dropwizardName, Gauge gauge) { + Object obj = gauge.getValue(); + double value; + if (obj instanceof Number) { + value = ((Number) obj).doubleValue(); + } else if (obj instanceof Boolean) { + value = ((Boolean) obj) ? 1 : 0; + } else { + LOGGER.log(Level.FINE, String.format("Invalid type for Gauge %s: %s", sanitizeMetricName(dropwizardName), obj == null ? "null" : obj.getClass().getName())); + return null; + } + MetricFamilySamples.Sample sample = sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), value); + return new MetricFamilySamples(sample.name, Type.GAUGE, getHelpMessage(dropwizardName, gauge), Arrays.asList(sample)); + } + + /** + * Export a histogram snapshot as a prometheus SUMMARY. + * + * @param dropwizardName metric name. + * @param snapshot the histogram snapshot. + * @param count the total sample count for this snapshot. + * @param factor a factor to apply to histogram values. + */ + MetricFamilySamples fromSnapshotAndCount(String dropwizardName, Snapshot snapshot, long count, double factor, + String helpMessage) { + MetricName metricName = MetricUtils.stringToMetricName(dropwizardName); + Stat.HistogramType histogramType = Stat.HistogramType.valueOf(metricName.getType()); + List<MetricFamilySamples.Sample> samples = new ArrayList<>(); + switch (histogramType) { + case Avg: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), snapshot.getMean() * factor)); + break; + case Min: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), snapshot.getMin() * factor)); + break; + case Max: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), snapshot.getMax() * factor)); + break; + case Percentile_75th: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.75"), snapshot.get75thPercentile() * factor)); + break; + case Percentile_95th: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.95"), snapshot.get95thPercentile() * factor)); + break; + case Percentile_98th: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.98"), snapshot.get98thPercentile() * factor)); + break; + case Percentile_99th: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.99"), snapshot.get99thPercentile() * factor)); + break; + case Percentile_999th: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.999"), snapshot.get999thPercentile() * factor)); + break; + default: + samples = Arrays.asList(sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.5"), snapshot.getMedian() * factor), sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.5"), snapshot.getMedian() * factor), sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.75"), snapshot.get75thPercentile() * factor), sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.95"), snapshot.get95thPercentile() * factor), sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.98"), snapshot.get98thPercentile() * factor), sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.99"), snapshot.get99thPercentile() * factor), sampleBuilder.createSample(dropwizardName, "", Arrays.asList("quantile"), Arrays.asList("0.999"), snapshot.get999thPercentile() * factor), sampleBuilder. createSample(dropwizardName, "_count", new ArrayList<String>(), new ArrayList<String>(), count)); + + } + return new MetricFamilySamples(samples.get(0).name, Type.SUMMARY, helpMessage, samples); + } + + /** + * Convert histogram snapshot. + */ + MetricFamilySamples fromHistogram(String dropwizardName, Histogram histogram) { + return fromSnapshotAndCount(dropwizardName, histogram.getSnapshot(), histogram.getCount(), 1.0, getHelpMessage(dropwizardName, histogram)); + } + + /** + * Export Dropwizard Timer as a histogram. Use TIME_UNIT as time unit. + */ + MetricFamilySamples fromTimer(String dropwizardName, Timer timer) { + return fromSnapshotAndCount(dropwizardName, timer.getSnapshot(), timer.getCount(), 1.0D / TimeUnit.SECONDS.toNanos(1L), getHelpMessage(dropwizardName, timer)); + } + + /** + * Export a Meter as as prometheus COUNTER. + */ + MetricFamilySamples fromMeter(String dropwizardName, Meter meter) { + MetricName metricName = MetricUtils.stringToMetricName(dropwizardName); + final MetricFamilySamples.Sample sample = sampleBuilder.createSample(dropwizardName, "", new ArrayList<String>(), new ArrayList<String>(), MetricUtils.getMeterValue(metricName, meter)); + return new MetricFamilySamples(sample.name, Type.COUNTER, getHelpMessage(dropwizardName, meter), Arrays.asList(sample)); + } + + @Override + public List<MetricFamilySamples> collect() { + Map<String, MetricFamilySamples> mfSamplesMap = new HashMap<String, MetricFamilySamples>(); + + for (SortedMap.Entry<String, Gauge> entry : registry.getGauges(metricFilter).entrySet()) { + addToMap(mfSamplesMap, fromGauge(entry.getKey(), entry.getValue())); + } + for (SortedMap.Entry<String, Counter> entry : registry.getCounters(metricFilter).entrySet()) { + addToMap(mfSamplesMap, fromCounter(entry.getKey(), entry.getValue())); + } + for (SortedMap.Entry<String, Histogram> entry : registry.getHistograms(metricFilter).entrySet()) { + addToMap(mfSamplesMap, fromHistogram(entry.getKey(), entry.getValue())); + } + for (SortedMap.Entry<String, Timer> entry : registry.getTimers(metricFilter).entrySet()) { + addToMap(mfSamplesMap, fromTimer(entry.getKey(), entry.getValue())); + } + for (SortedMap.Entry<String, Meter> entry : registry.getMeters(metricFilter).entrySet()) { + addToMap(mfSamplesMap, fromMeter(entry.getKey(), entry.getValue())); + } + return new ArrayList<MetricFamilySamples>(mfSamplesMap.values()); + } + + private void addToMap(Map<String, MetricFamilySamples> mfSamplesMap, MetricFamilySamples newMfSamples) { + if (newMfSamples != null) { + MetricFamilySamples currentMfSamples = mfSamplesMap.get(newMfSamples.name); + if (currentMfSamples == null) { + mfSamplesMap.put(newMfSamples.name, newMfSamples); + } else { + Set<MetricFamilySamples.Sample> samples = new HashSet<MetricFamilySamples.Sample>(currentMfSamples.samples); + samples.addAll(newMfSamples.samples); + List<MetricFamilySamples.Sample> list = new ArrayList<>(samples); + mfSamplesMap.put(newMfSamples.name, new MetricFamilySamples(newMfSamples.name, currentMfSamples.type, currentMfSamples.help, list)); + } + } + } + + @Override + public List<MetricFamilySamples> describe() { + return new ArrayList<MetricFamilySamples>(); + } +} Review Comment: Missing newline at end of file. Minor, but some tools and checkers flag this. -- 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]
