Merge pull request spring-projects#48957 from jonatan-ivanov

* spring-projectsgh-48957:
  Polish "Add compression mode OTLP property"
  Add compression mode OTLP property

Closes spring-projectsgh-48957

Author: wilkinsona

module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/otlp/OtlpMetricsProperties.java

@@ -21,6 +21,7 @@
 import java.util.concurrent.TimeUnit;
 
 import io.micrometer.registry.otlp.AggregationTemporality;
+import io.micrometer.registry.otlp.CompressionMode;
 import io.micrometer.registry.otlp.HistogramFlavor;
 import org.jspecify.annotations.Nullable;
 
@@ -49,6 +50,11 @@ public class OtlpMetricsProperties extends StepRegistryProperties {
 	 */
 	private AggregationTemporality aggregationTemporality = AggregationTemporality.CUMULATIVE;
 
+	/**
+	 * Compression mode to use when exporting metrics.
+	 */
+	private CompressionMode compressionMode = CompressionMode.NONE;
+
 	/**
 	 * Headers for the exported metrics.
 	 */
@@ -96,6 +102,14 @@ public void setAggregationTemporality(AggregationTemporality aggregationTemporal
 		this.aggregationTemporality = aggregationTemporality;
 	}
 
+	public CompressionMode getCompressionMode() {
+		return this.compressionMode;
+	}
+
+	public void setCompressionMode(CompressionMode compressionMode) {
+		this.compressionMode = compressionMode;
+	}
+
 	public @Nullable Map<String, String> getHeaders() {
 		return this.headers;
 	}

module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/otlp/OtlpMetricsPropertiesConfigAdapter.java

@@ -22,6 +22,7 @@
 import java.util.concurrent.TimeUnit;
 
 import io.micrometer.registry.otlp.AggregationTemporality;
+import io.micrometer.registry.otlp.CompressionMode;
 import io.micrometer.registry.otlp.HistogramFlavor;
 import io.micrometer.registry.otlp.OtlpConfig;
 
@@ -72,6 +73,11 @@ public AggregationTemporality aggregationTemporality() {
 		return obtain(OtlpMetricsProperties::getAggregationTemporality, OtlpConfig.super::aggregationTemporality);
 	}
 
+	@Override
+	public CompressionMode compressionMode() {
+		return obtain(OtlpMetricsProperties::getCompressionMode, OtlpConfig.super::compressionMode);
+	}
+
 	@Override
 	public Map<String, String> resourceAttributes() {
 		Map<String, String> resourceAttributes = new LinkedHashMap<>();

module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/otlp/OtlpMetricsPropertiesConfigAdapterTests.java

@@ -20,6 +20,7 @@
 import java.util.concurrent.TimeUnit;
 
 import io.micrometer.registry.otlp.AggregationTemporality;
+import io.micrometer.registry.otlp.CompressionMode;
 import io.micrometer.registry.otlp.HistogramFlavor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -88,6 +89,17 @@ void whenPropertiesAggregationTemporalityIsSetAdapterAggregationTemporalityRetur
 		assertThat(createAdapter().aggregationTemporality()).isSameAs(AggregationTemporality.DELTA);
 	}
 
+	@Test
+	void whenPropertiesCompressionModeIsNotSetAdapterCompressionModeReturnsNone() {
+		assertThat(createAdapter().compressionMode()).isSameAs(CompressionMode.NONE);
+	}
+
+	@Test
+	void whenPropertiesCompressionModeIsSetAdapterCompressionModeReturnsIt() {
+		this.properties.setCompressionMode(CompressionMode.GZIP);
+		assertThat(createAdapter().compressionMode()).isSameAs(CompressionMode.GZIP);
+	}
+
 	@Test
 	void whenOpenTelemetryPropertiesResourceAttributesIsSetAdapterResourceAttributesReturnsIt() {
 		this.openTelemetryProperties.setResourceAttributes(Map.of("service.name", "boot-service"));

module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/otlp/OtlpMetricsPropertiesTests.java

@@ -36,6 +36,7 @@ void defaultValuesAreConsistent() {
 		OtlpConfig config = OtlpConfig.DEFAULT;
 		assertStepRegistryDefaultValues(properties, config);
 		assertThat(properties.getAggregationTemporality()).isSameAs(config.aggregationTemporality());
+		assertThat(properties.getCompressionMode()).isSameAs(config.compressionMode());
 		assertThat(properties.getHistogramFlavor()).isSameAs(config.histogramFlavor());
 		assertThat(properties.getMaxScale()).isEqualTo(config.maxScale());
 		assertThat(properties.getMaxBucketCount()).isEqualTo(config.maxBucketCount());