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.

Sign up for GitHub

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

Jump to bottom

Fix logging context propagation #185

Merged
merged 7 commits into from
Dec 18, 2023
Merged

Fix logging context propagation #185

merged 7 commits into from
Dec 18, 2023

Conversation

slinkydeveloper
Copy link
Contributor

Fix #180

The GrpcContextDataProvider was not wrong on itself, the problem was that we have to merge SPI files when creating the shadowJar. See apache/logging-log4j2#2099

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 15, 2023 •
edited
Loading

Test Results

  98 files  +  64    98 suites  +64   10m 27s ⏱️ + 10m 2s
  87 tests +  42    87 ✔️ +  87  0 💤 ±0  0 ❌  - 45 
220 runs  +175  220 ✔️ +220  0 💤 ±0  0 ❌  - 45 

Results for commit 21cd9c8. ± Comparison against base commit f0981d2.

This pull request removes 27 and adds 69 tests. Note that renamed tests count towards both. 
dev.restate.e2e.JavaAwakeableTest ‑ initializationError
dev.restate.e2e.JavaCoordinatorWithNodeReceiverServiceToServiceCallTest ‑ initializationError
dev.restate.e2e.JavaErrorsTest ‑ initializationError
dev.restate.e2e.JavaKafkaIngressTest ‑ initializationError
dev.restate.e2e.JavaSampleWorkflowTest ‑ initializationError
dev.restate.e2e.JavaServiceToServiceCallTest ‑ initializationError
dev.restate.e2e.JavaSimpleSleepTest ‑ initializationError
dev.restate.e2e.JavaStateTest ‑ initializationError
dev.restate.e2e.NodeAwakeableTest ‑ initializationError
dev.restate.e2e.NodeCoordinatorWithJavaReceiverServiceToServiceCallTest ‑ initializationError
…

dev.restate.e2e.JavaAwakeableTest ‑ generate(RandomNumberListGeneratorBlockingStub)
dev.restate.e2e.JavaCoordinatorWithNodeReceiverServiceToServiceCallTest ‑ synchronousCall(CoordinatorBlockingStub)
dev.restate.e2e.JavaErrorsTest ‑ Test calling method that fails terminally
dev.restate.e2e.JavaErrorsTest ‑ Test calling method that fails terminally multiple times
dev.restate.e2e.JavaErrorsTest ‑ Test invocations are retried until they succeed
dev.restate.e2e.JavaErrorsTest ‑ Test propagate failure from another service
dev.restate.e2e.JavaErrorsTest ‑ Test propagate failure from sideEffect and internal invoke
dev.restate.e2e.JavaErrorsTest ‑ Test set then fail should persist the set
dev.restate.e2e.JavaErrorsTest ‑ Test side effects are retried until they succeed
dev.restate.e2e.JavaErrorsTest ‑ Test terminal error of side effects is propagated
…

♻️ This comment has been updated with latest results.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 15, 2023 •
edited
Loading

Unit Test Results

  43 files  ±  0    43 suites  ±0   3m 36s ⏱️ + 3m 1s
540 tests +34  533 ✔️ +79  7 💤 ±0  0 ❌  - 45 
541 runs  +34  534 ✔️ +79  7 💤 ±0  0 ❌  - 45 

Results for commit 21cd9c8. ± Comparison against base commit f0981d2.

♻️ This comment has been updated with latest results.

pcholakov
pcholakov approved these changes Dec 18, 2023
View reviewed changes
Copy link
Contributor

@pcholakov pcholakov 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 figuring this one out!

sdk-core/src/main/java/dev/restate/sdk/core/ExecutorSwitchingWrappers.java Show resolved Hide resolved
sdk-core/src/main/java/dev/restate/sdk/core/InvocationStateMachine.java Outdated Show resolved Hide resolved
sdk-core/src/test/resources/log4j2.properties
appender.testlogger.layout.pattern = %-4r %-5p %X [%t] %c:%L - %m%n
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

@slinkydeveloper
Improve the Context propagation logic:
5da8bd4 
* This is now more obvious, in particular It makes more clear what's the boundary between state machine and user code and how the Context is propagated
* Renamed the methods of RestateServerCallListener to make more clear their goal
@slinkydeveloper
Propagate fully qualified method name and invocation state in Syscall…
a9800fb 
…sInternal
@slinkydeveloper
Reintroduce the GrpcContextDataProvider
ce5c1c2 
Fix the LoggingContextSetter.THREAD_LOCAL_INSTANCE
@slinkydeveloper
Bump log4j2
0a6b09f
@slinkydeveloper
Wrong log message
99156f3
@slinkydeveloper
Minor test changes
b7458e6
@slinkydeveloper
Feedback
21cd9c8
@slinkydeveloper slinkydeveloper merged commit 95bbd2e into main Dec 18, 2023
5 checks passed
@slinkydeveloper slinkydeveloper deleted the issues/180 branch December 18, 2023 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pcholakov pcholakov pcholakov 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.

[Java] Ensure Restate context attributes are applied to handler-emitted log4j log entries
2 participants
@slinkydeveloper @pcholakov