(solr) branch main updated (e664779f5da -> cda87a14dad)

[ds...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


    from e664779f5da SOLR-10654: PrometheusResponseWriter Content Type was wrong (#2616)
     add cda87a14dad SOLR-10654: Rename SolrPrometheusExporter to SolrPrometheusFormatter (#2620)

No new revisions were added by this update.

Summary of changes:
 .../apache/solr/metrics/prometheus/SolrMetric.java |  8 ++--
 .../solr/metrics/prometheus/SolrNoOpMetric.java    |  2 +-
 ...sExporter.java => SolrPrometheusFormatter.java} |  6 +--
 ...rInfo.java => PrometheusCoreFormatterInfo.java} |  2 +-
 .../prometheus/core/SolrCoreCacheMetric.java       |  6 +--
 .../prometheus/core/SolrCoreHandlerMetric.java     | 14 +++----
 .../prometheus/core/SolrCoreHighlighterMetric.java |  6 +--
 .../prometheus/core/SolrCoreIndexMetric.java       |  6 +--
 .../metrics/prometheus/core/SolrCoreMetric.java    |  2 +-
 .../prometheus/core/SolrCoreSearcherMetric.java    | 11 +++---
 .../prometheus/core/SolrCoreTlogMetric.java        |  6 +--
 ...orter.java => SolrPrometheusCoreFormatter.java} | 10 ++---
 .../solr/metrics/prometheus/core/package-info.java |  4 +-
 .../jetty/SolrJettyDispatchesMetric.java           |  6 +--
 .../prometheus/jetty/SolrJettyReqRespMetric.java   | 10 ++---
 ...rter.java => SolrPrometheusJettyFormatter.java} |  6 +--
 .../metrics/prometheus/jetty/package-info.java     |  2 +-
 ...erInfo.java => PrometheusJvmFormatterInfo.java} |  2 +-
 .../prometheus/jvm/SolrJvmBuffersMetric.java       |  8 ++--
 .../metrics/prometheus/jvm/SolrJvmGcMetrics.java   |  8 ++--
 .../prometheus/jvm/SolrJvmMemoryMetric.java        |  8 ++--
 .../metrics/prometheus/jvm/SolrJvmOsMetric.java    |  8 ++--
 ...porter.java => SolrPrometheusJvmFormatter.java} |  8 ++--
 .../solr/metrics/prometheus/jvm/package-info.java  |  2 +-
 ...rInfo.java => PrometheusNodeFormatterInfo.java} |  2 +-
 .../prometheus/node/SolrNodeContainerMetric.java   |  8 ++--
 .../prometheus/node/SolrNodeHandlerMetric.java     | 12 +++---
 ...orter.java => SolrPrometheusNodeFormatter.java} | 10 ++---
 .../solr/metrics/prometheus/node/package-info.java |  4 +-
 .../solr/metrics/prometheus/package-info.java      |  2 +-
 .../solr/response/PrometheusResponseWriter.java    | 40 +++++++++----------
 .../solr/handler/admin/MetricsHandlerTest.java     | 36 +++++++++--------
 .../apache/solr/metrics/SolrCoreMetricTest.java    |  4 +-
 ...rTest.java => SolrPrometheusFormatterTest.java} | 46 +++++++++++-----------
 34 files changed, 159 insertions(+), 156 deletions(-)
 rename solr/core/src/java/org/apache/solr/metrics/prometheus/{SolrPrometheusExporter.java => SolrPrometheusFormatter.java} (98%)
 rename solr/core/src/java/org/apache/solr/metrics/prometheus/core/{PrometheusCoreExporterInfo.java => PrometheusCoreFormatterInfo.java} (96%)
 rename solr/core/src/java/org/apache/solr/metrics/prometheus/core/{SolrPrometheusCoreExporter.java => SolrPrometheusCoreFormatter.java} (88%)
 rename solr/core/src/java/org/apache/solr/metrics/prometheus/jetty/{SolrPrometheusJettyExporter.java => SolrPrometheusJettyFormatter.java} (90%)
 rename solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/{PrometheusJvmExporterInfo.java => PrometheusJvmFormatterInfo.java} (95%)
 rename solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/{SolrPrometheusJvmExporter.java => SolrPrometheusJvmFormatter.java} (90%)
 rename solr/core/src/java/org/apache/solr/metrics/prometheus/node/{PrometheusNodeExporterInfo.java => PrometheusNodeFormatterInfo.java} (95%)
 rename solr/core/src/java/org/apache/solr/metrics/prometheus/node/{SolrPrometheusNodeExporter.java => SolrPrometheusNodeFormatter.java} (91%)
 rename solr/core/src/test/org/apache/solr/metrics/{SolrPrometheusExporterTest.java => SolrPrometheusFormatterTest.java} (72%)