fix merge

Signed-off-by: Gregor Zeitlinger <[email protected]>

Author: zeitlinger

prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusProperties.java

@@ -116,6 +116,7 @@ public static class Builder {
     private ExporterHttpServerProperties exporterHttpServerProperties;
     private ExporterPushgatewayProperties pushgatewayProperties;
     private ExporterOpenTelemetryProperties otelConfig;
+    private NamingProperties namingProperties;
 
     private Builder() {}
 
@@ -167,6 +168,11 @@ public Builder exporterOpenTelemetryProperties(
       return this;
     }
 
+    public Builder namingProperties(NamingProperties namingProperties) {
+      this.namingProperties = namingProperties;
+      return this;
+    }
+
     public PrometheusProperties build() {
       return new PrometheusProperties(
           defaultMetricsProperties,
@@ -176,7 +182,8 @@ public PrometheusProperties build() {
           exporterFilterProperties,
           exporterHttpServerProperties,
           pushgatewayProperties,
-          otelConfig);
+          otelConfig,
+          namingProperties);
     }
   }
 }

prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusScrapeHandler.java

@@ -6,6 +6,7 @@
 import io.prometheus.metrics.expositionformats.ExpositionFormats;
 import io.prometheus.metrics.model.registry.MetricNameFilter;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.EscapingScheme;
 import io.prometheus.metrics.model.snapshots.MetricSnapshots;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -54,10 +55,11 @@ public void handleRequest(PrometheusHttpExchange exchange) throws IOException {
     try {
       PrometheusHttpRequest request = exchange.getRequest();
       MetricSnapshots snapshots = scrape(request);
-      if (writeDebugResponse(snapshots, exchange)) {
+      String acceptHeader = request.getHeader("Accept");
+      EscapingScheme escapingScheme = EscapingScheme.fromAcceptHeader(acceptHeader);
+      if (writeDebugResponse(snapshots, escapingScheme, exchange)) {
         return;
       }
-      String acceptHeader = request.getHeader("Accept");
       ExpositionFormatWriter writer = expositionFormats.findWriter(acceptHeader);
       PrometheusHttpResponse response = exchange.getResponse();
       response.setHeader("Content-Type", writer.getContentType());
@@ -66,12 +68,12 @@ public void handleRequest(PrometheusHttpExchange exchange) throws IOException {
         response.setHeader("Content-Encoding", "gzip");
         try (GZIPOutputStream gzipOutputStream =
             new GZIPOutputStream(response.sendHeadersAndGetBody(200, 0))) {
-          writer.write(gzipOutputStream, snapshots);
+          writer.write(gzipOutputStream, snapshots, escapingScheme);
         }
       } else {
         ByteArrayOutputStream responseBuffer =
             new ByteArrayOutputStream(lastResponseSize.get() + 1024);
-        writer.write(responseBuffer, snapshots);
+        writer.write(responseBuffer, snapshots, escapingScheme);
         lastResponseSize.set(responseBuffer.size());
         int contentLength = responseBuffer.size();
         if (contentLength > 0) {
@@ -136,7 +138,8 @@ private MetricSnapshots scrape(PrometheusHttpRequest request) {
     }
   }
 
-  private boolean writeDebugResponse(MetricSnapshots snapshots, PrometheusHttpExchange exchange)
+  private boolean writeDebugResponse(
+      MetricSnapshots snapshots, EscapingScheme escapingScheme, PrometheusHttpExchange exchange)
       throws IOException {
     String debugParam = exchange.getRequest().getParameter("debug");
     PrometheusHttpResponse response = exchange.getResponse();
@@ -148,14 +151,16 @@ private boolean writeDebugResponse(MetricSnapshots snapshots, PrometheusHttpExch
       OutputStream body = response.sendHeadersAndGetBody(responseStatus, 0);
       switch (debugParam) {
         case "openmetrics":
-          expositionFormats.getOpenMetricsTextFormatWriter().write(body, snapshots);
+          expositionFormats.getOpenMetricsTextFormatWriter().write(body, snapshots, escapingScheme);
           break;
         case "text":
-          expositionFormats.getPrometheusTextFormatWriter().write(body, snapshots);
+          expositionFormats.getPrometheusTextFormatWriter().write(body, snapshots, escapingScheme);
           break;
         case "prometheus-protobuf":
           String debugString =
-              expositionFormats.getPrometheusProtobufWriter().toDebugString(snapshots);
+              expositionFormats
+                  .getPrometheusProtobufWriter()
+                  .toDebugString(snapshots, escapingScheme);
           body.write(debugString.getBytes(StandardCharsets.UTF_8));
           break;
         default:

prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/PushGateway.java

@@ -1,5 +1,8 @@
 package io.prometheus.metrics.exporter.pushgateway;
 
+import static io.prometheus.metrics.exporter.pushgateway.Scheme.HTTP;
+import static io.prometheus.metrics.model.snapshots.PrometheusNaming.escapeName;
+
 import io.prometheus.metrics.config.ExporterPushgatewayProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.config.PrometheusPropertiesException;
@@ -10,7 +13,6 @@
 import io.prometheus.metrics.model.registry.MultiCollector;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import io.prometheus.metrics.model.snapshots.EscapingScheme;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,9 +32,6 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import static io.prometheus.metrics.exporter.pushgateway.Scheme.HTTP;
-import static io.prometheus.metrics.model.snapshots.PrometheusNaming.escapeName;
-
 /**
  * Export metrics via the <a href="https://github.com/prometheus/pushgateway">Prometheus
  * Pushgateway</a>