Revert "FIR-32836: log is simplified now - no lombok in log (#405)" #444
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ptiurin
approved these changes
Jul 11, 2024
| @@ -2,7 +2,9 @@ | |||
|
|
|||
| import com.firebolt.jdbc.connection.FireboltConnection; | |||
| import integration.EnvironmentCondition; | |||
| import integration.EnvironmentCondition.Comparison; | |||
| @@ -16,6 +19,9 @@ | |||
| import static java.lang.String.format; | |||
| import static java.util.stream.Collectors.toCollection; | |||
|
|
|||
|
|
|||
| @RequiredArgsConstructor | |||
There was a problem hiding this comment.
I think this one is no longer needed as it was removed since the original change.
| @@ -281,7 +281,8 @@ public String getLabel() { | |||
| assertNull(fireboltStatement.getResultSet()); | |||
| fireboltStatement.getMoreResults(CLOSE_CURRENT_RESULT); | |||
| verify(fireboltStatementService, times(0)).execute(any(), any(), any()); | |||
| assertTrue(logMessages.contains("Aborted query with id other label"), "Expected log message is not found"); | |||
| // TODO: fix logging here, since we've reverted logging to lombok it doesn't catch log messages properly anymore | |||
There was a problem hiding this comment.
Let's file a ticket before we forget
There was a problem hiding this comment.
|
|
Integration tests are succeeding, only one that fails is the timeout test (flaky). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit 5d3ac71.
It reverts logging back to lombok, since we have a customer with incompatibility