Skip to content

Commit d86ea73

Browse files
authored
Merge branch 'main' into update-otel
2 parents 3e74bfc + 0c2cc68 commit d86ea73

File tree

134 files changed

+1040
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+1040
-232
lines changed

agent/agent-bootstrap/gradle.lockfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.2=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
66
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath

agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/BytecodeUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import javax.annotation.Nullable;
1919

2020
// supporting all properties of event, metric, remote dependency and page view telemetry
21-
@SuppressWarnings("TooManyParameters")
21+
@SuppressWarnings("TooManyParameters") // parameter count justified by method complexity
2222
public class BytecodeUtil {
2323

2424
private static BytecodeUtilDelegate delegate;
@@ -324,7 +324,7 @@ public static void onEnter() {
324324
startNanosHolder.set(System.nanoTime());
325325
}
326326

327-
@SuppressWarnings("SystemOut")
327+
@SuppressWarnings("SystemOut") // legitimate use of System.out for logging/output
328328
public static void onExit() {
329329
Long startNanos = startNanosHolder.get();
330330
if (startNanos == null) {

agent/agent-for-testing/gradle.lockfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.2=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
66
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath

agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.2=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.43.0=runtimeClasspath
77
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath

agent/agent-gc-monitor/gc-monitor-api/src/main/java/com/microsoft/gcmonitor/MemoryManagers.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public enum MemoryManagers {
2727

2828
ZGC(GarbageCollectors.Zgc.class);
2929

30-
@SuppressWarnings("ImmutableEnumChecker")
30+
@SuppressWarnings(
31+
"ImmutableEnumChecker") // mutable enum state is intentional and properly synchronized
3132
private final Class<? extends GarbageCollector>[] managers;
3233

3334
public static MemoryManagers of(MemoryManagement manager) {

agent/agent-gc-monitor/gc-monitor-api/src/main/java/com/microsoft/gcmonitor/memorypools/MemoryPools.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,10 @@ public Shenandoah(Set<GarbageCollector> managers) {
300300
}
301301
}
302302

303-
@SuppressWarnings({"checkstyle:AbbreviationAsWordInName", "MemberName"})
303+
@SuppressWarnings({
304+
"checkstyle:AbbreviationAsWordInName",
305+
"MemberName"
306+
}) // CGroup is the standard abbreviation for Control Group
304307
public static class ZHeap extends MemoryPool {
305308
public static final String POOL_NAME = "ZHeap";
306309

agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.2=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.43.0=runtimeClasspath
77
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath

agent/agent-gc-monitor/gc-monitor-core/src/main/java/com/microsoft/gcmonitor/collectors/GcCollectionSample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public GcCollectionSample(
6363

6464
private static Map<MemoryPool, MemoryUsage> groupMemoryUsageByPoolName(
6565
Object map, MemoryManagement memoryManagement) {
66-
@SuppressWarnings("unchecked")
66+
@SuppressWarnings("unchecked") // safe unchecked cast - type verified by runtime context
6767
Map<List<String>, CompositeData> byName = (Map<List<String>, CompositeData>) map;
6868
Map<MemoryPool, MemoryUsage> byIdentifier = new HashMap<>();
6969
try {

agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.2=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
66
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath

agent/agent-gc-monitor/gc-monitor-tests/src/test/java/com/microsoft/gcmonitortests/GcEventGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static void main(String[] args) throws InterruptedException {
2525
new GcEventGenerator().run();
2626
}
2727

28-
@SuppressWarnings("SystemOut")
28+
@SuppressWarnings("SystemOut") // legitimate use of System.out for logging/output
2929
private void run() throws InterruptedException {
3030
System.out.println("Hit return to start");
3131

0 commit comments

Comments
 (0)