mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge pull request #30984 from eddumelendez
* gh-30984: Polish "Add resourceAttributes property to OtlpProperties" Add resourceAttributes property to OtlpProperties Closes gh-30984
This commit is contained in:
commit
5f53ea744f
@ -16,6 +16,8 @@
|
||||
|
||||
package org.springframework.boot.actuate.autoconfigure.metrics.export.otlp;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryProperties;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
|
||||
@ -34,6 +36,11 @@ public class OtlpProperties extends StepRegistryProperties {
|
||||
*/
|
||||
private String url = "http://localhost:4318/v1/metrics";
|
||||
|
||||
/**
|
||||
* Monitored resource's attributes.
|
||||
*/
|
||||
private Map<String, String> resourceAttributes;
|
||||
|
||||
public String getUrl() {
|
||||
return this.url;
|
||||
}
|
||||
@ -42,4 +49,12 @@ public class OtlpProperties extends StepRegistryProperties {
|
||||
this.url = url;
|
||||
}
|
||||
|
||||
public Map<String, String> getResourceAttributes() {
|
||||
return this.resourceAttributes;
|
||||
}
|
||||
|
||||
public void setResourceAttributes(Map<String, String> resourceAttributes) {
|
||||
this.resourceAttributes = resourceAttributes;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -16,6 +16,8 @@
|
||||
|
||||
package org.springframework.boot.actuate.autoconfigure.metrics.export.otlp;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import io.micrometer.registry.otlp.OtlpConfig;
|
||||
|
||||
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryPropertiesConfigAdapter;
|
||||
@ -41,4 +43,9 @@ class OtlpPropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapter<Ot
|
||||
return get(OtlpProperties::getUrl, OtlpConfig.super::url);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, String> resourceAttributes() {
|
||||
return get(OtlpProperties::getResourceAttributes, OtlpConfig.super::resourceAttributes);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,47 @@
|
||||
/*
|
||||
* Copyright 2012-2022 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.actuate.autoconfigure.metrics.export.otlp;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Tests for {@link OtlpPropertiesConfigAdapter}.
|
||||
*
|
||||
* @author Eddú Meléndez
|
||||
*/
|
||||
class OtlpPropertiesConfigAdapterTests {
|
||||
|
||||
@Test
|
||||
void whenPropertiesUrlIsSetAdapterProjectIdReturnsIt() {
|
||||
OtlpProperties properties = new OtlpProperties();
|
||||
properties.setUrl("http://another-url:4318/v1/metrics");
|
||||
assertThat(new OtlpPropertiesConfigAdapter(properties).url()).isEqualTo("http://another-url:4318/v1/metrics");
|
||||
}
|
||||
|
||||
@Test
|
||||
void whenPropertiesResourceTypeIsSetAdapterResourceTypeReturnsIt() {
|
||||
OtlpProperties properties = new OtlpProperties();
|
||||
properties.setResourceAttributes(Map.of("service.name", "boot-service"));
|
||||
assertThat(new OtlpPropertiesConfigAdapter(properties).resourceAttributes()).containsEntry("service.name",
|
||||
"boot-service");
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue
Block a user