Skip to content

Commit 06bc3b8

Browse files
heyamsheyams
committed
Merge remote-tracking branch 'origin/main' into heya/migrate-profiler-to-azure-json
2 parents 87bd31a + 333429b commit 06bc3b8

File tree

33 files changed

+152
-132
lines changed

33 files changed

+152
-132
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Please provide the following information:
2323
- Additional relevant libraries (with version, if applicable):
2424

2525
### Logs
26-
[Turn on SDK logs](https://docs.microsoft.com/en-us/azure/application-insights/app-insights-java-troubleshoot#debug-data-from-the-sdk) and attach/paste them to the issue. If using an application server, also attach any relevant server logs.
26+
[Turn on SDK logs](https://learn.microsoft.com/en-us/azure/azure-monitor/app/java-standalone-config#self-diagnostics) and attach/paste them to the issue. If using an application server, also attach any relevant server logs.
2727

2828
_Be sure to remove any private information from the logs before posting!_
2929

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
55
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
6-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-alpha=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
8-
io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
6+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
8+
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
1010
org.junit:junit-bom:5.11.2=runtimeClasspath
1111
org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
1212
empty=

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
55
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
6-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-alpha=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
8-
io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
6+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
8+
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
1010
org.junit:junit-bom:5.11.2=runtimeClasspath
1111
org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
1212
empty=

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
5-
com.google.errorprone:error_prone_annotations:2.32.0=runtimeClasspath
5+
com.google.errorprone:error_prone_annotations:2.34.0=runtimeClasspath
66
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
1111
org.junit:junit-bom:5.11.2=runtimeClasspath
1212
org.slf4j:slf4j-api:2.0.16=runtimeClasspath
1313
org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
5-
com.google.errorprone:error_prone_annotations:2.32.0=runtimeClasspath
5+
com.google.errorprone:error_prone_annotations:2.34.0=runtimeClasspath
66
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
1111
org.junit:junit-bom:5.11.2=runtimeClasspath
1212
org.slf4j:slf4j-api:2.0.16=runtimeClasspath
1313
org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
55
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
6-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-alpha=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
8-
io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
6+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
8+
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
1010
org.junit:junit-bom:5.11.2=runtimeClasspath
1111
org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
1212
empty=

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
55
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
6-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-alpha=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
8-
io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
6+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
8+
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
1010
org.junit:junit-bom:5.11.2=runtimeClasspath
1111
org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
1212
empty=

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-json:1.3.0=runtimeClasspath
55
com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
66
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
1111
org.junit:junit-bom:5.11.2=runtimeClasspath
1212
org.slf4j:slf4j-api:2.0.16=runtimeClasspath
1313
org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath

‎agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/analysis/pipelines/AlertPipelineMXBean.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package com.microsoft.applicationinsights.alerting.analysis.pipelines;
55

66
// This class name must end in MXBean (case sensitive)
7-
@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
7+
@SuppressWarnings({"checkstyle:AbbreviationAsWordInName", "IdentifierName"})
88
public interface AlertPipelineMXBean {
99

1010
// Attributes

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
55
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
6-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-alpha=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
8-
io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
6+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
8+
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
1010
org.junit:junit-bom:5.11.2=runtimeClasspath
1111
org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
1212
empty=

0 commit comments

Comments
 (0)