Re-enable SpringMonitorTest for Spring 7 (#47928)

Author: jeanbisutti

sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml

@@ -67,6 +67,12 @@
       <version>4.0.2</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-resttestclient;external_dependency} -->
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-restclient</artifactId>
+      <version>4.0.2</version> <!-- {x-version-update;springboot4_org.springframework.boot:spring-boot-restclient;external_dependency} -->
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>

sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/CustomValidationPolicy.java

@@ -6,6 +6,7 @@
 import com.azure.core.http.HttpPipelineNextPolicy;
 import com.azure.core.http.HttpResponse;
 import com.azure.core.http.policy.HttpPipelinePolicy;
+import com.azure.core.test.http.MockHttpResponse;
 import com.azure.core.util.FluxUtil;
 import com.azure.json.JsonProviders;
 import com.azure.json.JsonReader;
@@ -33,14 +34,17 @@ final class CustomValidationPolicy implements HttpPipelinePolicy {
 
     @Override
     public Mono<HttpResponse> process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) {
-        url = context.getHttpRequest().getUrl();
-        Mono<byte[]> asyncBytes = FluxUtil.collectBytesInByteBufferStream(context.getHttpRequest().getBody())
-            .map(LocalStorageTelemetryPipelineListener::ungzip);
-        asyncBytes.subscribe(value -> {
-            actualTelemetryItems.addAll(deserialize(value));
-            countDown.countDown();
-        });
-        return next.process();
+        URL requestUrl = context.getHttpRequest().getUrl();
+        if (requestUrl.getPath().contains("/v2.1/track")) {
+            url = requestUrl;
+            Mono<byte[]> asyncBytes = FluxUtil.collectBytesInByteBufferStream(context.getHttpRequest().getBody())
+                .map(LocalStorageTelemetryPipelineListener::ungzip);
+            asyncBytes.subscribe(value -> {
+                actualTelemetryItems.addAll(deserialize(value));
+                countDown.countDown();
+            });
+        }
+        return Mono.just(new MockHttpResponse(context.getHttpRequest(), 200));
     }
 
     // Copied from com.azure.monitor.opentelemetry.exporter.implementation.utils.TestUtils.java

sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java

@@ -38,7 +38,6 @@
     classes = {Application.class, SpringMonitorTest.TestConfig.class},
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureTestRestTemplate
-@Disabled("Needs to be fixed for Spring 7")
 class SpringMonitorTest {
 
     private static CountDownLatch countDownLatch;