Skip to content

Commit 1f2f8c2

Browse files
committed
Update
1 parent 9ae4aa4 commit 1f2f8c2

File tree

2 files changed

+16
-19
lines changed

2 files changed

+16
-19
lines changed

agent/agent-profiler/agent-diagnostics-jfr/src/main/java/com/microsoft/applicationinsights/diagnostics/jfr/CGroupData.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
public class CGroupData extends Event implements JsonSerializable<CGroupData> {
2727

2828
public static final String NAME = "com.microsoft.applicationinsights.diagnostics.jfr.CGroupData";
29-
public static final int CGROUP_DATA_ABSENT = -2;
29+
public static final int CGROUP_DATA_ABSENT = -2; // No CGroup data was found for this value
3030

3131
// Limit of the kernel memory
3232
private long kmemLimit; // /sys/fs/cgroup/memory/memory.kmem.limit_in_bytes
@@ -108,9 +108,6 @@ public static CGroupData fromJson(JsonReader jsonReader) throws IOException {
108108
while (reader.nextToken() != JsonToken.END_OBJECT) {
109109
String fieldName = reader.getFieldName();
110110
reader.nextToken();
111-
// In this case field names are case-sensitive but this could be replaced with
112-
// 'equalsIgnoreCase' to
113-
// make them case-insensitive.
114111
if ("kmemLimit".equals(fieldName)) {
115112
deserializedValue.setKmemLimit(reader.getLong());
116113
} else if ("memoryLimit".equals(fieldName)) {

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/RequestAlertPipelineBuilderTest.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ public class RequestAlertPipelineBuilderTest {
2424

2525
@Test
2626
public void configurationIsCorrectlyDuplicated() throws IOException {
27-
Configuration.RequestTrigger expectedRequesttrigger = new Configuration.RequestTrigger();
28-
expectedRequesttrigger.filter.type = Configuration.RequestFilterType.NAME_REGEX;
29-
expectedRequesttrigger.filter.value = "foo.*";
30-
expectedRequesttrigger.threshold.value = 0.75f;
27+
Configuration.RequestTrigger expectedRequestTrigger = new Configuration.RequestTrigger();
28+
expectedRequestTrigger.filter.type = Configuration.RequestFilterType.NAME_REGEX;
29+
expectedRequestTrigger.filter.value = "foo.*";
30+
expectedRequestTrigger.threshold.value = 0.75f;
3131

3232
TestTimeSource timeSource = new TestTimeSource();
3333
timeSource.setNow(Instant.EPOCH);
3434

3535
AlertingConfig.RequestTrigger config =
36-
RequestAlertPipelineBuilder.buildRequestTriggerConfiguration(expectedRequesttrigger);
36+
RequestAlertPipelineBuilder.buildRequestTriggerConfiguration(expectedRequestTrigger);
3737

3838
String alertingConfigStr;
3939
try (StringWriter stringWriter = new StringWriter();
@@ -46,24 +46,24 @@ public void configurationIsCorrectlyDuplicated() throws IOException {
4646
actualAlertingConfig = AlertingConfig.RequestTrigger.fromJson(reader);
4747
}
4848

49-
Assertions.assertEquals(expectedRequesttrigger.name, actualAlertingConfig.name);
50-
Assertions.assertEquals(expectedRequesttrigger.type.name(), actualAlertingConfig.type.name());
49+
Assertions.assertEquals(expectedRequestTrigger.name, actualAlertingConfig.name);
50+
Assertions.assertEquals(expectedRequestTrigger.type.name(), actualAlertingConfig.type.name());
5151
Assertions.assertEquals(
52-
expectedRequesttrigger.filter.type.name(), actualAlertingConfig.filter.type.name());
53-
Assertions.assertEquals(expectedRequesttrigger.filter.value, actualAlertingConfig.filter.value);
52+
expectedRequestTrigger.filter.type.name(), actualAlertingConfig.filter.type.name());
53+
Assertions.assertEquals(expectedRequestTrigger.filter.value, actualAlertingConfig.filter.value);
5454
Assertions.assertEquals(
55-
expectedRequesttrigger.aggregation.type.name(),
55+
expectedRequestTrigger.aggregation.type.name(),
5656
actualAlertingConfig.aggregation.type.name());
5757
Assertions.assertEquals(
58-
expectedRequesttrigger.threshold.type.name(), actualAlertingConfig.threshold.type.name());
58+
expectedRequestTrigger.threshold.type.name(), actualAlertingConfig.threshold.type.name());
5959
Assertions.assertEquals(
60-
expectedRequesttrigger.threshold.value, actualAlertingConfig.threshold.value);
60+
expectedRequestTrigger.threshold.value, actualAlertingConfig.threshold.value);
6161
Assertions.assertEquals(
62-
expectedRequesttrigger.throttling.type.name(), actualAlertingConfig.throttling.type.name());
62+
expectedRequestTrigger.throttling.type.name(), actualAlertingConfig.throttling.type.name());
6363
Assertions.assertEquals(
64-
expectedRequesttrigger.throttling.value, actualAlertingConfig.throttling.value);
64+
expectedRequestTrigger.throttling.value, actualAlertingConfig.throttling.value);
6565
Assertions.assertEquals(
66-
expectedRequesttrigger.profileDuration, actualAlertingConfig.profileDuration);
66+
expectedRequestTrigger.profileDuration, actualAlertingConfig.profileDuration);
6767
}
6868

6969
@TestFactory

0 commit comments

Comments
 (0)