Skip to content
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

Removes all deprecated types and modules for Brave v6 #1395

Merged
merged 1 commit into from
Jan 8, 2024
Merged

Conversation

codefromthecrypt
Copy link
Member

@codefromthecrypt codefromthecrypt commented Jan 7, 2024

Removes all deprecated types and modules for Brave v6. This also removes any internal symbols not used as a result of that.

This is the first release to have no Zipkin dependency, so users should move to manage their own zipkin-reporter deps before or at the time of upgrading to Brave 6.0.

@@ -34,8 +34,7 @@
<main.basedir>${project.basedir}/..</main.basedir>

<!-- use the same values in ../pom.xml -->
<zipkin.version>2.27.0</zipkin.version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no longer manage zipkin version as there is no code here that uses it.

@@ -311,7 +311,7 @@ protected void is_inheritable(CurrentTraceContext inheritableCurrentTraceContext
}

@Test void restoresSpanAfterCallable() throws Exception {
try (Scope scope0 = currentTraceContext.newScope(context)) {
try (Scope scope = currentTraceContext.newScope(context)) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it was insane to use analysis to look for unused variables while this was called ws, scope, scope0, so forgive this change... but it really helped in the slog!

@codefromthecrypt
Copy link
Member Author

I will change the version of this PR to 6.0.0-SNAPSHOT once 5.18 is cut (shortly)

This also removes all version pinning of zipkin libraries, to avoid
revlocks.

Signed-off-by: Adrian Cole <adrian@tetrate.io>
@codefromthecrypt
Copy link
Member Author

So brave no longer manages reporter versions, which is a good thing as then they cannot conflict. Brave is compatible with both zipkin-reporter 2.x and 3.x, but pinning the latter in the bom can make things complicated for old libraries. It is better to pin the reporter to whatever frameworks need. For example, otel pins 2.x at the moment.

@codefromthecrypt codefromthecrypt merged commit 44e4081 into master Jan 8, 2024
2 of 3 checks passed
@codefromthecrypt
Copy link
Member Author

will confirm in brave-example prior to release

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant