From 94426a85dc72c56ff13e962640aa263714380972 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Feb 2026 02:13:54 +0000 Subject: [PATCH 1/5] Initial plan From f09aebaa74c75415ef43b76135793c68f4f99695 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Feb 2026 02:19:24 +0000 Subject: [PATCH 2/5] Re-enable spring-cloud-azure-starter-monitor for Spring Boot 4 support Co-authored-by: rujche <171773178+rujche@users.noreply.github.com> --- .../spring-cloud-azure-dependencies/pom.xml | 11 ++++----- sdk/spring/ci.yml | 24 +++++++++---------- sdk/spring/pom.xml | 4 ++-- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/sdk/boms/spring-cloud-azure-dependencies/pom.xml b/sdk/boms/spring-cloud-azure-dependencies/pom.xml index cec4961f57be..205943b2e546 100644 --- a/sdk/boms/spring-cloud-azure-dependencies/pom.xml +++ b/sdk/boms/spring-cloud-azure-dependencies/pom.xml @@ -209,12 +209,11 @@ spring-cloud-azure-starter-keyvault-certificates ${project.version} - - - - - - + + com.azure.spring + spring-cloud-azure-starter-monitor + ${project.version} + com.azure.spring spring-cloud-azure-starter-servicebus diff --git a/sdk/spring/ci.yml b/sdk/spring/ci.yml index dd7d87e691fe..01a3572ca194 100644 --- a/sdk/spring/ci.yml +++ b/sdk/spring/ci.yml @@ -244,11 +244,10 @@ parameters: displayName: 'spring-cloud-azure-starter-appconfiguration-config' type: boolean default: true -# todo: add back when monitor support Spring Boot 4 -#- name: release_springcloudazurestartermonitor -# displayName: 'spring-cloud-azure-starter-monitor' -# type: boolean -# default: true +- name: release_springcloudazurestartermonitor + displayName: 'spring-cloud-azure-starter-monitor' + type: boolean + default: true extends: @@ -604,13 +603,12 @@ extends: skipPublishDocMs: true skipVerifyChangeLog: true releaseInBatch: ${{ parameters.release_springcloudazurestarterappconfigurationconfig }} -# todo: add back when monitor support Spring Boot 4 -# - name: spring-cloud-azure-starter-monitor -# groupId: com.azure.spring -# safeName: springcloudazurestartermonitor -# skipPublishDocGithubIo: true -# skipPublishDocMs: true -# skipVerifyChangelog: true -# releaseInBatch: ${{ parameters.release_springcloudazurestartermonitor }} + - name: spring-cloud-azure-starter-monitor + groupId: com.azure.spring + safeName: springcloudazurestartermonitor + skipPublishDocGithubIo: true + skipPublishDocMs: true + skipVerifyChangelog: true + releaseInBatch: ${{ parameters.release_springcloudazurestartermonitor }} MatrixFilters: - JavaTestVersion=^(?!1.8|1.11).* diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml index b21a8cac2f43..005b5bc5c160 100644 --- a/sdk/spring/pom.xml +++ b/sdk/spring/pom.xml @@ -70,8 +70,8 @@ spring-cloud-azure-feature-management-web spring-cloud-azure-starter-appconfiguration-config azure-spring-data-cosmos - - + spring-cloud-azure-starter-monitor + spring-cloud-azure-starter-monitor-test From a0035efce02d280bea4b417ed8fbe62b5c617c90 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Feb 2026 02:20:47 +0000 Subject: [PATCH 3/5] Fix capitalization of skipVerifyChangeLog in ci.yml Co-authored-by: rujche <171773178+rujche@users.noreply.github.com> --- sdk/spring/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/spring/ci.yml b/sdk/spring/ci.yml index 01a3572ca194..b91fedb2a87a 100644 --- a/sdk/spring/ci.yml +++ b/sdk/spring/ci.yml @@ -608,7 +608,7 @@ extends: safeName: springcloudazurestartermonitor skipPublishDocGithubIo: true skipPublishDocMs: true - skipVerifyChangelog: true + skipVerifyChangeLog: true releaseInBatch: ${{ parameters.release_springcloudazurestartermonitor }} MatrixFilters: - JavaTestVersion=^(?!1.8|1.11).* From 1df3a0068f2f1c85e80318e6f8e18439cc5ea1cf Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Feb 2026 02:38:46 +0000 Subject: [PATCH 4/5] Uncomment monitor modules in _constants.py and update CHANGELOG.md Co-authored-by: rujche <171773178+rujche@users.noreply.github.com> --- sdk/spring/CHANGELOG.md | 8 ++++++++ sdk/spring/scripts/_constants.py | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sdk/spring/CHANGELOG.md b/sdk/spring/CHANGELOG.md index 1426cd5722d4..3eb3851898cf 100644 --- a/sdk/spring/CHANGELOG.md +++ b/sdk/spring/CHANGELOG.md @@ -26,6 +26,14 @@ This section includes changes in `spring-cloud-azure-testcontainers` module. - Add ServiceBusContainerConnectionDetailsFactory. [#44019](https://github.com/Azure/azure-sdk-for-java/pull/44019). +### Spring Cloud Azure Starter Monitor + +This section includes changes in `spring-cloud-azure-starter-monitor` module. + +#### Other Changes + +- Re-enabled for Spring Boot 4 support with OpenTelemetry 2.24.0. + ## 7.0.0 (2026-02-03) - This release is compatible with Spring Boot 4.0.0-4.0.2. (Note: 4.0.x (x>2) should be supported, but they aren't tested with this release.) - This release is compatible with Spring Cloud 2025.1.0. (Note: 2025.1.x (x>0) should be supported, but they aren't tested with this release.) diff --git a/sdk/spring/scripts/_constants.py b/sdk/spring/scripts/_constants.py index bff58806cb2f..bbe95355146a 100644 --- a/sdk/spring/scripts/_constants.py +++ b/sdk/spring/scripts/_constants.py @@ -26,8 +26,6 @@ def get_spring_boot_version_tag_prefix(spring_boot_version): # Since Spring Cloud Azure uses multiple versions of external dependencies managed by Spring Boot, # the modules that still use Spring Boot 2 to manage dependencies will be skipped. SKIP_ADDING_DEPENDENCY_MANAGEMENT_ARTIFACTS = [ -# 'spring-cloud-azure-starter-monitor-test', -# 'spring-cloud-azure-starter-monitor' ] # Since some features are based on a higher Spring Boot version, it is sufficient to let the modules # corresponding to these special Spring Boot versions use the latest Spring Boot version. From 7711dd25585a714a85932488e518971e570171fc Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Feb 2026 02:48:37 +0000 Subject: [PATCH 5/5] Update CHANGELOG.md entry with issue link and revised wording Co-authored-by: rujche <171773178+rujche@users.noreply.github.com> --- sdk/spring/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/spring/CHANGELOG.md b/sdk/spring/CHANGELOG.md index 3eb3851898cf..4960782d5487 100644 --- a/sdk/spring/CHANGELOG.md +++ b/sdk/spring/CHANGELOG.md @@ -32,7 +32,7 @@ This section includes changes in `spring-cloud-azure-starter-monitor` module. #### Other Changes -- Re-enabled for Spring Boot 4 support with OpenTelemetry 2.24.0. +- Support spring-cloud-azure-starter-monitor in Spring Boot 4. [#47624](https://github.com/Azure/azure-sdk-for-java/issues/47624) ## 7.0.0 (2026-02-03) - This release is compatible with Spring Boot 4.0.0-4.0.2. (Note: 4.0.x (x>2) should be supported, but they aren't tested with this release.)