mlbiscoc commented on code in PR #3745: URL: https://github.com/apache/solr/pull/3745#discussion_r2427203038
########## solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReporter.java: ########## @@ -1,496 +0,0 @@ -/* - * 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.solr.metrics.reporters.solr; - -import com.codahale.metrics.Counter; -import com.codahale.metrics.Gauge; -import com.codahale.metrics.Histogram; -import com.codahale.metrics.Meter; -import com.codahale.metrics.MetricFilter; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.ScheduledReporter; -import com.codahale.metrics.Timer; -import java.lang.invoke.MethodHandles; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -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.function.Supplier; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; -import org.apache.solr.client.solrj.SolrClient; -import org.apache.solr.client.solrj.io.SolrClientCache; -import org.apache.solr.client.solrj.request.UpdateRequest; -import org.apache.solr.common.params.ModifiableSolrParams; -import org.apache.solr.common.params.SolrParams; -import org.apache.solr.handler.admin.MetricsCollectorHandler; -import org.apache.solr.metrics.SolrMetricManager; -import org.apache.solr.util.stats.MetricUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Implementation of {@link ScheduledReporter} that reports metrics from selected registries and - * sends them periodically as update requests to a selected Solr collection and to a configured - * handler. - */ -public class SolrReporter extends ScheduledReporter { Review Comment: @dsmiley Just to respond to the JIRA, here is where I removed the reporter. ########## solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java: ########## @@ -108,6 +109,18 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw SolrException.ErrorCode.INVALID_STATE, "SolrMetricManager instance not initialized"); } + SolrParams params = req.getParams(); + String format = params.get(CommonParams.WT); + + if (format == null) { + req.setParams(SolrParams.wrapDefaults(params, SolrParams.of("wt", "prometheus"))); Review Comment: Now defaulting to prometheus -- 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]
