Skip to content

Commit a2da25c

Browse files
harsimarharsimar
committed
merge from main and bump autoconfigure version
2 parents c8c6bbe + d89b256 commit a2da25c

File tree

62 files changed

+1025
-542
lines changed

Some content is hidden

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

62 files changed

+1025
-542
lines changed

‎.github/workflows/build-common.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
required: false
99

1010
env:
11-
EXPORTER_VERSION: 1.0.0-beta.4 # to be updated with the latest version
11+
EXPORTER_VERSION: 1.1.0 # to be updated with the latest version
1212

1313
jobs:
1414
spotless:

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
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.2.31=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.32=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
11-
org.junit:junit-bom:5.12.0=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.48.0=runtimeClasspath
11+
org.junit:junit-bom:5.12.1=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
1313
empty=

‎agent/agent-for-testing/gradle.lockfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
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.2.31=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.32=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
11-
org.junit:junit-bom:5.12.0=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.48.0=runtimeClasspath
11+
org.junit:junit-bom:5.12.1=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
1313
empty=

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
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.2.31=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.32=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath
77
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
12-
org.junit:junit-bom:5.12.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.48.0=runtimeClasspath
12+
org.junit:junit-bom:5.12.1=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
1515
empty=

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
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.2.31=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.32=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath
77
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
12-
org.junit:junit-bom:5.12.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.48.0=runtimeClasspath
12+
org.junit:junit-bom:5.12.1=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
1515
empty=

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
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.2.31=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.32=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
11-
org.junit:junit-bom:5.12.0=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.48.0=runtimeClasspath
11+
org.junit:junit-bom:5.12.1=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
1313
empty=

‎agent/agent-profiler/agent-alerting-api/gradle.lockfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
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.2.31=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.32=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
11-
org.junit:junit-bom:5.12.0=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.48.0=runtimeClasspath
11+
org.junit:junit-bom:5.12.1=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
1313
empty=

‎agent/agent-profiler/agent-alerting-api/src/main/java/com/microsoft/applicationinsights/alerting/aiconfig/AlertingConfig.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.azure.json.JsonToken;
99
import com.azure.json.JsonWriter;
1010
import java.io.IOException;
11+
import java.util.Locale;
1112

1213
public class AlertingConfig {
1314

@@ -56,7 +57,8 @@ public static RequestFilter fromJson(JsonReader jsonReader) throws IOException {
5657
reader.nextToken();
5758
String fieldName = reader.getFieldName();
5859
if ("type".equals(fieldName)) {
59-
deserializedRequestFilter.setType(RequestFilterType.valueOf(reader.getString()));
60+
deserializedRequestFilter.setType(
61+
RequestFilterType.valueOf(reader.getString().toUpperCase(Locale.ROOT)));
6062
} else if ("value".equals(fieldName)) {
6163
deserializedRequestFilter.setValue(reader.getString());
6264
} else {
@@ -184,7 +186,7 @@ public static RequestAggregation fromJson(JsonReader jsonReader) throws IOExcept
184186
String fieldName = reader.getFieldName();
185187
if ("type".equals(fieldName)) {
186188
deserializedRequestAggregation.setType(
187-
RequestAggregationType.valueOf(reader.getString()));
189+
RequestAggregationType.valueOf(reader.getString().toUpperCase(Locale.ROOT)));
188190
} else if ("windowSizeMillis".equals(fieldName)) {
189191
deserializedRequestAggregation.setWindowSizeMillis(jsonReader.getLong());
190192
} else if ("configuration".equals(fieldName)) {
@@ -254,7 +256,8 @@ public static RequestTriggerThreshold fromJson(JsonReader jsonReader) throws IOE
254256
String fieldName = reader.getFieldName();
255257
if ("type".equals(fieldName)) {
256258
deserializedRequestTriggerThreshold.setType(
257-
RequestTriggerThresholdType.valueOf(reader.getString()));
259+
RequestTriggerThresholdType.valueOf(
260+
reader.getString().toUpperCase(Locale.ROOT)));
258261
} else if ("value".equals(fieldName)) {
259262
deserializedRequestTriggerThreshold.setValue(reader.getFloat());
260263
} else {
@@ -314,7 +317,8 @@ public static RequestTriggerThrottling fromJson(JsonReader jsonReader) throws IO
314317
String fieldName = reader.getFieldName();
315318
if ("type".equals(fieldName)) {
316319
deserializedRequestTriggerThrottling.setType(
317-
RequestTriggerThrottlingType.valueOf(reader.getString()));
320+
RequestTriggerThrottlingType.valueOf(
321+
reader.getString().toUpperCase(Locale.ROOT)));
318322
} else if ("value".equals(fieldName)) {
319323
deserializedRequestTriggerThrottling.setValue(reader.getLong());
320324
} else {
@@ -426,7 +430,8 @@ public static RequestTrigger fromJson(JsonReader jsonReader) throws IOException
426430
if ("name".equals(fieldName)) {
427431
deserializedRequestTrigger.setName(reader.getString());
428432
} else if ("type".equals(fieldName)) {
429-
deserializedRequestTrigger.setType(RequestTriggerType.valueOf(reader.getString()));
433+
deserializedRequestTrigger.setType(
434+
RequestTriggerType.valueOf(reader.getString().toUpperCase(Locale.ROOT)));
430435
} else if ("filter".equals(fieldName)) {
431436
deserializedRequestTrigger.setFilter(RequestFilter.fromJson(reader));
432437
} else if ("aggregation".equals(fieldName)) {

‎agent/agent-profiler/agent-alerting/gradle.lockfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
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-json:1.3.0=runtimeClasspath
5-
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
6-
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
4+
com.azure:azure-json:1.4.0=runtimeClasspath
5+
com.azure:azure-sdk-bom:1.2.32=runtimeClasspath
6+
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
77
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
12-
org.junit:junit-bom:5.12.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.48.0=runtimeClasspath
12+
org.junit:junit-bom:5.12.1=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
1515
empty=

‎agent/agent-profiler/agent-diagnostics-api/gradle.lockfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
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.2.31=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.32=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.13.1-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.1=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
11-
org.junit:junit-bom:5.12.0=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.48.0=runtimeClasspath
11+
org.junit:junit-bom:5.12.1=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
1313
empty=

0 commit comments

Comments
 (0)