debug missing recordings

Azure · Apr 19, 2023 · f5b3b23 · f5b3b23
1 parent abe6e8d
commit f5b3b23
Show file tree

Hide file tree

Showing 11 changed files with 106 additions and 1,458 deletions.
diff --git a/eng/common/testproxy/target_version.txt b/eng/common/testproxy/target_version.txt
@@ -1 +1 @@
-1.0.0-dev.20230224.5
+1.0.0-dev.20230322.1
diff --git a/sdk/monitor/azure-monitor-ingestion/pom.xml b/sdk/monitor/azure-monitor-ingestion/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core-test</artifactId>
-            <version>1.16.1</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
+            <version>1.16.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...tor-ingestion/src/test/java/com/azure/monitor/ingestion/LogsIngestionAsyncClientTest.java b/...tor-ingestion/src/test/java/com/azure/monitor/ingestion/LogsIngestionAsyncClientTest.java
@@ -3,17 +3,28 @@
 
 package com.azure.monitor.ingestion;
 
+import com.azure.core.credential.AccessToken;
 import com.azure.core.exception.HttpResponseException;
 import com.azure.core.http.HttpClient;
+import com.azure.core.http.policy.HttpLogDetailLevel;
+import com.azure.core.http.policy.HttpLogOptions;
+import com.azure.core.http.policy.RetryPolicy;
+import com.azure.core.http.policy.RetryStrategy;
 import com.azure.core.http.rest.RequestOptions;
+import com.azure.core.test.TestMode;
 import com.azure.core.test.http.AssertingHttpClientBuilder;
 import com.azure.core.util.BinaryData;
-import com.azure.monitor.ingestion.models.LogsUploadOptions;
+import com.azure.core.util.Configuration;
 import com.azure.monitor.ingestion.models.LogsUploadException;
+import com.azure.monitor.ingestion.models.LogsUploadOptions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+import java.time.Duration;
+import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
@@ -26,22 +37,50 @@
  */
 public class LogsIngestionAsyncClientTest extends LogsIngestionTestBase {
 
-    private HttpClient getAssertingHttpClient(HttpClient httpClient) {
-        return new AssertingHttpClientBuilder(httpClient)
-            .assertAsync()
-            .skipRequest((request, context) -> false)
-            .build();
+    @BeforeEach
+    public void beforeTest() {
+        dataCollectionEndpoint = Configuration.getGlobalConfiguration().get("AZURE_MONITOR_DCE", "https://dce.monitor.azure.com");
+        dataCollectionRuleId = Configuration.getGlobalConfiguration().get("AZURE_MONITOR_DCR_ID", "dcr-a64851bc17714f0483d1e96b5d84953b");
+        streamName = "Custom-MyTableRawData";
+
+        LogsIngestionClientBuilder clientBuilder = new LogsIngestionClientBuilder()
+            .retryPolicy(new RetryPolicy(new RetryStrategy() {
+                @Override
+                public int getMaxRetries() {
+                    return 0;
+                }
+
+                @Override
+                public Duration calculateRetryDelay(int i) {
+                    return null;
+                }
+            }));
+        if (getTestMode() == TestMode.PLAYBACK) {
+            clientBuilder
+                .credential(request -> Mono.just(new AccessToken("fakeToken", OffsetDateTime.now().plusDays(1))))
+                .httpClient(interceptorManager.getPlaybackClient());
+        } else if (getTestMode() == TestMode.RECORD) {
+            clientBuilder
+                .addPolicy(interceptorManager.getRecordPolicy())
+                .credential(getCredential());
+        } else if (getTestMode() == TestMode.LIVE) {
+            clientBuilder.credential(getCredential());
+        }
+        this.clientBuilder = clientBuilder
+            .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS))
+            .endpoint(dataCollectionEndpoint);
     }
-
     @Test
     public void testUploadLogs() {
+        System.out.println(getTestMode());
         List<Object> logs = getObjects(10);
         LogsIngestionAsyncClient client = clientBuilder.buildAsyncClient();
         StepVerifier.create(client.upload(dataCollectionRuleId, streamName, logs))
                 .verifyComplete();
     }
 
     @Test
