-
Notifications
You must be signed in to change notification settings - Fork 782
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
deps: bumps to Brave 5.18.1 and moves off internal type #2335
Conversation
@codefromthecrypt Please sign the Contributor License Agreement! Click here to manually synchronize the status of this Pull Request. See the FAQ for frequently asked questions. |
@codefromthecrypt Thank you for signing the Contributor License Agreement! |
@@ -128,9 +127,19 @@ class W3CPropagation extends Propagation.Factory implements Propagation<String> | |||
this.braveBaggageManager = braveBaggageManager; | |||
} | |||
|
|||
/** |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
p.s I'm not sure if this was copied because brave's wasn't published to maven central. It is now, so maybe can reduce maintenance here https://central.sonatype.com/artifact/io.zipkin.contrib.brave-propagation-w3c/brave-propagation-tracecontext/versions from https://github.com/openzipkin-contrib/brave-propagation-w3c
@@ -414,6 +414,7 @@ | |||
<artifactId>zipkin</artifactId> | |||
<optional>true</optional> | |||
</dependency> | |||
<!-- Needed for ZipkinRestTemplateSenderConfiguration: BytesMessageEncoder --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe this code should be rewritten to avoid classes or this dep become not optional?
backend | 2024-01-08 05:03:14.185 [] [/] WARN [main] o.s.c.s.AbstractApplicationContext - Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'zipkinSender' defined in class path resource [org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [zipkin2.reporter.Sender]: Factory method 'restTemplateSender' threw exception; nested exception is java.lang.NoSuchMethodError: 'zipkin2.reporter.BytesMessageEncoder zipkin2.reporter.BytesMessageEncoder.forEncoding(zipkin2.codec.Encoding)'
e394b1d
to
5f2a818
Compare
@shakuzen @marcingrzejszczak @ryanjbaxter I got this as far as I can.. there's an unrelated error below, which seems likely due to the runner using too new a JDK
The summary is that this change allows an upgrade to brave 5.18 or 6.0, but while sleuth supplies and consumes AsyncReporter types, it cannot upgrade to zipkin-reporter 2. This may be fine at least for a while, as Brave 6 doesn't care about zipkin or zipkin-reporter versions anymore. In a bit, I will update this with Brave 6 (need to release that, first) |
Hi Adrian, thanks for the PR! :) Sleuth is already over its OSS support EOL date so Brave 6 might not be a concern. On the other hand, we should do this in Micrometer Tracing as it is the successor of Sleuth. |
ok so what I'll do is cross-test this PR with Brave 5.18 and 6 and then close it if it won't be merged. Then, in case you need the code later, you know where to look! |
So, the main thing is that if this PR isn't merged and released, users can't upgrade to Brave 5.18 as things that wrap Propagation.Factory don't wrap If it is merged, likely this will work with Brave 6 as well, just the messaging tests are broken and until they aren't I'm not sure if there is another issue. |
Signed-off-by: Adrian Cole <adrian@tetrate.io>
7fd87b3
to
6ddb8dc
Compare
I think that might be a compelling argument for merging this even though we are not planning to do another minor release. We can also keep it open to see if there is user interest. |
I'm looking into this and I'm getting some
|
glad to hear you are looking at the build. I think people will be using boot 2 for many years.. if we can get a bit more life extension to sleuth to the community, I'm sure they will appreciate it! |
this works provably. While people can't upgrade zipkin-reporter to a new version, they can upgrade brave without a snag: openzipkin/brave-example#113 For most people, since they are using sleuth's reporters anyway, there's little problem here. |
This updates to Brave 5.18.0 and dodges an internal type that will not be in Brave 6.0. See openzipkin/brave#1396 about Propagation and Brave 6.0