Re-enable spring-cloud-azure-starter-monitor for Spring Boot 4

sdk/boms/spring-cloud-azure-dependencies/pom.xml

@@ -209,12 +209,11 @@
         <artifactId>spring-cloud-azure-starter-keyvault-certificates</artifactId>
         <version>${project.version}</version>
       </dependency>
-<!--      todo: add back when monitor support Spring Boot 4-->
-<!--      <dependency>-->
-<!--        <groupId>com.azure.spring</groupId>-->
-<!--        <artifactId>spring-cloud-azure-starter-monitor</artifactId>-->
-<!--        <version>${project.version}</version>-->
-<!--      </dependency>-->
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-cloud-azure-starter-monitor</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.azure.spring</groupId>
         <artifactId>spring-cloud-azure-starter-servicebus</artifactId>

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.)

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).*

sdk/spring/pom.xml

@@ -70,8 +70,8 @@
         <module>spring-cloud-azure-feature-management-web</module>
         <module>spring-cloud-azure-starter-appconfiguration-config</module>
         <module>azure-spring-data-cosmos</module>
-<!--        <module>spring-cloud-azure-starter-monitor</module>-->
-<!--        <module>spring-cloud-azure-starter-monitor-test</module>-->
+        <module>spring-cloud-azure-starter-monitor</module>
+        <module>spring-cloud-azure-starter-monitor-test</module>
       </modules>
     </profile>
 

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.