Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2018-10-15 23:18:26 +02:00
parent 780f4201d9 935d621a42
commit e901a0bd0e
3 changed files with 79 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontPropertiesConfigAdapter.java
View File

@@ -18,7 +18,7 @@ package org.springframework.boot.actuate.autoconfigure.metrics.export.wavefront;
import io.micrometer.wavefront.WavefrontConfig;
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.PropertiesConfigAdapter;
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryPropertiesConfigAdapter;
/**
* Adapter to convert {@link WavefrontProperties} to a {@link WavefrontConfig}.
@@ -27,7 +27,8 @@ import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.
* @since 2.0.0
*/
public class WavefrontPropertiesConfigAdapter
extends PropertiesConfigAdapter<WavefrontProperties> implements WavefrontConfig {
extends StepRegistryPropertiesConfigAdapter<WavefrontProperties>
implements WavefrontConfig {
public WavefrontPropertiesConfigAdapter(WavefrontProperties properties) {
super(properties);

75
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontPropertiesConfigAdapterTests.java Normal file
View File

@@ -0,0 +1,75 @@
/*
* Copyright 2012-2018 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
*
* http://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.wavefront;
import java.net.URI;
import org.junit.Test;
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryPropertiesConfigAdapterTests;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link WavefrontPropertiesConfigAdapter}.
*
* @author Stephane Nicoll
*/
public class WavefrontPropertiesConfigAdapterTests extends
StepRegistryPropertiesConfigAdapterTests<WavefrontProperties, WavefrontPropertiesConfigAdapter> {
@Override
protected WavefrontProperties createProperties() {
return new WavefrontProperties();
}
@Override
protected WavefrontPropertiesConfigAdapter createConfigAdapter(
WavefrontProperties properties) {
return new WavefrontPropertiesConfigAdapter(properties);
}
@Test
public void whenPropertiesUriIsSetAdapterUriReturnsIt() {
WavefrontProperties properties = createProperties();
properties.setUri(URI.create("https://wavefront.example.com"));
assertThat(createConfigAdapter(properties).uri())
.isEqualTo("https://wavefront.example.com");
}
@Test
public void whenPropertiesSourceIsSetAdapterSourceReturnsIt() {
WavefrontProperties properties = createProperties();
properties.setSource("test");
assertThat(createConfigAdapter(properties).source()).isEqualTo("test");
}
@Test
public void whenPropertiesApiTokenIsSetAdapterApiTokenReturnsIt() {
WavefrontProperties properties = createProperties();
properties.setApiToken("ABC123");
assertThat(createConfigAdapter(properties).apiToken()).isEqualTo("ABC123");
}
@Test
public void whenPropertiesGlobalPrefixIsSetAdapterGlobalPrefixReturnsIt() {
WavefrontProperties properties = createProperties();
properties.setGlobalPrefix("test");
assertThat(createConfigAdapter(properties).globalPrefix()).isEqualTo("test");
}
}

2
spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@@ -1531,7 +1531,7 @@ content into your application. Rather, pick only the properties that you need.
management.metrics.export.wavefront.num-threads=2 # Number of threads to use with the metrics publishing scheduler.
management.metrics.export.wavefront.read-timeout=10s # Read timeout for requests to this backend.
management.metrics.export.wavefront.source= # Unique identifier for the app instance that is the source of metrics being published to Wavefront. Defaults to the local host name.
management.metrics.export.wavefront.step=10s # Step size (i.e. reporting frequency) to use.
management.metrics.export.wavefront.step=1m # Step size (i.e. reporting frequency) to use.
management.metrics.export.wavefront.uri=https://longboard.wavefront.com # URI to ship metrics to.
management.metrics.use-global-registry=true # Whether auto-configured MeterRegistry implementations should be bound to the global static registry on Metrics.
management.metrics.tags.*= # Common tags that are applied to every meter.