mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Add aggregation temporality to OtlpProperties
In Micrometer 1.11.0-RC1, a new property was introduced in OtlpConfig to define aggregation temporality. See https://github.com/micrometer-metrics/micrometer/pull/3625
This commit is contained in:
parent
d4980ea993
commit
9774d8a439
@ -18,6 +18,8 @@ package org.springframework.boot.actuate.autoconfigure.metrics.export.otlp;
|
|||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import io.micrometer.registry.otlp.AggregationTemporality;
|
||||||
|
|
||||||
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryProperties;
|
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryProperties;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
|
||||||
@ -26,6 +28,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
|
|||||||
* export.
|
* export.
|
||||||
*
|
*
|
||||||
* @author Eddú Meléndez
|
* @author Eddú Meléndez
|
||||||
|
* @author Jonatan Ivanov
|
||||||
* @since 3.0.0
|
* @since 3.0.0
|
||||||
*/
|
*/
|
||||||
@ConfigurationProperties(prefix = "management.otlp.metrics.export")
|
@ConfigurationProperties(prefix = "management.otlp.metrics.export")
|
||||||
@ -36,6 +39,12 @@ public class OtlpProperties extends StepRegistryProperties {
|
|||||||
*/
|
*/
|
||||||
private String url = "http://localhost:4318/v1/metrics";
|
private String url = "http://localhost:4318/v1/metrics";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Aggregation temporality of sums. It defines the way additive values are expressed.
|
||||||
|
* This setting depends on the backend you use, some only support one temporality.
|
||||||
|
*/
|
||||||
|
private AggregationTemporality aggregationTemporality = AggregationTemporality.CUMULATIVE;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Monitored resource's attributes.
|
* Monitored resource's attributes.
|
||||||
*/
|
*/
|
||||||
@ -54,6 +63,14 @@ public class OtlpProperties extends StepRegistryProperties {
|
|||||||
this.url = url;
|
this.url = url;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public AggregationTemporality getAggregationTemporality() {
|
||||||
|
return this.aggregationTemporality;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAggregationTemporality(AggregationTemporality aggregationTemporality) {
|
||||||
|
this.aggregationTemporality = aggregationTemporality;
|
||||||
|
}
|
||||||
|
|
||||||
public Map<String, String> getResourceAttributes() {
|
public Map<String, String> getResourceAttributes() {
|
||||||
return this.resourceAttributes;
|
return this.resourceAttributes;
|
||||||
}
|
}
|
||||||
|
@ -18,6 +18,7 @@ package org.springframework.boot.actuate.autoconfigure.metrics.export.otlp;
|
|||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import io.micrometer.registry.otlp.AggregationTemporality;
|
||||||
import io.micrometer.registry.otlp.OtlpConfig;
|
import io.micrometer.registry.otlp.OtlpConfig;
|
||||||
|
|
||||||
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryPropertiesConfigAdapter;
|
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryPropertiesConfigAdapter;
|
||||||
@ -26,6 +27,7 @@ import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.
|
|||||||
* Adapter to convert {@link OtlpProperties} to an {@link OtlpConfig}.
|
* Adapter to convert {@link OtlpProperties} to an {@link OtlpConfig}.
|
||||||
*
|
*
|
||||||
* @author Eddú Meléndez
|
* @author Eddú Meléndez
|
||||||
|
* @author Jonatan Ivanov
|
||||||
*/
|
*/
|
||||||
class OtlpPropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapter<OtlpProperties> implements OtlpConfig {
|
class OtlpPropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapter<OtlpProperties> implements OtlpConfig {
|
||||||
|
|
||||||
@ -43,6 +45,11 @@ class OtlpPropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapter<Ot
|
|||||||
return get(OtlpProperties::getUrl, OtlpConfig.super::url);
|
return get(OtlpProperties::getUrl, OtlpConfig.super::url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AggregationTemporality aggregationTemporality() {
|
||||||
|
return get(OtlpProperties::getAggregationTemporality, OtlpConfig.super::aggregationTemporality);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map<String, String> resourceAttributes() {
|
public Map<String, String> resourceAttributes() {
|
||||||
return get(OtlpProperties::getResourceAttributes, OtlpConfig.super::resourceAttributes);
|
return get(OtlpProperties::getResourceAttributes, OtlpConfig.super::resourceAttributes);
|
||||||
|
@ -18,6 +18,7 @@ package org.springframework.boot.actuate.autoconfigure.metrics.export.otlp;
|
|||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import io.micrometer.registry.otlp.AggregationTemporality;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
@ -36,6 +37,21 @@ class OtlpPropertiesConfigAdapterTests {
|
|||||||
assertThat(new OtlpPropertiesConfigAdapter(properties).url()).isEqualTo("http://another-url:4318/v1/metrics");
|
assertThat(new OtlpPropertiesConfigAdapter(properties).url()).isEqualTo("http://another-url:4318/v1/metrics");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void whenPropertiesAggregationTemporalityIsNotSetAdapterAggregationTemporalityReturnsCumulative() {
|
||||||
|
OtlpProperties properties = new OtlpProperties();
|
||||||
|
assertThat(new OtlpPropertiesConfigAdapter(properties).aggregationTemporality())
|
||||||
|
.isSameAs(AggregationTemporality.CUMULATIVE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void whenPropertiesAggregationTemporalityIsSetAdapterAggregationTemporalityReturnsIt() {
|
||||||
|
OtlpProperties properties = new OtlpProperties();
|
||||||
|
properties.setAggregationTemporality(AggregationTemporality.DELTA);
|
||||||
|
assertThat(new OtlpPropertiesConfigAdapter(properties).aggregationTemporality())
|
||||||
|
.isSameAs(AggregationTemporality.DELTA);
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void whenPropertiesResourceAttributesIsSetAdapterResourceAttributesReturnsIt() {
|
void whenPropertiesResourceAttributesIsSetAdapterResourceAttributesReturnsIt() {
|
||||||
OtlpProperties properties = new OtlpProperties();
|
OtlpProperties properties = new OtlpProperties();
|
||||||
|
@ -36,6 +36,7 @@ class OtlpPropertiesTests extends StepRegistryPropertiesTests {
|
|||||||
OtlpConfig config = OtlpConfig.DEFAULT;
|
OtlpConfig config = OtlpConfig.DEFAULT;
|
||||||
assertStepRegistryDefaultValues(properties, config);
|
assertStepRegistryDefaultValues(properties, config);
|
||||||
assertThat(properties.getUrl()).isEqualTo(config.url());
|
assertThat(properties.getUrl()).isEqualTo(config.url());
|
||||||
|
assertThat(properties.getAggregationTemporality()).isSameAs(config.aggregationTemporality());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user