Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-20 01:27:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x'

Browse Source 
Closes gh-34425
This commit is contained in:
Moritz Halbritter 2023-03-01 14:14:05 +01:00
commit 0b23ffd73a
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/wavefront/WavefrontTracingAutoConfiguration.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 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.
@ -16,8 +16,6 @@
package org.springframework.boot.actuate.autoconfigure.tracing.wavefront;
import java.util.Collections;
import brave.handler.SpanHandler;
import com.wavefront.sdk.common.WavefrontSender;
import com.wavefront.sdk.common.application.ApplicationTags;
@ -65,7 +63,7 @@ public class WavefrontTracingAutoConfiguration {
WavefrontSpanHandler wavefrontSpanHandler(WavefrontProperties properties, WavefrontSender wavefrontSender,
SpanMetrics spanMetrics, ApplicationTags applicationTags) {
return new WavefrontSpanHandler(properties.getSender().getMaxQueueSize(), wavefrontSender, spanMetrics,
properties.getSourceOrDefault(), applicationTags, Collections.emptySet());
properties.getSourceOrDefault(), applicationTags, properties.getTraceDerivedCustomTagKeys());
}
@Configuration(proxyBeanMethods = false)

17
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/wavefront/WavefrontProperties.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 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.
@ -21,7 +21,9 @@ import java.net.URI;
import java.net.UnknownHostException;
import java.time.Duration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.PushRegistryProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
@ -70,6 +72,11 @@ public class WavefrontProperties {
*/
private final Metrics metrics = new Metrics();
/**
* Customized span tags for RED metrics.
*/
private Set<String> traceDerivedCustomTagKeys = new HashSet<>();
public Application getApplication() {
return this.application;
}
@ -152,6 +159,14 @@ public class WavefrontProperties {
return "proxy".equals(this.uri.getScheme());
}
public Set<String> getTraceDerivedCustomTagKeys() {
return this.traceDerivedCustomTagKeys;
}
public void setTraceDerivedCustomTagKeys(Set<String> traceDerivedCustomTagKeys) {
this.traceDerivedCustomTagKeys = traceDerivedCustomTagKeys;
}
public static class Application {
/**