Update dependencies #5407

ikhoon · 2024-01-25T08:02:48Z

Apache Curator 5.5.0 -> 5.6.0
Brotli4j 1.12.0 -> 1.15.0
Envoy contorl plain 1.0.42
Dropwizard 2.1.8 -> 2.1.10
Dropwizard Metrics 4.2.21 -> 4.2.24
GraphQL Java 20.4 -> 21.3
gRPC Java 1.58.0 -> 1.61.0
gRPC Kotlin 1.4.0 -> 1.4.1
Guava 32.1.3 -> 33.0.0
Jackson 2.15.3 -> 2.16.1
Jetty 9.4.51 -> 9.4.52, 10.0.17 -> 10.0.19, 11.0.17 -> 11.0.19, 12.0.5
JUnit 5.10.0 -> 5.10.1
Kafka client 3.6.0 -> 3.6.1
Kotlin 1.9.0 -> 1.9.22
krotoDC 1.0.5 - 1.0.6
Logback 1.2.11 -> 1.2.13, 1.3.11 -> 1.3.14, 1.4.11 -> 1.4.14
Micrometer 1.11.5 -> 1.12.2
Micrometer Tracing 1.1.6 -> 1.2.2
Netty 4.1.100 -> 4.1.106
Netty io_uring 0.0.23 -> 0.0.24
Protobuf 3.24.0 -> 3.25.1
Reactor 3.5.11 -> 3.6.2
Resilience4j 2.1.0 -> 2.2.0
ScalaPB 0.11.13 -> 0.11.15
Spring 6.0.11 -> 6.1.3
Spring Boot 2.7.14 -> 2.7.18, 3.1.2 -> 3.2.2
Tomcat 8.5.94 -> 8.5.98, 9.0.82 -> 9.0.85, 10.1.15 -> 10.1.18
Build
- Apache HttpClient 5.2.1 -> 5.3
- AssertJ 3.24.2 -> 3.25.2
- Checker Framework 2.5.5 -> 2.5.6
- Dagger 2.48.1 -> 2.50
- DGS 7.6.0 -> 8.2.2
- Error Prone 2.22.0 -> 2.24.1
- Finagle 22.12.0 -> 23.11.0
- Gradle 8.3 -> 8.5
- completable-futures 0.3.5 -> 0.3.6
- gax-grpc 2.35.0 -> 2.40.0
- GraphQL Kotlin 6.5.6 -> 7.0.2
- java-websocket 1.5.4 -> 1.5.5
- JCTools 4.0.1 -> 4.0.2
- jmh-gradle-plugin 0.7.1 -> 0.7.2
- jsoup 1.16.1 -> 1.17.2
- ktlint-gradle-plugin 11.5.1 -> 12.1.0
- node-gradle-plugin 5.0.0 -> 7.0.1
- SLF4J 2.0.7 -> 2.0.11
- Testcontainers 1.18.3 -> 1.19.3

- Apache Curator 5.5.0 -> 5.6.0 - Brotli4j 1.12.0 -> 1.15.0 - Envoy contorl plain 1.0.42 - Dropwizard 2.1.8 -> 2.1.10 - Dropwizard Metrics 4.2.21 -> 4.2.24 - GraphQL Java 20.4 -> 21.3 - gRPC Java 1.58.0 -> 1.61.0 - gRPC Kotlin 1.4.0 -> 1.4.1 - Guava 32.1.3 -> 33.0.0 - Jackson 2.15.3 -> 2.16.1 - Jetty 9.4.51 -> 9.4.52, 10.0.17 -> 10.0.19, 11.0.17 -> 11.0.19, 12.0.5 - JUnit 5.10.0 -> 5.10.1 - Kafka client 3.6.0 -> 3.6.1 - Kotlin 1.9.0 -> 1.9.22 - krotoDC 1.0.5 - 1.0.6 - Logback 1.2.11 -> 1.2.13, 1.3.11 -> 1.3.14, 1.4.11 -> 1.4.14 - Micrometer 1.11.5 -> 1.12.2 - Micrometer Tracing 1.1.6 -> 1.2.2 - Netty 4.1.100 -> 4.1.106 - Netty io_uring 0.0.23 -> 0.0.24 - Protobuf 3.24.0 -> 3.25.1 - Reactor 3.5.11 -> 3.6.2 - Resilience4j 2.1.0 -> 2.2.0 - ScalaPB 0.11.13 -> 0.11.15 - Spring 6.0.11 -> 6.1.3 - Spring Boot 2.7.14 -> 2.7.18, 3.1.2 -> 3.2.2 - Tomcat 8.5.94 -> 8.5.98, 9.0.82 -> 9.0.85, 10.1.15 -> 10.1.18 - Build - Apache HttpClient 5.2.1 -> 5.3 - AssertJ 3.24.2 -> 3.25.2 - Checker Framework 2.5.5 -> 2.5.6 - Dagger 2.48.1 -> 2.50 - DGS 7.6.0 -> 8.2.2 - Error Prone 2.22.0 -> 2.24.1 - Finagle 22.12.0 -> 23.11.0 - Gradle 8.3 -> 8.5 - completable-futures 0.3.5 -> 0.3.6 - gax-grpc 2.35.0 -> 2.40.0 - GraphQL Kotlin 6.5.6 -> 7.0.2 - java-websocket 1.5.4 -> 1.5.5 - JCTools 4.0.1 -> 4.0.2 - jmh-gradle-plugin 0.7.1 -> 0.7.2 - jsoup 1.16.1 -> 1.17.2 - ktlint-gradle-plugin 11.5.1 -> 12.1.0 - node-gradle-plugin 5.0.0 -> 7.0.1 - SLF4J 2.0.7 -> 2.0.11 - Testcontainers 1.18.3 -> 1.19.3

