-
Notifications
You must be signed in to change notification settings - Fork 41.2k
Upgrade to Brave 6 and Zipkin Reporter 3 #39049
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,14 +16,11 @@ | |
|
||
package org.springframework.boot.actuate.autoconfigure.tracing.zipkin; | ||
|
||
import zipkin2.Span; | ||
import zipkin2.codec.BytesEncoder; | ||
import zipkin2.codec.SpanBytesEncoder; | ||
import zipkin2.reporter.Sender; | ||
import zipkin2.reporter.BytesMessageSender; | ||
import zipkin2.reporter.Encoding; | ||
|
||
import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinConfigurations.BraveConfiguration; | ||
import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinConfigurations.OpenTelemetryConfiguration; | ||
import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinConfigurations.ReporterConfiguration; | ||
import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinConfigurations.SenderConfiguration; | ||
import org.springframework.boot.autoconfigure.AutoConfiguration; | ||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; | ||
|
@@ -44,9 +41,8 @@ | |
* @since 3.0.0 | ||
*/ | ||
@AutoConfiguration(after = RestTemplateAutoConfiguration.class) | ||
@ConditionalOnClass(Sender.class) | ||
@Import({ SenderConfiguration.class, ReporterConfiguration.class, BraveConfiguration.class, | ||
OpenTelemetryConfiguration.class }) | ||
@ConditionalOnClass(BytesMessageSender.class) | ||
@Import({ SenderConfiguration.class, BraveConfiguration.class, OpenTelemetryConfiguration.class }) | ||
@EnableConfigurationProperties(ZipkinProperties.class) | ||
public class ZipkinAutoConfiguration { | ||
|
||
|
@@ -58,8 +54,8 @@ PropertiesZipkinConnectionDetails zipkinConnectionDetails(ZipkinProperties prope | |
|
||
@Bean | ||
@ConditionalOnMissingBean | ||
public BytesEncoder<Span> spanBytesEncoder() { | ||
codefromthecrypt marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I wonder if There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Right now, this could break users. I don't really know how many users depend on |
||
return SpanBytesEncoder.JSON_V2; | ||
public Encoding encoding(ZipkinProperties properties) { | ||
return properties.getEncoding(); | ||
} | ||
|
||
} |
Uh oh!
There was an error while loading. Please reload this page.