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

Turn off oshi logging #2086

Merged
merged 2 commits into from
Feb 7, 2022
Merged

Turn off oshi logging #2086

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5dbd1e
Turn off oshi logging
heyams Feb 4, 2022
c0a94e9
Update oshi logger level
heyams Feb 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .../java/com/microsoft/applicationinsights/agent/internal/init/LoggingLevelConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public LoggingLevelConfigurator(String levelStr) {
}

public void initLoggerLevels(LoggerContext loggerContext) {
updateLoggerLevel(loggerContext.getLogger("oshi"));
updateLoggerLevel(loggerContext.getLogger("reactor.netty"));
updateLoggerLevel(loggerContext.getLogger("reactor.util"));
updateLoggerLevel(loggerContext.getLogger("io.netty"));
Expand All @@ -62,7 +63,9 @@ public void initLoggerLevels(LoggerContext loggerContext) {
public void updateLoggerLevel(Logger logger) {
Level loggerLevel;
String name = logger.getName();
if (name.startsWith("reactor.netty") || name.startsWith("io.netty")) {
if (name.startsWith("oshi")) {
loggerLevel = getOshiLoggerLevel(level);
} else if (name.startsWith("reactor.netty") || name.startsWith("io.netty")) {
loggerLevel = getNettyLevel(level);
} else if (name.startsWith("reactor.util")) {
loggerLevel = getDefaultLibraryLevel(level);
Expand Down Expand Up @@ -125,6 +128,15 @@ private static Level getNettyLevel(Level level) {
}
}

private static Level getOshiLoggerLevel(Level level) {
if (level == Level.INFO || level == Level.WARN || level == Level.ERROR) {
return Level.OFF;
} else if (level == Level.DEBUG) {
return Level.INFO;
}
return level;
}

private static Level getDefaultLibraryLevel(Level level) {
if (level == Level.INFO) {
return Level.WARN;
Expand Down