Fix max server timeout for batch queries (Azure#29347)

* Fix max server timeout for batch queries

* update changelog

Author: srnagar

sdk/monitor/azure-monitor-query/CHANGELOG.md

@@ -1,10 +1,11 @@
 # Release History
 
-## 1.0.7 (2022-06-07)
+## 1.0.7 (2022-06-09)
 
 ### Bugs Fixed
 
 - Fixed bug where partial queries fail when `LogsQueryOptions.setAllowPartialErrors(true)`.
+- [Fixed bug that causes `NullPointerException` when batch queries have server timeout configured.](https://github.com/Azure/azure-sdk-for-java/issues/29339) 
 
 ### Other Changes
 

sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/models/LogsBatchQuery.java

@@ -72,7 +72,8 @@ public String addWorkspaceQuery(String workspaceId, String query, QueryTimeInter
 
         String preferHeader = buildPreferHeaderString(logsQueryOptions);
         if (logsQueryOptions != null && logsQueryOptions.getServerTimeout() != null) {
-            if (logsQueryOptions.getServerTimeout().compareTo(this.maxServerTimeout) > 0) {
+            // Set the server timeout to max server timeout among all the queries in the batch
+            if (maxServerTimeout == null || logsQueryOptions.getServerTimeout().compareTo(maxServerTimeout) > 0) {
                 maxServerTimeout = logsQueryOptions.getServerTimeout();
             }
         }

sdk/monitor/azure-monitor-query/src/test/java/com/azure/monitor/query/LogsQueryClientTest.java

@@ -154,6 +154,35 @@ public void testLogsQueryBatch() {
         assertEquals(3, responses.get(1).getAllTables().get(0).getRows().size());
     }
 
+    @Test
+    public void testLogsQueryBatchWithServerTimeout() {
+        LogsBatchQuery logsBatchQuery = new LogsBatchQuery();
+        logsBatchQuery.addWorkspaceQuery(WORKSPACE_ID, QUERY_STRING + " | take 2", null);
+        logsBatchQuery.addWorkspaceQuery(WORKSPACE_ID, QUERY_STRING + " | take 5", null,
+                new LogsQueryOptions().setServerTimeout(Duration.ofSeconds(20)));
+        logsBatchQuery.addWorkspaceQuery(WORKSPACE_ID, QUERY_STRING + "| take 3", null,
+                new LogsQueryOptions().setServerTimeout(Duration.ofSeconds(10)));
+
+        LogsBatchQueryResultCollection batchResultCollection = client
+                .queryBatchWithResponse(logsBatchQuery, Context.NONE).getValue();
+
+        List<LogsBatchQueryResult> responses = batchResultCollection.getBatchResults();
+
+        assertEquals(3, responses.size());
+
+        assertEquals(1, responses.get(0).getAllTables().size());
+        assertEquals(24, responses.get(0).getAllTables().get(0).getAllTableCells().size());
+        assertEquals(2, responses.get(0).getAllTables().get(0).getRows().size());
+
+        assertEquals(1, responses.get(1).getAllTables().size());
+        assertEquals(60, responses.get(1).getAllTables().get(0).getAllTableCells().size());
+        assertEquals(5, responses.get(1).getAllTables().get(0).getRows().size());
+
+        assertEquals(1, responses.get(2).getAllTables().size());
+        assertEquals(36, responses.get(2).getAllTables().get(0).getAllTableCells().size());
+        assertEquals(3, responses.get(2).getAllTables().get(0).getRows().size());
+    }
+
     @Test
     @DisabledIfEnvironmentVariable(named = "AZURE_TEST_MODE", matches = "LIVE", disabledReason = "multi-workspace "
             + "queries require sending logs to Azure Monitor first. So, run this test in playback or record mode only.")

sdk/monitor/azure-monitor-query/src/test/resources/session-records/LogsQueryClientTest.testLogsQueryBatchWithServerTimeout.json

@@ -0,0 +1,27 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "POST",
+    "Uri" : "https://REDACTED.loganalytics.io/v1/$batch",
+    "Headers" : {
+      "User-Agent" : "azsdk-java-azure-monitor-query/1.0.7 (17.0.2; Windows 10; 10.0)",
+      "Content-Type" : "application/json"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "Access-Control-Allow-Origin" : "*",
+      "X-Content-Type-Options" : "nosniff",
+      "Connection" : "keep-alive",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Date" : "Thu, 09 Jun 2022 19:19:48 GMT",
+      "via" : "1.1 draft-oms-6d895847bd-fk545",
+      "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
+      "Access-Control-Expose-Headers" : "Retry-After,Age,WWW-Authenticate,x-resource-identities,x-ms-status-location",
+      "Vary" : "Accept-Encoding,Accept-Encoding",
+      "Body" : "{\"responses\":[{\"id\":\"2\",\"status\":200,\"headers\":{\"Preference-Applied\":\"wait=20\",\"request-context\":\"appId=cid-v1:70941e4f-7e8f-40b7-b730-183893db0297\"},\"body\":{\"tables\":[{\"name\":\"PrimaryResult\",\"columns\":[{\"name\":\"x\",\"type\":\"long\"},{\"name\":\"y\",\"type\":\"long\"},{\"name\":\"DateTime\",\"type\":\"datetime\"},{\"name\":\"Bool\",\"type\":\"bool\"},{\"name\":\"Guid\",\"type\":\"guid\"},{\"name\":\"Int\",\"type\":\"int\"},{\"name\":\"Long\",\"type\":\"long\"},{\"name\":\"Double\",\"type\":\"real\"},{\"name\":\"String\",\"type\":\"string\"},{\"name\":\"Timespan\",\"type\":\"timespan\"},{\"name\":\"Decimal\",\"type\":\"decimal\"},{\"name\":\"Dynamic\",\"type\":\"dynamic\"}],\"rows\":[[100,1,\"2015-12-31T23:59:59.9Z\",false,\"74be27de-1e4e-49d9-b579-fe0b331d3642\",12345,1,12345.6789,\"string value\",\"00:00:10\",\"0.10101\",\"{\\\"a\\\":123,\\\"b\\\":\\\"hello\\\",\\\"c\\\":[1,2,3],\\\"d\\\":{}}\"],[99,1,\"2015-12-31T23:59:59.9Z\",false,\"74be27de-1e4e-49d9-b579-fe0b331d3642\",12345,1,12345.6789,\"string value\",\"00:00:10\",\"0.10101\",\"{\\\"a\\\":123,\\\"b\\\":\\\"hello\\\",\\\"c\\\":[1,2,3],\\\"d\\\":{}}\"],[98,1,\"2015-12-31T23:59:59.9Z\",false,\"74be27de-1e4e-49d9-b579-fe0b331d3642\",12345,1,12345.6789,\"string value\",\"00:00:10\",\"0.10101\",\"{\\\"a\\\":123,\\\"b\\\":\\\"hello\\\",\\\"c\\\":[1,2,3],\\\"d\\\":{}}\"],[97,1,\"2015-12-31T23:59:59.9Z\",false,\"74be27de-1e4e-49d9-b579-fe0b331d3642\",12345,1,12345.6789,\"string value\",\"00:00:10\",\"0.10101\",\"{\\\"a\\\":123,\\\"b\\\":\\\"hello\\\",\\\"c\\\":[1,2,3],\\\"d\\\":{}}\"],[96,1,\"2015-12-31T23:59:59.9Z\",false,\"74be27de-1e4e-49d9-b579-fe0b331d3642\",12345,1,12345.6789,\"string value\",\"00:00:10\",\"0.10101\",\"{\\\"a\\\":123,\\\"b\\\":\\\"hello\\\",\\\"c\\\":[1,2,3],\\\"d\\\":{}}\"]]}]}},{\"id\":\"3\",\"status\":200,\"headers\":{\"Preference-Applied\":\"wait=10\",\"request-context\":\"appId=cid-v1:70941e4f-7e8f-40b7-b730-183893db0297\"},\"body\":{\"tables\":[{\"name\":\"PrimaryResult\",\"columns\":[{\"name\":\"x\",\"type\":\"long\"},{\"name\":\"y\",\"type\":\"long\"},{\"name\":\"DateTime\",\"type\":\"datetime\"},{\"name\":\"Bool\",\"type\":\"bool\"},{\"name\":\"Guid\",\"type\":\"guid\"},{\"name\":\"Int\",\"type\":\"int\"},{\"name\":\"Long\",\"type\":\"long\"},{\"name\":\"Double\",\"type\":\"real\"},{\"name\":\"String\",\"type\":\"string\"},{\"name\":\"Timespan\",\"type\":\"timespan\"},{\"name\":\"Decimal\",\"type\":\"decimal\"},{\"name\":\"Dynamic\",\"type\":\"dynamic\"}],\"rows\":[[100,1,\"2015-12-31T23:59:59.9Z\",false,\"74be27de-1e4e-49d9-b579-fe0b331d3642\",12345,1,12345.6789,\"string value\",\"00:00:10\",\"0.10101\",\"{\\\"a\\\":123,\\\"b\\\":\\\"hello\\\",\\\"c\\\":[1,2,3],\\\"d\\\":{}}\"],[99,1,\"2015-12-31T23:59:59.9Z\",false,\"74be27de-1e4e-49d9-b579-fe0b331d3642\",12345,1,12345.6789,\"string value\",\"00:00:10\",\"0.10101\",\"{\\\"a\\\":123,\\\"b\\\":\\\"hello\\\",\\\"c\\\":[1,2,3],\\\"d\\\":{}}\"],[98,1,\"2015-12-31T23:59:59.9Z\",false,\"74be27de-1e4e-49d9-b579-fe0b331d3642\",12345,1,12345.6789,\"string value\",\"00:00:10\",\"0.10101\",\"{\\\"a\\\":123,\\\"b\\\":\\\"hello\\\",\\\"c\\\":[1,2,3],\\\"d\\\":{}}\"]]}]}},{\"id\":\"1\",\"status\":200,\"body\":{\"tables\":[{\"name\":\"PrimaryResult\",\"columns\":[{\"name\":\"x\",\"type\":\"long\"},{\"name\":\"y\",\"type\":\"long\"},{\"name\":\"DateTime\",\"type\":\"datetime\"},{\"name\":\"Bool\",\"type\":\"bool\"},{\"name\":\"Guid\",\"type\":\"guid\"},{\"name\":\"Int\",\"type\":\"int\"},{\"name\":\"Long\",\"type\":\"long\"},{\"name\":\"Double\",\"type\":\"real\"},{\"name\":\"String\",\"type\":\"string\"},{\"name\":\"Timespan\",\"type\":\"timespan\"},{\"name\":\"Decimal\",\"type\":\"decimal\"},{\"name\":\"Dynamic\",\"type\":\"dynamic\"}],\"rows\":[[100,1,\"2015-12-31T23:59:59.9Z\",false,\"74be27de-1e4e-49d9-b579-fe0b331d3642\",12345,1,12345.6789,\"string value\",\"00:00:10\",\"0.10101\",\"{\\\"a\\\":123,\\\"b\\\":\\\"hello\\\",\\\"c\\\":[1,2,3],\\\"d\\\":{}}\"],[99,1,\"2015-12-31T23:59:59.9Z\",false,\"74be27de-1e4e-49d9-b579-fe0b331d3642\",12345,1,12345.6789,\"string value\",\"00:00:10\",\"0.10101\",\"{\\\"a\\\":123,\\\"b\\\":\\\"hello\\\",\\\"c\\\":[1,2,3],\\\"d\\\":{}}\"]]}]}}]}",
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ ]
+}