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

Include logback12 from logback module #5139

Merged
merged 1 commit into from Aug 23, 2023

Conversation

jrhee17
Copy link
Contributor

@jrhee17 jrhee17 commented Aug 23, 2023

Motivation:

@ikhoon pointed out that the logback module doesn't bring in the logback12 module in the pom.

Modifications:

  • Modified so that the logback module correctly declares the dependency.

Result:

  • logback module contains the correct dependencies
  • Describe the consequences that a user will face after this PR is merged.

@jrhee17 jrhee17 added this to the 1.25.1 milestone Aug 23, 2023
@jrhee17 jrhee17 added the defect label Aug 23, 2023
@@ -1,4 +1,4 @@
dependencies {
// Logback
api libs.logback12
api project(':logback12')
Copy link
Member

@minwoox minwoox Aug 23, 2023

Choose a reason for hiding this comment

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

Could you also check if the POM file is correctly created?
We can run logback12:generatePomFileForJarPublication task. 😉

Copy link
Contributor

Choose a reason for hiding this comment

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

I've double-checked it with generatePomFileForJarPublication command and the POM file was correctly generated.
image

Copy link
Member

Choose a reason for hiding this comment

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

Great, thanks!

Copy link
Contributor

@ikhoon ikhoon left a comment

Choose a reason for hiding this comment

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

Thanks for the quick fix, @jrhee17!

Copy link
Member

@minwoox minwoox left a comment

Choose a reason for hiding this comment

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

Thanks, @jrhee17!

@codecov
Copy link

codecov bot commented Aug 23, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.02% ⚠️

Comparison is base (12df7bd) 74.23% compared to head (8d0b433) 74.22%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #5139      +/-   ##
============================================
- Coverage     74.23%   74.22%   -0.02%     
+ Complexity    19811    19804       -7     
============================================
  Files          1698     1698              
  Lines         73093    73093              
  Branches       9359     9359              
============================================
- Hits          54264    54251      -13     
- Misses        14395    14411      +16     
+ Partials       4434     4431       -3     

see 15 files with indirect coverage changes

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

@jrhee17 jrhee17 merged commit d4c3b38 into line:main Aug 23, 2023
15 checks passed
jrhee17 added a commit to jrhee17/armeria that referenced this pull request Aug 24, 2023
* Update snapshot version to 1.25.1 (line#5137)

* Include logback12 from logback module (line#5139)

Motivation:

@ikhoon pointed out that the `logback` module doesn't bring in the
`logback12` module in the pom.

Modifications:

- Modified so that the `logback` module correctly declares the
dependency.

Result:

- `logback` module contains the correct dependencies
- Describe the consequences that a user will face after this PR is
merged.

<!--
Visit this URL to learn more about how to write a pull request
description:

https://armeria.dev/community/developer-guide#how-to-write-pull-request-description
-->

* Release note for 1.25.1 (line#5140)

![FireShot Capture 011 - 1 25 1 release notes — Armeria release notes -
localhost](https://github.com/line/armeria/assets/8510579/b480ecaf-4034-453a-be93-58f865cad5b2)

* Fix flaky `MultipartEncoderTckTest.required_spec101...` (line#5136)

Motivation:

`MultipartEncoderTckTest.required_spec101_XXX` fails quite often.

https://ge.armeria.dev/scans/tests?search.timeZoneId=Asia/Seoul&tests.container=com.linecorp.armeria.common.multipart.MultipartEncoderTckTest&tests.test=required_spec101_subscriptionRequestMustResultInTheCorrectNumberOfProducedElements
```java
java.lang.AssertionError: Publisher com.linecorp.armeria.common.multipart.MultipartEncoder@3eec8583 produced no element after first `request` within 200 ms
at org.testng.Assert.fail(Assert.java:98)
at org.reactivestreams.tck.TestEnvironment.flopAndFail(TestEnvironment.java:285)
at org.reactivestreams.tck.TestEnvironment$Receptacle.next(TestEnvironment.java:1047)
at org.reactivestreams.tck.TestEnvironment$ManualSubscriber.nextElement(TestEnvironment.java:514)
at org.reactivestreams.tck.TestEnvironment$ManualSubscriber.nextElement(TestEnvironment.java:510)
at org.reactivestreams.tck.PublisherVerification$3.run(PublisherVerification.java:212)
at org.reactivestreams.tck.PublisherVerification.activePublisherTest(PublisherVerification.java:1135)
at
org.reactivestreams.tck.PublisherVerification.required_spec101_subscriptionRequestMustResultInTheCorrectNumberOfProducedElements(PublisherVerification.java:204)
```

The failure couldn't be reproduced locally. I checked the log on the
Gradle scan and it shows that the classes are initialized when the test
starts.

I guess JVM lazy class initialization and the Netty worker group
initialization could affect the failure.

Modifications:

- Early initialize Netty worker group before starting the tests
- Increase timeout

Result:

- Closes line#4554

---------

Co-authored-by: Trustin Lee <trustin@linecorp.com>

* modify run for local repo experiment

---------

Co-authored-by: Ikhun Um <ikhun.um@linecorp.com>
Co-authored-by: Trustin Lee <trustin@linecorp.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants