-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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
Fix log4j #5313
Merged
Merged
Fix log4j #5313
Changes from 3 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
130 changes: 130 additions & 0 deletions
130
src/main/java/org/jabref/gui/logging/ApplicationInsightsLogEvent.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| package org.jabref.gui.logging; | ||
|
|
||
| /* | ||
| * ApplicationInsights-Java | ||
| * Copyright (c) Microsoft Corporation | ||
| * All rights reserved. | ||
| * | ||
| * MIT License | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of this | ||
| * software and associated documentation files (the ""Software""), to deal in the Software | ||
| * without restriction, including without limitation the rights to use, copy, modify, merge, | ||
| * publish, distribute, sublicense, and/or sell copies of the Software, and to permit | ||
| * persons to whom the Software is furnished to do so, subject to the following conditions: | ||
| * The above copyright notice and this permission notice shall be included in all copies or | ||
| * substantial portions of the Software. | ||
| * THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, | ||
| * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR | ||
| * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE | ||
| * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
| * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
| * DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import com.microsoft.applicationinsights.internal.common.ApplicationInsightsEvent; | ||
| import com.microsoft.applicationinsights.internal.logger.InternalLogger; | ||
| import com.microsoft.applicationinsights.telemetry.SeverityLevel; | ||
| import org.apache.logging.log4j.core.LogEvent; | ||
| import org.apache.logging.log4j.spi.StandardLevel; | ||
|
|
||
| // TODO: Remove this copy as soon as the one included in AI is compatible with log4j 3 | ||
| public final class ApplicationInsightsLogEvent extends ApplicationInsightsEvent { | ||
|
|
||
| private LogEvent logEvent; | ||
|
|
||
| public ApplicationInsightsLogEvent(LogEvent logEvent) { | ||
| this.logEvent = logEvent; | ||
| } | ||
|
|
||
| @Override | ||
| public String getMessage() { | ||
| String message = this.logEvent.getMessage() != null ? | ||
| this.logEvent.getMessage().getFormattedMessage() : | ||
| "Log4j Trace"; | ||
|
|
||
| return message; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isException() { | ||
| return this.logEvent.getThrown() != null; | ||
| } | ||
|
|
||
| @Override | ||
| public Exception getException() { | ||
| Exception exception = null; | ||
|
|
||
| if (isException()) { | ||
| Throwable throwable = this.logEvent.getThrown(); | ||
| exception = throwable instanceof Exception ? (Exception) throwable : new Exception(throwable); | ||
| } | ||
|
|
||
| return exception; | ||
| } | ||
|
|
||
| @Override | ||
| public Map<String, String> getCustomParameters() { | ||
|
|
||
| Map<String, String> metaData = new HashMap<String, String>(); | ||
|
|
||
| metaData.put("SourceType", "Log4j"); | ||
|
|
||
| addLogEventProperty("LoggerName", logEvent.getLoggerName(), metaData); | ||
| addLogEventProperty("LoggingLevel", logEvent.getLevel() != null ? logEvent.getLevel().name() : null, metaData); | ||
| addLogEventProperty("ThreadName", logEvent.getThreadName(), metaData); | ||
| addLogEventProperty("TimeStamp", getFormattedDate(logEvent.getTimeMillis()), metaData); | ||
|
|
||
| if (isException()) { | ||
| addLogEventProperty("Logger Message", getMessage(), metaData); | ||
| } | ||
|
|
||
| if (logEvent.isIncludeLocation()) { | ||
| StackTraceElement stackTraceElement = logEvent.getSource(); | ||
|
|
||
| addLogEventProperty("ClassName", stackTraceElement.getClassName(), metaData); | ||
| addLogEventProperty("FileName", stackTraceElement.getFileName(), metaData); | ||
| addLogEventProperty("MethodName", stackTraceElement.getMethodName(), metaData); | ||
| addLogEventProperty("LineNumber", String.valueOf(stackTraceElement.getLineNumber()), metaData); | ||
| } | ||
|
|
||
| for (Map.Entry<String, String> entry : logEvent.getContextData().toMap().entrySet()) { | ||
| addLogEventProperty(entry.getKey(), entry.getValue(), metaData); | ||
| } | ||
|
|
||
| // TODO: Username, domain and identity should be included as in .NET version. | ||
| // TODO: Should check, seems that it is not included in Log4j2. | ||
|
|
||
| return metaData; | ||
| } | ||
|
|
||
| @Override | ||
| public SeverityLevel getNormalizedSeverityLevel() { | ||
| int log4jLevelAsInt = logEvent.getLevel().intLevel(); | ||
|
|
||
| switch (StandardLevel.getStandardLevel(log4jLevelAsInt)) { | ||
| case FATAL: | ||
| return SeverityLevel.Critical; | ||
|
|
||
| case ERROR: | ||
| return SeverityLevel.Error; | ||
|
|
||
| case WARN: | ||
| return SeverityLevel.Warning; | ||
|
|
||
| case INFO: | ||
| return SeverityLevel.Information; | ||
|
|
||
| case TRACE: | ||
| case DEBUG: | ||
| case ALL: | ||
| return SeverityLevel.Verbose; | ||
|
|
||
| default: | ||
| InternalLogger.INSTANCE.error("Unknown Log4j v2 option, %d, using TRACE level as default", log4jLevelAsInt); | ||
| return SeverityLevel.Verbose; | ||
| } | ||
| } | ||
| } |
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
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
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.
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.
please change this back to the more compact format or we will all get hell of merge conflicts
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 thought that this is the "new" format, as many other dependencies are specified in this form. Personally, I have no strong opinion here but would prefer the extended form if only for the reason that you can simply copy & paste from maven.
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.
It's the same, just more verbose.
We should however be consistent.
I always use https://sagioto.github.io/maven2gradle/ to get the compact variant