-
Notifications
You must be signed in to change notification settings - Fork 353
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
gh-2618: Cleanup inconsistent use of logging strings #2651
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello, thanks for your contribution. I've renamed the PR title to fit the naming scheme we use, this is partly described on our new ways of working page.
In your commit you've missed out the {}
mentioned in the issue. This is required to add the parameter to the formatted log string.
Also, the issue calls for the problem to be fixed across the repo. You've found one other instance, but there are many others. Searching the repo using LOGGER.*\+
as a regex query, I can see 20+ other instances of string concatenation (some of which are partly using parameters).
Noted. Thanks for the fast reply. |
Codecov Report
@@ Coverage Diff @@
## develop #2651 +/- ##
=============================================
- Coverage 66.71% 66.25% -0.46%
Complexity 2521 2521
=============================================
Files 997 864 -133
Lines 32492 27302 -5190
Branches 3936 3285 -651
=============================================
- Hits 21678 18090 -3588
+ Misses 9117 7746 -1371
+ Partials 1697 1466 -231
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the PR! Just a small change of syntax is required to get this working, I have linked an article in the review comment.
core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/ExecutorService.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for all the updates! Still a couple more issues
...zelcast-cache-service/src/main/java/uk/gov/gchq/gaffer/cache/impl/HazelcastCacheService.java
Outdated
Show resolved
Hide resolved
...ring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/GraphConfigurationController.java
Show resolved
Hide resolved
...java/uk/gov/gchq/gaffer/accumulostore/operation/hdfs/handler/AddElementsFromHdfsHandler.java
Outdated
Show resolved
Hide resolved
...n/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorage.java
Outdated
Show resolved
Hide resolved
...java/uk/gov/gchq/gaffer/federatedstore/operation/handler/FederatedAddGraphHandlerParent.java
Show resolved
Hide resolved
...lementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/AddElementsHandler.java
Outdated
Show resolved
Hide resolved
core/graph/src/main/java/uk/gov/gchq/gaffer/graph/hook/FunctionAuthoriser.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good and passing CI now, however, after a quick look I can see 5 more uses that aren't changed: 4 in example
and one in store-implementation/parquet-store
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great changes, just a few more I found that are missed:
Line 124 in 6a0c863
LOGGER.info("Unable to load data: " + e.getMessage()); Line 60 in 6a0c863
LOGGER.info("Unable to load data: " + e.getMessage()); Line 116 in 6a0c863
LOGGER.info("Error parsing endDate: " + e.getMessage()); Line 507 in 6a0c863
LOGGER.error(String.format("Skipping graphId: %s due to: %s", graphId, e.getMessage()), e); Line 36 in 6a0c863
LOGGER.info(String.format("Gaffer road-traffic example is ready at: http:/localhost:%s/%s", port, path));
The latest error is caused by the logging in |
That's my bad sorry, I said it needs changing but didn't realise it was using the java.util logger, apologies! |
I think all cases are now covered, to get the CI passing the road-traffic example cases need to be reverted because they aren't using SLF4J, sorry! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can see a few remaining string concatenations across multiple lines, but there's nothing we can do about that as we are not using a new enough version of Java to use avoid this. PR looks to be ready to merge.
Thanks @t92549 @GCHQDeveloper314 for the help and reviews. It has been great working on this and will continue contributing. Many thanks. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the PR! Apologies that a couple of times I suggested things that were actually incorrect!
* Found 1 extra inconsistency than the mentioned one * found and fixed other inconsitencies * further fixes * further fixes 2 * fixed 3 out of 4 checkstyle errors - 1 more to fix * all checkstyle errors fixed * removed use of String.format * removed another instance of using String.format * more changes * additional change * reverted changes
…ings (#2651) (#2658) * gh-2618: Cleanup inconsistent use of logging strings (#2651) * Found 1 extra inconsistency than the mentioned one * found and fixed other inconsitencies * further fixes * further fixes 2 * fixed 3 out of 4 checkstyle errors - 1 more to fix * all checkstyle errors fixed * removed use of String.format * removed another instance of using String.format * more changes * additional change * reverted changes * gh-2657: Revert accidental change * gh-2657: Update copyright with spotless Co-authored-by: Robert <33911814+RobertG111@users.noreply.github.com>
* Update docs links in README * Revert "Update docs links in README" This reverts commit 2d87bf3. * gh-2559 added hasTrait, its handler and corresponding tests (#2561) * gh-2559 added hasTrait, its handler and corresponding tests * gh-2559 amended comment in HasTrait, added additional tests for the handler * gh-2559 null check & tidy test Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * Update links to Gaffer docs in all files (#2566) Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * gh-2604: Deprecates Parquet (#2606) * gh-2556: Add HBaseStore deprecated tag, javadocs and note to README (#2605) * gh-2556: Add HBaseStore deprecated tag, javadocs and note to README * gh-2556: Amend version number * Upgrade Hazelcast version to 5.1.1 (#2612) Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * Gh-2602: Replace Log4j with Reload4j (#2609) * Replace Log4j with Reload4j Also add enforcer plugin to prevent future problems * FederatedStoreGetTraitsTest did not delete the cache service before carrying out each test causing it to fail when run as part of the maven tests. In isolation it passed. Found that the FederatedGraphStorageTraitsTest was also not clearing the cache. Added the before and after cache clearance and bumped the JUnit version of FederatedStoreGetTraitsTest from 4 to 5. Tests now pass (#2617) Co-authored-by: r32575 <63105662+r32575@users.noreply.github.com> * Gh 2562 GetElementsWithinSet not allowing for the exclusion of properties - Gaffer v1 (#2597) * Fixed bug gh-2562. View properties are now being filtered. Added tests * After a review moved the return statements inside the doPostFilter if-check and changed a conditional fail to an assertThat test * Removed the try-finally blocks as the classes implement CloseableIterable * Added failure message to test * Adjusted javadoc formatting * Removed rogue letter Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * prepare release gaffer2-1.22.0 * prepare for next development iteration * gh-2618: Cleanup inconsistent use of logging strings (#2651) * Found 1 extra inconsistency than the mentioned one * found and fixed other inconsitencies * further fixes * further fixes 2 * fixed 3 out of 4 checkstyle errors - 1 more to fix * all checkstyle errors fixed * removed use of String.format * removed another instance of using String.format * more changes * additional change * reverted changes * replaced to SLF4J (#2663) * gh-2669: Added new aggregation function endpoints (#2670) * gh-2673: Fix links to koryphe core (#2674) * Gh 2705 operation details spring (#2706) * gh-2705: Cherry pick new spring endpoint * gh-2696: Added tests for new all operation details endpoint (#2700) * gh-2696: Added tests for new all operation details endpoint * gh-2696: Spotless apply * gh-2705: Copyright fix * Gh-2745: Fix crown copyright link Fixed Crown Copyright Link on Line 44 * Gh-2776: Create issue templates (#2777) * Create issue templates * Simplify bug report * build(deps): bump hazelcast (#2848) Bumps [hazelcast](https://github.com/hazelcast/hazelcast) from 5.1.1 to 5.1.3. - [Release notes](https://github.com/hazelcast/hazelcast/releases) - [Commits](hazelcast/hazelcast@v5.1.1...v5.1.3) --- updated-dependencies: - dependency-name: com.hazelcast:hazelcast dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * GH-2845: updt class var parameter to use Map interface (#2846) Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * Gh-2914: Remove redundant constants class (#2927) * #2914 Issue: Remove redundant constants class * Simplify charset * Fix import * Remove erroneous use of charset with JSONSerialiser.serialise * Use StandardCharsets inbuilt function --------- Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> * prepare release gaffer2-1.23.0 * prepare for next development iteration * Fix field names in ToCsv * Refactor to string enums --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> Co-authored-by: p3430233 <61738524+p3430233@users.noreply.github.com> Co-authored-by: r32575 <63105662+r32575@users.noreply.github.com> Co-authored-by: Gaffer <github-actions@github.com> Co-authored-by: Robert <33911814+RobertG111@users.noreply.github.com> Co-authored-by: Anirban Patra <96457415+AnirbanPatragithub@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kvaithin <68995267+kvaithin@users.noreply.github.com> Co-authored-by: Brijesh Yadav <brijeshyadavjthj@gmail.com>
Hi. This is my first ever contribution, thanks for the opportunity. The other pull request I created was closed due to having my personal email address. I have fixed the minor issues in relation to inconsistent use of logging strings. All logging functions used the correct format and was able to find only 1 extra mistake apart from the mentioned one in the issue. Thanks.