+    @Disabled
     public void testUploadLogsInBatches() {
         List<Object> logs = getObjects(10000);
 
@@ -77,6 +116,7 @@ public void testUploadLogsPartialFailure() {
     }
 
     @Test
+    @Disabled
     public void testUploadLogsPartialFailureWithErrorHandler() {
         List<Object> logs = getObjects(100000);
         AtomicInteger count = new AtomicInteger();
@@ -95,6 +135,7 @@ public void testUploadLogsPartialFailureWithErrorHandler() {
     }
 
     @Test
+    @Disabled
     public void testUploadLogsStopOnFirstError() {
         List<Object> logs = getObjects(100000);
         AtomicInteger count = new AtomicInteger();
@@ -119,12 +160,13 @@ public void testUploadLogsProtocolMethod() {
         List<Object> logs = getObjects(10);
         LogsIngestionAsyncClient client = clientBuilder.buildAsyncClient();
         StepVerifier.create(client.uploadWithResponse(dataCollectionRuleId, streamName,
-                        BinaryData.fromObject(logs), new RequestOptions().setHeader("Content-Encoding", "gzip")))
+                        BinaryData.fromObject(logs), new RequestOptions()))
                 .assertNext(response -> assertEquals(204, response.getStatusCode()))
                 .verifyComplete();
     }
 
     @Test
+    @Disabled
     public void testUploadLargeLogsProtocolMethod() {
         List<Object> logs = getObjects(1000000);
         LogsIngestionAsyncClient client = clientBuilder.buildAsyncClient();

diff --git a/...-monitor-ingestion/src/test/java/com/azure/monitor/ingestion/LogsIngestionClientTest.java b/...-monitor-ingestion/src/test/java/com/azure/monitor/ingestion/LogsIngestionClientTest.java
@@ -3,18 +3,26 @@
 
 package com.azure.monitor.ingestion;
 
+import com.azure.core.credential.AccessToken;
 import com.azure.core.exception.HttpResponseException;
-import com.azure.core.http.HttpClient;
+import com.azure.core.http.policy.HttpLogDetailLevel;
+import com.azure.core.http.policy.HttpLogOptions;
+import com.azure.core.http.policy.RetryPolicy;
+import com.azure.core.http.policy.RetryStrategy;
 import com.azure.core.http.rest.RequestOptions;
 import com.azure.core.http.rest.Response;
-import com.azure.core.test.http.AssertingHttpClientBuilder;
+import com.azure.core.test.TestMode;
 import com.azure.core.util.BinaryData;
+import com.azure.core.util.Configuration;
 import com.azure.monitor.ingestion.models.LogsUploadException;
 import com.azure.monitor.ingestion.models.LogsUploadOptions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import reactor.test.StepVerifier;
+import reactor.core.publisher.Mono;
 
+import java.time.Duration;
+import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
@@ -27,14 +35,50 @@
  */
 public class LogsIngestionClientTest extends LogsIngestionTestBase {
 
+    @Override
+    public void beforeTest() {
+        dataCollectionEndpoint = Configuration.getGlobalConfiguration().get("AZURE_MONITOR_DCE", "https://dce.monitor.azure.com");
+        dataCollectionRuleId = Configuration.getGlobalConfiguration().get("AZURE_MONITOR_DCR_ID", "dcr-a64851bc17714f0483d1e96b5d84953b");
+        streamName = "Custom-MyTableRawData";
+
+        LogsIngestionClientBuilder clientBuilder = new LogsIngestionClientBuilder()
+            .retryPolicy(new RetryPolicy(new RetryStrategy() {
+                @Override
+                public int getMaxRetries() {
+                    return 0;
+                }
+
+                @Override
+                public Duration calculateRetryDelay(int i) {
+                    return null;
+                }
+            }));
+        if (getTestMode() == TestMode.PLAYBACK) {
+            clientBuilder
+                .credential(request -> Mono.just(new AccessToken("fakeToken", OffsetDateTime.now().plusDays(1))))
+                .httpClient(interceptorManager.getPlaybackClient());
+        } else if (getTestMode() == TestMode.RECORD) {
+            clientBuilder
+                .addPolicy(interceptorManager.getRecordPolicy())
+                .credential(getCredential());
+        } else if (getTestMode() == TestMode.LIVE) {
+            clientBuilder.credential(getCredential());
+        }
+        this.clientBuilder = clientBuilder
+            .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS))
+            .endpoint(dataCollectionEndpoint);
+    }
+
     @Test
     public void testUploadLogs() {
+        System.out.println(getTestMode());
         List<Object> logs = getObjects(10);
         LogsIngestionClient client = clientBuilder.buildClient();
         client.upload(dataCollectionRuleId, streamName, logs);
     }
 
     @Test
+    @Disabled
     public void testUploadLogsInBatches() {
         List<Object> logs = getObjects(10000);
 
@@ -47,6 +91,7 @@ public void testUploadLogsInBatches() {
     }
 
     @Test
+    @Disabled
     public void testUploadLogsInBatchesConcurrently() {
         List<Object> logs = getObjects(10000);
 
@@ -75,6 +120,7 @@ public void testUploadLogsPartialFailure() {
     }
 
     @Test
+    @Disabled
     public void testUploadLogsPartialFailureWithErrorHandler() {
         List<Object> logs = getObjects(100000);
         AtomicInteger count = new AtomicInteger();
@@ -92,6 +138,7 @@ public void testUploadLogsPartialFailureWithErrorHandler() {
     }
 
     @Test
+    @Disabled
     public void testUploadLogsStopOnFirstError() {
         List<Object> logs = getObjects(100000);
         AtomicInteger count = new AtomicInteger();
@@ -111,16 +158,17 @@ public void testUploadLogsStopOnFirstError() {
     }
 
     @Test
-//    @Disabled
+    @Disabled
     public void testUploadLogsProtocolMethod() {
         List<Object> logs = getObjects(10);
         LogsIngestionClient client = clientBuilder.buildClient();
         Response<Void> response = client.uploadWithResponse(dataCollectionRuleId, streamName,
-                BinaryData.fromObject(logs), new RequestOptions().setHeader("Content-Encoding", "gzip"));
+                BinaryData.fromObject(logs), new RequestOptions());
         assertEquals(204, response.getStatusCode());
     }
 
     @Test
+    @Disabled
     public void testUploadLargeLogsProtocolMethod() {
         List<Object> logs = getObjects(1000000);
         LogsIngestionClient client = clientBuilder.buildClient();

diff --git a/...re-monitor-ingestion/src/test/java/com/azure/monitor/ingestion/LogsIngestionTestBase.java b/...re-monitor-ingestion/src/test/java/com/azure/monitor/ingestion/LogsIngestionTestBase.java
@@ -15,12 +15,10 @@
 import com.azure.core.http.policy.HttpPipelinePolicy;
 import com.azure.core.http.policy.RetryPolicy;
 import com.azure.core.http.policy.RetryStrategy;
-import com.azure.core.test.TestBase;
 import com.azure.core.test.TestMode;
 import com.azure.core.test.TestProxyTestBase;
 import com.azure.core.util.Configuration;
 import com.azure.identity.ClientSecretCredentialBuilder;
-import org.junit.jupiter.api.BeforeEach;
 import reactor.core.publisher.Mono;
 
 import java.time.Duration;
@@ -39,41 +37,7 @@ public abstract class LogsIngestionTestBase extends TestProxyTestBase {
     protected String dataCollectionRuleId;
     protected String streamName;
 
-    @BeforeEach
-    public void setupTest() {
-        dataCollectionEndpoint = Configuration.getGlobalConfiguration().get("AZURE_MONITOR_DCE", "https://dce.monitor.azure.com");
-        dataCollectionRuleId = Configuration.getGlobalConfiguration().get("AZURE_MONITOR_DCR_ID", "dcr-a64851bc17714f0483d1e96b5d84953b");
-        streamName = "Custom-MyTableRawData";
-
-        LogsIngestionClientBuilder clientBuilder = new LogsIngestionClientBuilder()
-                .retryPolicy(new RetryPolicy(new RetryStrategy() {
-                    @Override
-                    public int getMaxRetries() {
-                        return 0;
-                    }
-
-                    @Override
-                    public Duration calculateRetryDelay(int i) {
-                        return null;
-                    }
-                }));
-        if (getTestMode() == TestMode.PLAYBACK) {
-            clientBuilder
-                    .credential(request -> Mono.just(new AccessToken("fakeToken", OffsetDateTime.now().plusDays(1))))
-                    .httpClient(interceptorManager.getPlaybackClient());
-        } else if (getTestMode() == TestMode.RECORD) {
-            clientBuilder
-                    .addPolicy(interceptorManager.getRecordPolicy())
-                    .credential(getCredential());
-        } else if (getTestMode() == TestMode.LIVE) {
-            clientBuilder.credential(getCredential());
-        }
-        this.clientBuilder = clientBuilder
-                .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS))
-                .endpoint(dataCollectionEndpoint);
-    }
-
-    private TokenCredential getCredential() {
+    protected TokenCredential getCredential() {
         return new ClientSecretCredentialBuilder()
                 .clientId(Configuration.getGlobalConfiguration().get(Configuration.PROPERTY_AZURE_CLIENT_ID))
                 .clientSecret(Configuration.getGlobalConfiguration().get(Configuration.PROPERTY_AZURE_CLIENT_SECRET))

diff --git a/.../resources/session-records/LogsIngestionAsyncClientTest.testUploadLogsPartialFailure.json b/.../resources/session-records/LogsIngestionAsyncClientTest.testUploadLogsPartialFailure.json
diff --git a/...on-records/LogsIngestionAsyncClientTest.testUploadLogsPartialFailureWithErrorHandler.json b/...on-records/LogsIngestionAsyncClientTest.testUploadLogsPartialFailureWithErrorHandler.json
diff --git a/...esources/session-records/LogsIngestionAsyncClientTest.testUploadLogsStopOnFirstError.json b/...esources/session-records/LogsIngestionAsyncClientTest.testUploadLogsStopOnFirstError.json
diff --git a/.../test/resources/session-records/LogsIngestionClientTest.testUploadLogsPartialFailure.json b/.../test/resources/session-records/LogsIngestionClientTest.testUploadLogsPartialFailure.json
diff --git a/...session-records/LogsIngestionClientTest.testUploadLogsPartialFailureWithErrorHandler.json b/...session-records/LogsIngestionClientTest.testUploadLogsPartialFailureWithErrorHandler.json
diff --git a/...est/resources/session-records/LogsIngestionClientTest.testUploadLogsStopOnFirstError.json b/...est/resources/session-records/LogsIngestionClientTest.testUploadLogsStopOnFirstError.json