Skip to content

Updates all dependencies that don't require instrumentation changes#1452

Merged
codefromthecrypt merged 6 commits intoopenzipkin:masterfrom
reta:dependency.updates.1
Feb 16, 2025
Merged

Updates all dependencies that don't require instrumentation changes#1452
codefromthecrypt merged 6 commits intoopenzipkin:masterfrom
reta:dependency.updates.1

Conversation

@reta
Copy link
Copy Markdown
Contributor

@reta reta commented Feb 15, 2025 •
edited by codefromthecrypt
Loading

This updates the build and all dependencies possible. Notably, we couldn't update httpclient5 as there's a break in 5.4.

This also re-organizes property names so that mechanical updating is easier.

@reta reta force-pushed the dependency.updates.1 branch from bdb9b65 to 84d53f3 Compare February 15, 2025 16:36
@reta reta force-pushed the dependency.updates.1 branch from 84d53f3 to 3cc0f8d Compare February 15, 2025 17:39
@codefromthecrypt
Copy link
Copy Markdown
Member

codefromthecrypt commented Feb 16, 2025

collaborating on your branch btw

@codefromthecrypt
Copy link
Copy Markdown
Member

codefromthecrypt commented Feb 16, 2025

@reta @kojilin I temporarily reverted the work-in-progress workaround for httpclient 5.4 update, as it fails consistently like this. Let's do that in another PR:

Error:  brave.httpclient5.ITTracingCachingHttpAsyncClientBuilder.cacheControl -- Time elapsed: 8.010 s <<< ERROR!
java.io.IOException: org.apache.hc.core5.util.TimeoutValueException: Timeout deadline: 3000 MILLISECONDS, actual: 3000 MILLISECONDS
	at brave.httpclient5.ITTracingHttpAsyncClientBuilder.blockOnFuture(ITTracingHttpAsyncClientBuilder.java:40)
	at brave.httpclient5.ITTracingHttpAsyncClientBuilder.invoke(ITTracingHttpAsyncClientBuilder.java:33)
	at brave.httpclient5.ITTracingHttpAsyncClientBuilder.get(ITTracingHttpAsyncClientBuilder.java:64)
	at brave.httpclient5.ITTracingCachingHttpAsyncClientBuilder.cacheControl(ITTracingCachingHttpAsyncClientBuilder.java:40)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at brave.test.IntegrationTestSpanHandler.interceptTestMethod(IntegrationTestSpanHandler.java:388)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
Caused by: org.apache.hc.core5.util.TimeoutValueException: Timeout deadline: 3000 MILLISECONDS, actual: 3000 MILLISECONDS
	at org.apache.hc.core5.util.TimeoutValueException.fromMilliseconds(TimeoutValueException.java:50)
	at org.apache.hc.core5.concurrent.BasicFuture.get(BasicFuture.java:126)
	at brave.httpclient5.ITTracingHttpAsyncClientBuilder.blockOnFuture(ITTracingHttpAsyncClientBuilder.java:38)
	... 7 more

codefromthecrypt
codefromthecrypt reviewed Feb 16, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@codefromthecrypt codefromthecrypt left a comment

Choose a reason for hiding this comment

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

errorprone notes

Comment thread context/jfr/pom.xml
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration combine.self="override">
<configuration combine.self="append">
Copy link
Copy Markdown
Member

@codefromthecrypt codefromthecrypt Feb 16, 2025

Choose a reason for hiding this comment

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

fix for errorpone

Comment thread pom.xml
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<compilerArgs>
<arg>-XDcompilePolicy=simple</arg>
<arg>--should-stop=ifError=FLOW</arg>
Copy link
Copy Markdown
Member

@codefromthecrypt codefromthecrypt Feb 16, 2025

Choose a reason for hiding this comment

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

fix for errorpone

@codefromthecrypt codefromthecrypt changed the title Routine dependency updates Updates all dependencies that don't require instrumentation changes Feb 16, 2025
@codefromthecrypt codefromthecrypt merged commit 5ed54db into openzipkin:master Feb 16, 2025
@codefromthecrypt
Copy link
Copy Markdown
Member

codefromthecrypt commented Feb 16, 2025

@reta I'll leave it to you to decide to release the current master, or update httpclient5 first. Note if we do the latter, probably we need to update the README as it might not work with httpclient5 5.3 anymore. This may be ok because it already requires 5.2 iirc

@reta
Copy link
Copy Markdown
Contributor Author

reta commented Feb 16, 2025

Thanks a lot for helping out @codefromthecrypt , I will release and take care of HttpClient 5.4.x update

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@codefromthecrypt codefromthecrypt codefromthecrypt approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@reta @codefromthecrypt