You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ds...@apache.org on 2024/08/08 03:21:41 UTC

(solr) branch main updated: SOLR-10654: PrometheusResponseWriter Content Type was wrong (#2616)

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

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


The following commit(s) were added to refs/heads/main by this push:
     new e664779f5da SOLR-10654: PrometheusResponseWriter Content Type was wrong (#2616)
e664779f5da is described below

commit e664779f5da06bdd4a3e16a86cb70b012a094285
Author: Matthew Biscocho <54...@users.noreply.github.com>
AuthorDate: Wed Aug 7 23:21:35 2024 -0400

    SOLR-10654: PrometheusResponseWriter Content Type was wrong (#2616)
    
    
    
    Co-authored-by: Matthew Biscocho <mb...@bloomberg.net>
    Co-authored-by: David Smiley <ds...@apache.org>
---
 .../src/java/org/apache/solr/response/PrometheusResponseWriter.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java
index e67b20a0007..f465cf466cb 100644
--- a/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java
@@ -49,6 +49,7 @@ import org.slf4j.LoggerFactory;
  */
 @SuppressWarnings(value = "unchecked")
 public class PrometheusResponseWriter extends RawResponseWriter {
+  private static final String CONTENT_TYPE_PROMETHEUS = "text/plain; version=0.0.4";
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   @Override
@@ -63,6 +64,11 @@ public class PrometheusResponseWriter extends RawResponseWriter {
     }
   }
 
+  @Override
+  public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
+    return CONTENT_TYPE_PROMETHEUS;
+  }
+
   /**
    * Provides a representation of the given Dropwizard metric registry as {@link
    * SolrPrometheusCoreExporter}-s. Only those metrics are converted which match at least one of the