Skip to content

Commit 4488b2d

Browse files
trasktrask
committed
Merge remote-tracking branch 'origin/main' into sampling-override-behavior
2 parents 208cabd + 2572e6c commit 4488b2d

File tree

46 files changed

+432
-166
lines changed

Some content is hidden

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

46 files changed

+432
-166
lines changed

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
# https://help.github.com/en/articles/about-code-owners
99
#
1010

11-
* @heyams @jeanbisutti @ramthi @trask @harsimar
12-
/agent/agent-profiler @heyams @jeanbisutti @ramthi @trask @johnoliver @harsimar
13-
/agent/agent-gc-monitor @heyams @jeanbisutti @ramthi @trask @johnoliver @harsimar
11+
* @harsimar @heyams @jeanbisutti @rajkumar-rangaraj @ramthi @trask
12+
/agent/agent-profiler @harsimar @heyams @jeanbisutti @rajkumar-rangaraj @ramthi @trask @johnoliver
13+
/agent/agent-gc-monitor @harsimar @heyams @jeanbisutti @rajkumar-rangaraj @ramthi @trask @johnoliver

‎.github/dependabot.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,19 @@ updates:
3535
schedule:
3636
interval: "daily"
3737
open-pull-requests-limit: 10
38+
39+
- package-ecosystem: "gradle"
40+
directory: "/perf-tests"
41+
registries:
42+
- gradle-plugin-portal
43+
schedule:
44+
interval: "daily"
45+
open-pull-requests-limit: 10
46+
47+
- package-ecosystem: "gradle"
48+
directory: "/etw/etw-testapp"
49+
registries:
50+
- gradle-plugin-portal
51+
schedule:
52+
interval: "daily"
53+
open-pull-requests-limit: 10

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ jobs:
5757
uses: gradle/actions/setup-gradle@v4
5858

5959
- name: Generate license report
60-
run: ./gradlew generateLicenseReport ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
60+
run: |
61+
# generateLicenseReport build caching appears to be broken so need to ignore build cache always
62+
./gradlew generateLicenseReport --no-build-cache
6163
6264
- name: Check licenses
6365
run: |

‎CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# CHANGELOG
22

3+
## Version 3.7.0 GA (01/22/2025)
4+
5+
### Enhancements
6+
7+
* Support for Live Metrics Filtering ([#43040](https://github.com/Azure/azure-sdk-for-java/pull/43040), [#43184](https://github.com/Azure/azure-sdk-for-java/pull/43184), [#43289](https://github.com/Azure/azure-sdk-for-java/pull/43289), [#43323](https://github.com/Azure/azure-sdk-for-java/pull/43323), [#43506](https://github.com/Azure/azure-sdk-for-java/pull/43506), [#43744](https://github.com/Azure/azure-sdk-for-java/pull/43744))
8+
* Update to OpenTelemetry Java Instrumentation 2.12.0 ([#4034](https://github.com/microsoft/ApplicationInsights-Java/pull/4034))
9+
* Remove user sensitive data from self-diagnostics ([#3976](https://github.com/microsoft/ApplicationInsights-Java/pull/3976))
10+
* Exclude `META-INF/maven/**` from agent jar to avoid CVE false positives ([#4040](https://github.com/microsoft/ApplicationInsights-Java/pull/4040))
11+
* Don't log Log Records (when debug logging enabled) if they are sampled out
12+
([#3936](https://github.com/microsoft/ApplicationInsights-Java/pull/3936))
13+
* Include NICE, IRQ, SOFTIRQ, and STEAL in `\\Processor(_Total)\\% Processor Time` metric
14+
([#3987](https://github.com/microsoft/ApplicationInsights-Java/pull/3987))
15+
* Add note to applicationinsights.log to make sure that private information is removed from the log
16+
([#4011](https://github.com/microsoft/ApplicationInsights-Java/pull/4011))
17+
* Support finding applicationinsights.json in current dir when using runtime attach
18+
([#3990](https://github.com/microsoft/ApplicationInsights-Java/pull/3990))
19+
* Add a warning message if the applicationinsights-agent jar is in the classpath in Java 11+ ([#4039](https://github.com/microsoft/ApplicationInsights-Java/pull/4039))
20+
21+
322
## Version 3.6.2 GA (10/23/2024)
423

524
### Enhancements

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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.30=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
6-
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
6+
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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.30=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
6-
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
6+
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=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,10 +1,10 @@
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.30=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath
7-
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
7+
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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.30=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath
7-
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
7+
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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.30=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
6-
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
6+
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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.30=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.31=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
6-
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
6+
io.netty:netty-bom:4.1.118.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath

0 commit comments

Comments
 (0)