Fix write errors in tests

Signed-off-by: Federico Torres <[email protected]>

Author: fedetorres93

prometheus-metrics-instrumentation-dropwizard/src/test/java/io/prometheus/metrics/instrumentation/dropwizard/DropwizardExportsTest.java

@@ -1,6 +1,5 @@
 package io.prometheus.metrics.instrumentation.dropwizard;
 
-import static io.prometheus.metrics.model.snapshots.PrometheusNaming.nameEscapingScheme;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -342,8 +341,7 @@ private String convertToOpenMetricsFormat(PrometheusRegistry _registry) {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     OpenMetricsTextFormatWriter writer = new OpenMetricsTextFormatWriter(true, true);
     try {
-      nameEscapingScheme = EscapingScheme.NO_ESCAPING;
-      writer.write(out, _registry.scrape());
+      writer.write(out, _registry.scrape(), EscapingScheme.NO_ESCAPING);
       return out.toString(StandardCharsets.UTF_8);
     } catch (IOException e) {
       throw new RuntimeException(e);

prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExportsTest.java

@@ -1,6 +1,5 @@
 package io.prometheus.metrics.instrumentation.dropwizard5;
 
-import static io.prometheus.metrics.model.snapshots.PrometheusNaming.nameEscapingScheme;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.data.Offset.offset;
@@ -351,8 +350,7 @@ private String convertToOpenMetricsFormat(PrometheusRegistry _registry) {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     OpenMetricsTextFormatWriter writer = new OpenMetricsTextFormatWriter(true, true);
     try {
-      nameEscapingScheme = EscapingScheme.NO_ESCAPING;
-      writer.write(out, _registry.scrape());
+      writer.write(out, _registry.scrape(), EscapingScheme.NO_ESCAPING);
       return out.toString(StandardCharsets.UTF_8.name());
     } catch (IOException e) {
       throw new RuntimeException(e);

prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/CustomLabelMapperTest.java

@@ -1,6 +1,5 @@
 package io.prometheus.metrics.instrumentation.dropwizard5.labels;
 
-import static io.prometheus.metrics.model.snapshots.PrometheusNaming.nameEscapingScheme;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
@@ -220,8 +219,7 @@ private String convertToOpenMetricsFormat(MetricSnapshots snapshots) {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     OpenMetricsTextFormatWriter writer = new OpenMetricsTextFormatWriter(true, true);
     try {
-      nameEscapingScheme = EscapingScheme.NO_ESCAPING;
-      writer.write(out, snapshots);
+      writer.write(out, snapshots, EscapingScheme.NO_ESCAPING);
       return out.toString(StandardCharsets.UTF_8.name());
     } catch (IOException e) {
       throw new RuntimeException(e);

prometheus-metrics-instrumentation-guava/src/test/java/io/prometheus/metrics/instrumentation/guava/CacheMetricsCollectorTest.java

@@ -1,6 +1,5 @@
 package io.prometheus.metrics.instrumentation.guava;
 
-import static io.prometheus.metrics.model.snapshots.PrometheusNaming.nameEscapingScheme;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
@@ -163,8 +162,7 @@ private String convertToOpenMetricsFormat(PrometheusRegistry registry) {
     final ByteArrayOutputStream out = new ByteArrayOutputStream();
     final OpenMetricsTextFormatWriter writer = new OpenMetricsTextFormatWriter(true, true);
     try {
-      nameEscapingScheme = EscapingScheme.NO_ESCAPING;
-      writer.write(out, registry.scrape());
+      writer.write(out, registry.scrape(), EscapingScheme.NO_ESCAPING);
       return out.toString(StandardCharsets.UTF_8.name());
     } catch (IOException e) {
       throw new UncheckedIOException(e);

prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/TestUtil.java

@@ -7,15 +7,12 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
-import static io.prometheus.metrics.model.snapshots.PrometheusNaming.nameEscapingScheme;
-
 class TestUtil {
 
   static String convertToOpenMetricsFormat(MetricSnapshots snapshots) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     OpenMetricsTextFormatWriter writer = new OpenMetricsTextFormatWriter(true, true);
-    nameEscapingScheme = EscapingScheme.NO_ESCAPING;
-    writer.write(out, snapshots);
+    writer.write(out, snapshots, EscapingScheme.NO_ESCAPING);
     return out.toString(StandardCharsets.UTF_8.name());
   }
 }

prometheus-metrics-simpleclient-bridge/src/test/java/io/prometheus/metrics/simpleclient/bridge/SimpleclientCollectorTest.java

@@ -1,6 +1,5 @@
 package io.prometheus.metrics.simpleclient.bridge;
 
-import static io.prometheus.metrics.model.snapshots.PrometheusNaming.nameEscapingScheme;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.prometheus.client.Collector;
@@ -269,8 +268,7 @@ private String origOpenMetrics() throws IOException {
   private String newOpenMetrics() throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     OpenMetricsTextFormatWriter writer = new OpenMetricsTextFormatWriter(true, false);
-    nameEscapingScheme = EscapingScheme.NO_ESCAPING;
-    writer.write(out, newRegistry.scrape());
+    writer.write(out, newRegistry.scrape(), EscapingScheme.NO_ESCAPING);
     return out.toString(StandardCharsets.UTF_8.name());
   }
 }