-
Notifications
You must be signed in to change notification settings - Fork 674
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into SOLR-17195-min-prefix-soft-limit
- Loading branch information
Showing
61 changed files
with
4,326 additions
and
175 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
solr/core/src/java/org/apache/solr/metrics/prometheus/SolrMetric.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * 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.prometheus; | ||
|
|
||
| import com.codahale.metrics.Metric; | ||
| import io.prometheus.metrics.model.snapshots.Labels; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Base class is a wrapper to categorize and export {@link com.codahale.metrics.Metric} to {@link | ||
| * io.prometheus.metrics.model.snapshots.DataPointSnapshot} and register to a {@link | ||
| * SolrPrometheusExporter}. {@link com.codahale.metrics.MetricRegistry} does not support tags unlike | ||
| * prometheus. Metrics registered to the registry need to be parsed out from the metric name to be | ||
| * exported to {@link io.prometheus.metrics.model.snapshots.DataPointSnapshot} | ||
| */ | ||
| public abstract class SolrMetric { | ||
| public Metric dropwizardMetric; | ||
| public String metricName; | ||
| public Map<String, String> labels = new HashMap<>(); | ||
|
|
||
| public SolrMetric() {} | ||
|
|
||
| public SolrMetric(Metric dropwizardMetric, String metricName) { | ||
| this.dropwizardMetric = dropwizardMetric; | ||
| this.metricName = metricName; | ||
| } | ||
|
|
||
| /* | ||
| * Parse labels from the Dropwizard Metric name to be exported | ||
| */ | ||
| public abstract SolrMetric parseLabels(); | ||
|
|
||
| /* | ||
| * Export metric to Prometheus with labels | ||
| */ | ||
| public abstract void toPrometheus(SolrPrometheusExporter exporter); | ||
|
|
||
| public Labels getLabels() { | ||
| return Labels.of(new ArrayList<>(labels.keySet()), new ArrayList<>(labels.values())); | ||
| } | ||
| } |
29 changes: 29 additions & 0 deletions
29
solr/core/src/java/org/apache/solr/metrics/prometheus/SolrNoOpMetric.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* | ||
| * 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.prometheus; | ||
|
|
||
| public class SolrNoOpMetric extends SolrMetric { | ||
| public SolrNoOpMetric() {} | ||
|
|
||
| @Override | ||
| public SolrMetric parseLabels() { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public void toPrometheus(SolrPrometheusExporter exporter) {} | ||
| } |
Oops, something went wrong.