Skip to content

Commit 424df35

Browse files
Polish #7012
gh-7012
1 parent 49ea5d4 commit 424df35

File tree

3 files changed

+9
-22
lines changed

3 files changed

+9
-22
lines changed

implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/CompressionMode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2025 VMware, Inc.
2+
* Copyright 2026 VMware, Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ default AggregationTemporality aggregationTemporality() {
164164
* {@code OTEL_EXPORTER_OTLP_METRICS_COMPRESSION} when a value is not provided by
165165
* {@link #get(String)}. If both are set,
166166
* {@code OTEL_EXPORTER_OTLP_METRICS_COMPRESSION} takes precedence.
167-
* @return the compressionMode; default is OFF
167+
* @return the compressionMode; default is {@link CompressionMode#NONE}
168168
* @since 1.17.0
169169
*/
170170
default CompressionMode compressionMode() {

implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OTelCollectorIntegrationTest.java

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
import java.time.Duration;
3030

31+
import static io.micrometer.registry.otlp.CompressionMode.GZIP;
32+
import static io.micrometer.registry.otlp.CompressionMode.NONE;
3133
import static io.restassured.RestAssured.given;
3234
import static org.awaitility.Awaitility.await;
3335
import static org.hamcrest.Matchers.*;
@@ -172,30 +174,15 @@ private OtlpMeterRegistry createOtlpMeterRegistryForContainer(GenericContainer<?
172174

173175
private OtlpMeterRegistry createOtlpMeterRegistryForContainerWithGzipCompression(GenericContainer<?> container)
174176
throws Exception {
175-
return withEnvironmentVariables("OTEL_SERVICE_NAME", "test").execute(
176-
() -> new OtlpMeterRegistry(createOtlpConfigForContainerWithGzipCompression(container), Clock.SYSTEM));
177+
return withEnvironmentVariables("OTEL_SERVICE_NAME", "test")
178+
.execute(() -> new OtlpMeterRegistry(createOtlpConfigForContainer(container, GZIP), Clock.SYSTEM));
177179
}
178180

179181
private OtlpConfig createOtlpConfigForContainer(GenericContainer<?> container) {
180-
return new OtlpConfig() {
181-
@Override
182-
public String url() {
183-
return String.format("http://%s:%d/v1/metrics", container.getHost(), container.getMappedPort(4318));
184-
}
185-
186-
@Override
187-
public Duration step() {
188-
return Duration.ofSeconds(1);
189-
}
190-
191-
@Override
192-
public @Nullable String get(String key) {
193-
return null;
194-
}
195-
};
182+
return createOtlpConfigForContainer(container, NONE);
196183
}
197184

198-
private OtlpConfig createOtlpConfigForContainerWithGzipCompression(GenericContainer<?> container) {
185+
private OtlpConfig createOtlpConfigForContainer(GenericContainer<?> container, CompressionMode compressionMode) {
199186
return new OtlpConfig() {
200187
@Override
201188
public String url() {
@@ -209,7 +196,7 @@ public Duration step() {
209196

210197
@Override
211198
public CompressionMode compressionMode() {
212-
return CompressionMode.GZIP;
199+
return compressionMode;
213200
}
214201

215202
@Override

0 commit comments

Comments
 (0)