From 91b0873bd1c47672251bca67e0f96be19d0c3d1e Mon Sep 17 00:00:00 2001 From: heyams Date: Mon, 18 Sep 2023 12:35:57 -0700 Subject: [PATCH 1/7] Update changelog for 3.4.17 --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8b7e40d2db..598074dccff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # CHANGELOG +## Version 3.4.17 GA (09/18/2013) + +### Enhancements: + +* GA Azure Active Directory authentication ([#3284](https://github.com/microsoft/ApplicationInsights-Java/pull/3284)) +* Enable sampling overrides using thread.name ([#3285](https://github.com/microsoft/ApplicationInsights-Java/pull/3285)) + +### Bug fixes: + +* Fix Azure Kubernetes Service cloud_RoleName ([#3277](https://github.com/microsoft/ApplicationInsights-Java/pull/3277)) + ## Version 3.4.16 GA ### Enhancements: From 9ff7c9b15ed0589c1c5ed7e2b53ce2efbcabd9de Mon Sep 17 00:00:00 2001 From: heyams Date: Mon, 18 Sep 2023 13:11:49 -0700 Subject: [PATCH 2/7] Update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 598074dccff..684ebb014b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ### Bug fixes: +* Fix applicationinsights.json config is not loaded in manual rp attach scenario ([#3288](https://github.com/microsoft/ApplicationInsights-Java/pull/3288)) * Fix Azure Kubernetes Service cloud_RoleName ([#3277](https://github.com/microsoft/ApplicationInsights-Java/pull/3277)) ## Version 3.4.16 GA From e1a2f4b7c4830a88ea7fb479df5881dc37838720 Mon Sep 17 00:00:00 2001 From: heyams Date: Mon, 18 Sep 2023 13:13:08 -0700 Subject: [PATCH 3/7] Comments --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 684ebb014b3..2c96a19053e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,7 @@ ### Bug fixes: -* Fix applicationinsights.json config is not loaded in manual rp attach scenario ([#3288](https://github.com/microsoft/ApplicationInsights-Java/pull/3288)) -* Fix Azure Kubernetes Service cloud_RoleName ([#3277](https://github.com/microsoft/ApplicationInsights-Java/pull/3277)) +* Fix regression in 3.4.16 where default applicationinsights.json config location is not loaded in AppServices, Azure Functions, and AKS ([#3288](https://github.com/microsoft/ApplicationInsights-Java/pull/3288)) ## Version 3.4.16 GA From 1e14d175e924e1a81b8a560152b563eec986bbe2 Mon Sep 17 00:00:00 2001 From: heyams Date: Mon, 18 Sep 2023 13:14:05 -0700 Subject: [PATCH 4/7] Fix wrong year in date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c96a19053e..8b0fcad72f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG -## Version 3.4.17 GA (09/18/2013) +## Version 3.4.17 GA (09/18/2023) ### Enhancements: From 21cffbb52b81741ac4dd7fbf77ef6ec4fa414615 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 18 Sep 2023 14:12:47 -0700 Subject: [PATCH 5/7] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b0fcad72f7..9794e11cb28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Enhancements: +* Update to OpenTelemetry 1.30 ([#3292](https://github.com/microsoft/ApplicationInsights-Java/pull/3292)) * GA Azure Active Directory authentication ([#3284](https://github.com/microsoft/ApplicationInsights-Java/pull/3284)) * Enable sampling overrides using thread.name ([#3285](https://github.com/microsoft/ApplicationInsights-Java/pull/3285)) From 5d9dc9124b2fcf18116a4e691cb4f5615c441b6c Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 18 Sep 2023 14:13:31 -0700 Subject: [PATCH 6/7] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9794e11cb28..ef3c81a34b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Enhancements: -* Update to OpenTelemetry 1.30 ([#3292](https://github.com/microsoft/ApplicationInsights-Java/pull/3292)) +* Update to OpenTelemetry Java 1.30 ([#3292](https://github.com/microsoft/ApplicationInsights-Java/pull/3292)) * GA Azure Active Directory authentication ([#3284](https://github.com/microsoft/ApplicationInsights-Java/pull/3284)) * Enable sampling overrides using thread.name ([#3285](https://github.com/microsoft/ApplicationInsights-Java/pull/3285)) From 12f0e4959d716be1dbd8b479b98a94c7e2e3d44b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 18 Sep 2023 16:26:49 -0700 Subject: [PATCH 7/7] fix --- .../smoketest/SamplingOverridesThreadName.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesThreadName.java b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesThreadName.java index 47c42761a89..d457ae68709 100644 --- a/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesThreadName.java +++ b/smoke-tests/apps/SamplingOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingOverridesThreadName.java @@ -10,8 +10,6 @@ import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_20; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8; import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8; -import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8_OPENJ9; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; @@ -50,9 +48,5 @@ static class Tomcat8Java19Test extends SamplingOverridesThreadName {} @Environment(TOMCAT_8_JAVA_20) static class Tomcat8Java20Test extends SamplingOverridesThreadName {} - @Environment(WILDFLY_13_JAVA_8) - static class Wildfly13Java8Test extends SamplingOverridesThreadName {} - - @Environment(WILDFLY_13_JAVA_8_OPENJ9) - static class Wildfly13Java8OpenJ9Test extends SamplingOverridesThreadName {} + // intentionally not including wildfly, since this test is set up for Tomcat thread names }