github-actions · 2024-01-25T08:23:36Z

🔍 Build Scan® (commit: `08906c1`)

Job name	Status	Build Scan®
build-windows-latest-jdk-19	✅	https://ge.armeria.dev/s/24idsykqlxgyq
build-self-hosted-unsafe-jdk-8	✅	https://ge.armeria.dev/s/sev66gbuyauz6
build-self-hosted-unsafe-jdk-19-snapshot-blockhound	❌ (failure)	https://ge.armeria.dev/s/r7sitvhtyhxac
build-self-hosted-unsafe-jdk-17-min-java-17-coverage	✅	https://ge.armeria.dev/s/hctootc6m73bm
build-self-hosted-unsafe-jdk-17-min-java-11	✅	https://ge.armeria.dev/s/5pkuitee7q6vu
build-self-hosted-unsafe-jdk-17-leak	✅	https://ge.armeria.dev/s/a4cvu54kcz5lw
build-self-hosted-unsafe-jdk-11	✅	https://ge.armeria.dev/s/kfl2s4qnkrejc
build-macos-12-jdk-19	✅	https://ge.armeria.dev/s/gxfthmhnpj5fw

ikhoon · 2024-01-26T02:27:47Z

.../src/jmh/kotlin/com/linecorp/armeria/internal/common/kotlin/AnnotatedServiceFlowBenchmark.kt

-                            emit("$it")
-                        }
-                    }
+        server =


I recommend enabling Hide whitespace changes option to clear massive changes by ktlint.

Genuinely, I don't understand why ktlint keeps changing the default format for every major update. 😵‍💫🤯

ikhoon · 2024-01-26T02:29:18Z

core/src/test/java/com/linecorp/armeria/client/EndpointTest.java

-        assertThat(a1).isNotEqualTo(new Object());
-        assertThat(a1).isEqualTo(a1);
-        assertThat(a1).isEqualTo(a2);
+        new EqualsTester()


Addressed the new assertion of https://errorprone.info/bugpattern/TruthSelfEquals

ikhoon · 2024-01-26T02:47:46Z

dependencies.toml

 xml-apis = "1.4.01"
+# Ensure that we use the same ZooKeeper version as what Curator depends on.
+# See: https://github.com/apache/curator/blob/master/pom.xml
+#      (Switch to the right tag to find out the right version.)
 zookeeper = "3.9.1"


I realized that we already use a higher version of Zookeeper than Curator.

thrift/thrift0.19/src/test/java/com/linecorp/armeria/server/thrift/ThriftOverHttp1Test.java

ikhoon · 2024-01-26T04:54:52Z

There is an incompatibility in TTextProtocol with Thrift 0.19. All changes for Thrift 0.19 have been reverted. Let me upgrade Thrift separately.

codecov · 2024-01-26T05:27:53Z

Codecov Report

Attention: 65 lines in your changes are missing coverage. Please review.

Comparison is base (e64cea1) 73.92% compared to head (08906c1) 73.95%.

