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

Oshi optimization #2126

Merged
merged 1 commit into from
Feb 22, 2022
Merged

Oshi optimization #2126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 26 additions & 2 deletions .../com/microsoft/applicationinsights/agent/internal/perfcounter/OshiPerformanceCounter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.microsoft.applicationinsights.agent.internal.exporter.models.TelemetryItem;
import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient;
import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryUtil;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -32,6 +33,10 @@
import oshi.hardware.CentralProcessor.TickType;
import oshi.software.os.OSProcess;
import oshi.software.os.OperatingSystem;
import oshi.software.os.linux.LinuxOSProcess;
import oshi.util.FileUtil;
import oshi.util.ParseUtil;
import oshi.util.platform.linux.ProcPath;

public class OshiPerformanceCounter implements PerformanceCounter {

Expand Down Expand Up @@ -79,8 +84,12 @@ public void report(TelemetryClient telemetryClient) {
long currCollectionTimeMillis = System.currentTimeMillis();
long currProcessBytes = 0L;
if (processInfo != null) {
updateAttributes(processInfo);
currProcessBytes = getProcessBytes(processInfo);
if (processInfo instanceof LinuxOSProcess) {
currProcessBytes = getProcessBytesLinux(processInfo.getProcessID());
} else {
updateAttributes(processInfo);
currProcessBytes = getProcessBytes(processInfo);
}
}

long currTotalProcessorMillis = getTotalProcessorMillis(processor);
Expand Down Expand Up @@ -124,6 +133,21 @@ private static long getProcessBytes(OSProcess processInfo) {
return processInfo.getBytesRead() + processInfo.getBytesWritten();
}

// oshi.software.os.linux.LinuxOSProcess.updateAttributes() captures too much stuff each time,
// including groupId which calls "getent group", which having the machine connected to active
// directory, scans its entire structure
// (https://portal.microsofticm.com/imp/v3/incidents/details/289056966/home)
//
// so this method copies what LinuxOSProcess.updateAttributes() does for just the metrics that we
// use for calculating I/O bytes
private static long getProcessBytesLinux(int processId) {
Map<String, String> io =
FileUtil.getKeyValueMapFromFile(String.format(ProcPath.PID_IO, processId), ":");
long bytesRead = ParseUtil.parseLongOrDefault(io.getOrDefault("read_bytes", ""), 0L);
long bytesWritten = ParseUtil.parseLongOrDefault(io.getOrDefault("write_bytes", ""), 0L);
return bytesRead + bytesWritten;
}

private static long getTotalProcessorMillis(CentralProcessor processor) {
long[] systemCpuLoadTicks = processor.getSystemCpuLoadTicks();
return systemCpuLoadTicks[TickType.USER.getIndex()]
Expand Down