Files	Patch %	Lines
...e/armeria/contextpropagation/kotlin/MainService.kt	0.00%	36 Missing ⚠️
.../example/armeria/contextpropagation/kotlin/Main.kt	0.00%	14 Missing ⚠️
...rc/main/kotlin/example/armeria/grpc/kotlin/Main.kt	78.94%	4 Missing ⚠️
...c/main/kotlin/example/armeria/grpc/krotodc/Main.kt	78.94%	4 Missing ⚠️
...ver/annotated/kotlin/MarkdownDescriptionService.kt	33.33%	2 Missing ⚠️
...in/example/armeria/grpc/kotlin/HelloServiceImpl.kt	71.42%	1 Missing and 1 partial ⚠️
...n/example/armeria/grpc/krotodc/HelloServiceImpl.kt	66.66%	1 Missing and 1 partial ⚠️
...al/common/kotlin/ArmeriaRequestCoroutineContext.kt	0.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #5407      +/-   ##
============================================
+ Coverage     73.92%   73.95%   +0.02%     
- Complexity    20688    20701      +13     
============================================
  Files          1791     1791              
  Lines         76336    76349      +13     
  Branches       9716     9716              
============================================
+ Hits          56433    56463      +30     
+ Misses        15289    15275      -14     
+ Partials       4614     4611       -3

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

minwoox

Thanks! 👍 👍 👍

minwoox · 2024-01-26T06:34:15Z

.../src/jmh/kotlin/com/linecorp/armeria/internal/common/kotlin/AnnotatedServiceFlowBenchmark.kt

-            .also { it.start().join() }
+                        @Get("/publisher")
+                        @ProducesJsonSequences
+                        fun publisherBm(): Publisher<String> = Flux.fromStream(IntStream.range(0, 1000).mapToObj { it.toString() })


Don't they have line length limit? 🤔

https://pinterest.github.io/ktlint/latest/rules/standard/#max-line-length
The maximum length of ktlint_official is 140.
It would be good to limit the value to 112 to abide by our convention.

Create #5421 for that.

jrhee17

Thanks @ikhoon 🙇 👍 🙇

jrhee17 · 2024-01-29T04:07:05Z

gradle/scripts/lib/scala.gradle

@@ -81,7 +81,7 @@ configure(scala212) {

 configure(scala213) {
    dependencies {
-        implementation 'org.scala-lang:scala-library:2.13.11'
+        implementation 'org.scala-lang:scala-library:2.13.12'


I understood this will be pushed upstream as well

jrhee17 · 2024-01-29T05:31:00Z

The flaky test which failed in the CI for mac will be handled by the following PR: #5417

ikhoon added the dependencies label Jan 25, 2024

ikhoon added this to the 1.27.0 milestone Jan 25, 2024

Fix error prone reports and ktlint

cfcf567

Thrift 0.19 is supported. Fix failures

68031cb

ikhoon commented Jan 26, 2024

View reviewed changes

Clean up Java requirement comments

e63390f

ikhoon commented Jan 26, 2024

View reviewed changes

thrift/thrift0.19/src/test/java/com/linecorp/armeria/server/thrift/ThriftOverHttp1Test.java Outdated Show resolved Hide resolved

ikhoon added 3 commits January 26, 2024 12:09

Workaround for a compile error

a53ddd7

ktlint

a451de0

Remove Thrift 0.19 module

85aa54f

ikhoon marked this pull request as ready for review January 26, 2024 05:23

ikhoon requested review from jrhee17, minwoox and trustin as code owners January 26, 2024 05:23

minwoox approved these changes Jan 26, 2024

View reviewed changes

jrhee17 approved these changes Jan 29, 2024

View reviewed changes

Merge branch 'main' into up-deps

08906c1

ikhoon merged commit 1862b71 into line:main Jan 29, 2024
15 of 17 checks passed

ikhoon deleted the up-deps branch January 29, 2024 12:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update dependencies #5407

Update dependencies #5407

ikhoon commented Jan 25, 2024

github-actions bot commented Jan 25, 2024 •

edited

Loading

ikhoon Jan 26, 2024

ikhoon Jan 26, 2024

ikhoon Jan 26, 2024

ikhoon Jan 26, 2024

ikhoon commented Jan 26, 2024

codecov bot commented Jan 26, 2024 •

edited

Loading

minwoox left a comment

minwoox Jan 26, 2024

ikhoon Jan 26, 2024

ikhoon Jan 29, 2024

jrhee17 left a comment

jrhee17 Jan 29, 2024

jrhee17 commented Jan 29, 2024

Update dependencies #5407

Update dependencies #5407

Conversation

ikhoon commented Jan 25, 2024

github-actions bot commented Jan 25, 2024 • edited Loading

🔍 Build Scan® (commit: 08906c1)

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ikhoon commented Jan 26, 2024

codecov bot commented Jan 26, 2024 • edited Loading

Codecov Report

minwoox left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrhee17 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jrhee17 commented Jan 29, 2024

github-actions bot commented Jan 25, 2024 •

edited

Loading

🔍 Build Scan® (commit: `08906c1`)

codecov bot commented Jan 26, 2024 •

edited

Loading