Skip to content

Commit 7adf7f6

Browse files
authored
Azure Monitor Logs Query: Rename QueryTimeInterval to LogsQueryTimeInterval (#46099)
* Azure Monitor Logs Query: Rename QueryTimeInterval to LogsQueryTimeInterval * fix javadocs
1 parent 189d6a6 commit 7adf7f6

File tree

16 files changed

+165
-163
lines changed

16 files changed

+165
-163
lines changed

sdk/monitor/azure-monitor-query-logs/README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ LogsQueryClient logsQueryClient = new LogsQueryClientBuilder()
153153
.buildClient();
154154

155155
LogsQueryResult queryResults = logsQueryClient.queryWorkspace("{workspace-id}", "{kusto-query}",
156-
new QueryTimeInterval(Duration.ofDays(2)));
156+
new LogsQueryTimeInterval(Duration.ofDays(2)));
157157

158158
for (LogsTableRow row : queryResults.getTable().getRows()) {
159159
System.out.println(row.getColumnValue("OperationName") + " " + row.getColumnValue("ResourceGroup"));
@@ -183,7 +183,7 @@ LogsQueryClient logsQueryClient = new LogsQueryClientBuilder()
183183
.buildClient();
184184

185185
List<CustomLogModel> customLogModels = logsQueryClient.queryWorkspace("{workspace-id}", "{kusto-query}",
186-
new QueryTimeInterval(Duration.ofDays(2)), CustomLogModel.class);
186+
new LogsQueryTimeInterval(Duration.ofDays(2)), CustomLogModel.class);
187187

188188
for (CustomLogModel customLogModel : customLogModels) {
189189
System.out.println(customLogModel.getOperationName() + " " + customLogModel.getResourceGroup());
@@ -222,7 +222,7 @@ LogsQueryClient logsQueryClient = new LogsQueryClientBuilder()
222222
.buildClient();
223223
224224
LogsQueryResult queryResults = logsQueryClient.queryResource("{resource-id}", "{kusto-query}",
225-
new QueryTimeInterval(Duration.ofDays(2)));
225+
new LogsQueryTimeInterval(Duration.ofDays(2)));
226226
227227
for (LogsTableRow row : queryResults.getTable().getRows()) {
228228
System.out.println(row.getColumnValue("OperationName") + " " + row.getColumnValue("ResourceGroup"));
@@ -237,9 +237,9 @@ LogsQueryClient logsQueryClient = new LogsQueryClientBuilder()
237237
.buildClient();
238238
239239
LogsBatchQuery logsBatchQuery = new LogsBatchQuery();
240-
String query1 = logsBatchQuery.addWorkspaceQuery("{workspace-id}", "{query-1}", new QueryTimeInterval(Duration.ofDays(2)));
241-
String query2 = logsBatchQuery.addWorkspaceQuery("{workspace-id}", "{query-2}", new QueryTimeInterval(Duration.ofDays(30)));
242-
String query3 = logsBatchQuery.addWorkspaceQuery("{workspace-id}", "{query-3}", new QueryTimeInterval(Duration.ofDays(10)));
240+
String query1 = logsBatchQuery.addWorkspaceQuery("{workspace-id}", "{query-1}", new LogsQueryTimeInterval(Duration.ofDays(2)));
241+
String query2 = logsBatchQuery.addWorkspaceQuery("{workspace-id}", "{query-2}", new LogsQueryTimeInterval(Duration.ofDays(30)));
242+
String query3 = logsBatchQuery.addWorkspaceQuery("{workspace-id}", "{query-3}", new LogsQueryTimeInterval(Duration.ofDays(10)));
243243
244244
LogsBatchQueryResultCollection batchResults = logsQueryClient
245245
.queryBatchWithResponse(logsBatchQuery, Context.NONE).getValue();
@@ -274,7 +274,7 @@ LogsQueryOptions options = new LogsQueryOptions()
274274
.setServerTimeout(Duration.ofMinutes(10));
275275
276276
Response<LogsQueryResult> response = logsQueryClient.queryWorkspaceWithResponse("{workspace-id}",
277-
"{kusto-query}", new QueryTimeInterval(Duration.ofDays(2)), options, Context.NONE);
277+
"{kusto-query}", new LogsQueryTimeInterval(Duration.ofDays(2)), options, Context.NONE);
278278
```
279279
280280
#### Query multiple workspaces
@@ -292,7 +292,7 @@ LogsQueryClient logsQueryClient = new LogsQueryClientBuilder()
292292
.buildClient();
293293
294294
Response<LogsQueryResult> response = logsQueryClient.queryWorkspaceWithResponse("{workspace-id}", "{kusto-query}",
295-
new QueryTimeInterval(Duration.ofDays(2)), new LogsQueryOptions()
295+
new LogsQueryTimeInterval(Duration.ofDays(2)), new LogsQueryOptions()
296296
.setAdditionalWorkspaces(Arrays.asList("{additional-workspace-identifiers}")),
297297
Context.NONE);
298298
LogsQueryResult result = response.getValue();
@@ -314,7 +314,7 @@ LogsQueryClient client = new LogsQueryClientBuilder()
314314
LogsQueryOptions options = new LogsQueryOptions()
315315
.setIncludeStatistics(true);
316316
Response<LogsQueryResult> response = client.queryWorkspaceWithResponse("{workspace-id}",
317-
"AzureActivity | top 10 by TimeGenerated", QueryTimeInterval.LAST_1_HOUR, options, Context.NONE);
317+
"AzureActivity | top 10 by TimeGenerated", LogsQueryTimeInterval.LAST_1_HOUR, options, Context.NONE);
318318
LogsQueryResult result = response.getValue();
319319
BinaryData statistics = result.getStatistics();
320320
@@ -359,7 +359,7 @@ String visualizationQuery = "StormEvents"
359359
LogsQueryOptions options = new LogsQueryOptions()
360360
.setIncludeVisualization(true);
361361
Response<LogsQueryResult> response = client.queryWorkspaceWithResponse("{workspace-id}", visualizationQuery,
362-
QueryTimeInterval.LAST_7_DAYS, options, Context.NONE);
362+
LogsQueryTimeInterval.LAST_7_DAYS, options, Context.NONE);
363363
LogsQueryResult result = response.getValue();
364364
BinaryData visualization = result.getVisualization();
365365

sdk/monitor/azure-monitor-query-logs/TROUBLESHOOTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ LogsQueryClient client = new LogsQueryClientBuilder()
163163
.credential(credential)
164164
.buildClient();
165165

166-
client.queryWorkspaceWithResponse("{workspaceId}", "{kusto-query-string}", QueryTimeInterval.LAST_DAY,
166+
client.queryWorkspaceWithResponse("{workspaceId}", "{kusto-query-string}", LogsQueryTimeInterval.LAST_DAY,
167167
new LogsQueryOptions().setServerTimeout(Duration.ofMinutes(10)), Context.NONE);
168168
```
169169

@@ -188,6 +188,6 @@ behavior off and consume the partially successful response, you can set the `all
188188
in `LogsQueryOptions` as shown below:
189189

190190
```java readme-sample-allowpartialerrors
191-
client.queryWorkspaceWithResponse("{workspaceId}", "{kusto-query-string}", QueryTimeInterval.LAST_DAY,
191+
client.queryWorkspaceWithResponse("{workspaceId}", "{kusto-query-string}", LogsQueryTimeInterval.LAST_DAY,
192192
new LogsQueryOptions().setAllowPartialErrors(true), Context.NONE);
193193
```

sdk/monitor/azure-monitor-query-logs/src/main/java/com/azure/monitor/query/logs/LogsQueryAsyncClient.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.azure.monitor.query.logs.models.LogsQueryOptions;
2626
import com.azure.monitor.query.logs.models.LogsQueryResult;
2727
import com.azure.monitor.query.logs.models.LogsQueryResultStatus;
28-
import com.azure.monitor.query.logs.models.QueryTimeInterval;
28+
import com.azure.monitor.query.logs.models.LogsQueryTimeInterval;
2929
import reactor.core.publisher.Mono;
3030
import reactor.core.publisher.SynchronousSink;
3131

@@ -67,10 +67,10 @@
6767
*
6868
* <ul>
6969
* <li>
70-
* {@link LogsQueryAsyncClient#queryWorkspace(String, String, QueryTimeInterval) queryWorkspace(String, String, QueryTimeInterval)} - Query logs from a workspace.
70+
* {@link LogsQueryAsyncClient#queryWorkspace(String, String, LogsQueryTimeInterval) queryWorkspace(String, String, LogsQueryTimeInterval)} - Query logs from a workspace.
7171
* </li>
7272
* <li>
73-
* {@link LogsQueryAsyncClient#queryWorkspaceWithResponse(String, String, QueryTimeInterval, LogsQueryOptions) queryWorkspaceWithResponse(String, String, QueryTimeInterval, LogsQueryOptions)} - Query logs from a workspace using query options with service response returned.
73+
* {@link LogsQueryAsyncClient#queryWorkspaceWithResponse(String, String, LogsQueryTimeInterval, LogsQueryOptions) queryWorkspaceWithResponse(String, String, LogsQueryTimeInterval, LogsQueryOptions)} - Query logs from a workspace using query options with service response returned.
7474
* </li>
7575
* <li>
7676
* {@link LogsQueryAsyncClient#queryBatch(LogsBatchQuery) queryBatch(LogsBatchQuery)} - Execute a batch of logs queries.
@@ -79,10 +79,10 @@
7979
* {@link LogsQueryAsyncClient#queryBatchWithResponse(LogsBatchQuery) queryBatchWithResponse(LogsBatchQuery)} - Execute a batch of logs queries with service response returned.
8080
* </li>
8181
* <li>
82-
* {@link LogsQueryAsyncClient#queryResource(String, String, QueryTimeInterval) queryResource(String, String, QueryTimeInterval)} - Query logs for an Azure resource.
82+
* {@link LogsQueryAsyncClient#queryResource(String, String, LogsQueryTimeInterval) queryResource(String, String, LogsQueryTimeInterval)} - Query logs for an Azure resource.
8383
* </li>
8484
* <li>
85-
* {@link LogsQueryAsyncClient#queryResourceWithResponse(String, String, QueryTimeInterval, LogsQueryOptions) queryResourceWithResponse(String, String, QueryTimeInterval, LogsQueryOptions)} - Query logs for an Azure resource using query options with service response returned.
85+
* {@link LogsQueryAsyncClient#queryResourceWithResponse(String, String, LogsQueryTimeInterval, LogsQueryOptions) queryResourceWithResponse(String, String, LogsQueryTimeInterval, LogsQueryOptions)} - Query logs for an Azure resource using query options with service response returned.
8686
* </li>
8787
* </ul>
8888
*
@@ -109,7 +109,7 @@ public final class LogsQueryAsyncClient {
109109
* <!-- src_embed com.azure.monitor.query.LogsQueryAsyncClient.query#String-String-QueryTimeInterval -->
110110
* <pre>
111111
* Mono&lt;LogsQueryResult&gt; queryResult = logsQueryAsyncClient.queryWorkspace&#40;&quot;&#123;workspace-id&#125;&quot;, &quot;&#123;kusto-query&#125;&quot;,
112-
* QueryTimeInterval.LAST_DAY&#41;;
112+
* LogsQueryTimeInterval.LAST_DAY&#41;;
113113
* queryResult.subscribe&#40;result -&gt; &#123;
114114
* for &#40;LogsTableRow row : result.getTable&#40;&#41;.getRows&#40;&#41;&#41; &#123;
115115
* System.out.println&#40;row.getRow&#40;&#41;
@@ -127,7 +127,7 @@ public final class LogsQueryAsyncClient {
127127
* @return The logs matching the query.
128128
*/
129129
@ServiceMethod(returns = ReturnType.SINGLE)
130-
public Mono<LogsQueryResult> queryWorkspace(String workspaceId, String query, QueryTimeInterval timeInterval) {
130+
public Mono<LogsQueryResult> queryWorkspace(String workspaceId, String query, LogsQueryTimeInterval timeInterval) {
131131
return queryWorkspaceWithResponse(workspaceId, query, timeInterval, new LogsQueryOptions())
132132
.map(Response::getValue);
133133
}
@@ -143,7 +143,7 @@ public Mono<LogsQueryResult> queryWorkspace(String workspaceId, String query, Qu
143143
* @return The logs matching the query as a list of objects of type T.
144144
*/
145145
@ServiceMethod(returns = ReturnType.SINGLE)
146-
public <T> Mono<List<T>> queryWorkspace(String workspaceId, String query, QueryTimeInterval timeInterval,
146+
public <T> Mono<List<T>> queryWorkspace(String workspaceId, String query, LogsQueryTimeInterval timeInterval,
147147
Class<T> type) {
148148
return queryWorkspace(workspaceId, query, timeInterval)
149149
.map(result -> LogsQueryHelper.toObject(result.getTable(), type));
@@ -162,7 +162,7 @@ public <T> Mono<List<T>> queryWorkspace(String workspaceId, String query, QueryT
162162
* @return The logs matching the query as a list of objects of type T.
163163
*/
164164
@ServiceMethod(returns = ReturnType.SINGLE)
165-
public <T> Mono<List<T>> queryWorkspace(String workspaceId, String query, QueryTimeInterval timeInterval,
165+
public <T> Mono<List<T>> queryWorkspace(String workspaceId, String query, LogsQueryTimeInterval timeInterval,
166166
Class<T> type, LogsQueryOptions options) {
167167
return queryWorkspaceWithResponse(workspaceId, query, timeInterval, options, Context.NONE)
168168
.map(response -> LogsQueryHelper.toObject(response.getValue().getTable(), type));
@@ -177,7 +177,7 @@ public <T> Mono<List<T>> queryWorkspace(String workspaceId, String query, QueryT
177177
* <pre>
178178
* Mono&lt;Response&lt;LogsQueryResult&gt;&gt; queryResult = logsQueryAsyncClient.queryWorkspaceWithResponse&#40;&quot;&#123;workspace-id&#125;&quot;,
179179
* &quot;&#123;kusto-query&#125;&quot;,
180-
* QueryTimeInterval.LAST_7_DAYS,
180+
* LogsQueryTimeInterval.LAST_7_DAYS,
181181
* new LogsQueryOptions&#40;&#41;.setServerTimeout&#40;Duration.ofMinutes&#40;2&#41;&#41;&#41;;
182182
*
183183
* queryResult.subscribe&#40;result -&gt; &#123;
@@ -200,7 +200,7 @@ public <T> Mono<List<T>> queryWorkspace(String workspaceId, String query, QueryT
200200
*/
201201
@ServiceMethod(returns = ReturnType.SINGLE)
202202
public Mono<Response<LogsQueryResult>> queryWorkspaceWithResponse(String workspaceId, String query,
203-
QueryTimeInterval timeInterval, LogsQueryOptions options) {
203+
LogsQueryTimeInterval timeInterval, LogsQueryOptions options) {
204204
return withContext(context -> queryWorkspaceWithResponse(workspaceId, query, timeInterval, options, context));
205205
}
206206

@@ -218,7 +218,7 @@ public Mono<Response<LogsQueryResult>> queryWorkspaceWithResponse(String workspa
218218
*/
219219
@ServiceMethod(returns = ReturnType.SINGLE)
220220
public <T> Mono<Response<List<T>>> queryWorkspaceWithResponse(String workspaceId, String query,
221-
QueryTimeInterval timeInterval, Class<T> type, LogsQueryOptions options) {
221+
LogsQueryTimeInterval timeInterval, Class<T> type, LogsQueryOptions options) {
222222
return queryWorkspaceWithResponse(workspaceId, query, timeInterval, options)
223223
.map(response -> new SimpleResponse<>(response.getRequest(), response.getStatusCode(),
224224
response.getHeaders(), LogsQueryHelper.toObject(response.getValue().getTable(), type)));
@@ -232,9 +232,9 @@ public <T> Mono<Response<List<T>>> queryWorkspaceWithResponse(String workspaceId
232232
* <!-- src_embed com.azure.monitor.query.LogsQueryAsyncClient.queryBatch#LogsBatchQuery -->
233233
* <pre>
234234
* LogsBatchQuery batchQuery = new LogsBatchQuery&#40;&#41;;
235-
* String queryId1 = batchQuery.addWorkspaceQuery&#40;&quot;&#123;workspace-id-1&#125;&quot;, &quot;&#123;kusto-query-1&#125;&quot;, QueryTimeInterval.LAST_DAY&#41;;
235+
* String queryId1 = batchQuery.addWorkspaceQuery&#40;&quot;&#123;workspace-id-1&#125;&quot;, &quot;&#123;kusto-query-1&#125;&quot;, LogsQueryTimeInterval.LAST_DAY&#41;;
236236
* String queryId2 = batchQuery.addWorkspaceQuery&#40;&quot;&#123;workspace-id-2&#125;&quot;, &quot;&#123;kusto-query-2&#125;&quot;,
237-
* QueryTimeInterval.LAST_7_DAYS, new LogsQueryOptions&#40;&#41;.setServerTimeout&#40;Duration.ofMinutes&#40;2&#41;&#41;&#41;;
237+
* LogsQueryTimeInterval.LAST_7_DAYS, new LogsQueryOptions&#40;&#41;.setServerTimeout&#40;Duration.ofMinutes&#40;2&#41;&#41;&#41;;
238238
*
239239
* Mono&lt;LogsBatchQueryResultCollection&gt; batchQueryResponse = logsQueryAsyncClient.queryBatch&#40;batchQuery&#41;;
240240
*
@@ -277,7 +277,7 @@ public Mono<Response<LogsBatchQueryResultCollection>> queryBatchWithResponse(Log
277277
* <!-- src_embed com.azure.monitor.query.LogsQueryAsyncClient.queryResource#String-String-QueryTimeInterval -->
278278
* <pre>
279279
* Mono&lt;LogsQueryResult&gt; queryResult = logsQueryAsyncClient.queryResource&#40;&quot;&#123;resource-id&#125;&quot;, &quot;&#123;kusto-query&#125;&quot;,
280-
* QueryTimeInterval.LAST_DAY&#41;;
280+
* LogsQueryTimeInterval.LAST_DAY&#41;;
281281
* queryResult.subscribe&#40;result -&gt; &#123;
282282
* for &#40;LogsTableRow row : result.getTable&#40;&#41;.getRows&#40;&#41;&#41; &#123;
283283
* System.out.println&#40;row.getRow&#40;&#41;
@@ -295,7 +295,7 @@ public Mono<Response<LogsBatchQueryResultCollection>> queryBatchWithResponse(Log
295295
* @return The logs matching the query.
296296
*/
297297
@ServiceMethod(returns = ReturnType.SINGLE)
298-
public Mono<LogsQueryResult> queryResource(String resourceId, String query, QueryTimeInterval timeInterval) {
298+
public Mono<LogsQueryResult> queryResource(String resourceId, String query, LogsQueryTimeInterval timeInterval) {
299299
return queryResourceWithResponse(resourceId, query, timeInterval, new LogsQueryOptions())
300300
.map(Response::getValue);
301301
}
@@ -311,7 +311,7 @@ public Mono<LogsQueryResult> queryResource(String resourceId, String query, Quer
311311
* @return The logs matching the query as a list of objects of type T.
312312
*/
313313
@ServiceMethod(returns = ReturnType.SINGLE)
314-
public <T> Mono<List<T>> queryResource(String resourceId, String query, QueryTimeInterval timeInterval,
314+
public <T> Mono<List<T>> queryResource(String resourceId, String query, LogsQueryTimeInterval timeInterval,
315315
Class<T> type) {
316316
return queryResource(resourceId, query, timeInterval)
317317
.map(result -> LogsQueryHelper.toObject(result.getTable(), type));
@@ -330,7 +330,7 @@ public <T> Mono<List<T>> queryResource(String resourceId, String query, QueryTim
330330
* @return The logs matching the query as a list of objects of type T.
331331
*/
332332
@ServiceMethod(returns = ReturnType.SINGLE)
333-
public <T> Mono<List<T>> queryResource(String resourceId, String query, QueryTimeInterval timeInterval,
333+
public <T> Mono<List<T>> queryResource(String resourceId, String query, LogsQueryTimeInterval timeInterval,
334334
Class<T> type, LogsQueryOptions options) {
335335
return queryResourceWithResponse(resourceId, query, timeInterval, options, Context.NONE)
336336
.map(response -> LogsQueryHelper.toObject(response.getValue().getTable(), type));
@@ -345,7 +345,7 @@ public <T> Mono<List<T>> queryResource(String resourceId, String query, QueryTim
345345
* <pre>
346346
* Mono&lt;Response&lt;LogsQueryResult&gt;&gt; queryResult = logsQueryAsyncClient.queryResourceWithResponse&#40;&quot;&#123;resource-id&#125;&quot;,
347347
* &quot;&#123;kusto-query&#125;&quot;,
348-
* QueryTimeInterval.LAST_7_DAYS,
348+
* LogsQueryTimeInterval.LAST_7_DAYS,
349349
* new LogsQueryOptions&#40;&#41;.setServerTimeout&#40;Duration.ofMinutes&#40;2&#41;&#41;&#41;;
350350
*
351351
* queryResult.subscribe&#40;result -&gt; &#123;
@@ -368,7 +368,7 @@ public <T> Mono<List<T>> queryResource(String resourceId, String query, QueryTim
368368
*/
369369
@ServiceMethod(returns = ReturnType.SINGLE)
370370
public Mono<Response<LogsQueryResult>> queryResourceWithResponse(String resourceId, String query,
371-
QueryTimeInterval timeInterval, LogsQueryOptions options) {
371+
LogsQueryTimeInterval timeInterval, LogsQueryOptions options) {
372372
return withContext(context -> queryResourceWithResponse(resourceId, query, timeInterval, options, context));
373373
}
374374

@@ -386,7 +386,7 @@ public Mono<Response<LogsQueryResult>> queryResourceWithResponse(String resource
386386
*/
387387
@ServiceMethod(returns = ReturnType.SINGLE)
388388
public <T> Mono<Response<List<T>>> queryResourceWithResponse(String resourceId, String query,
389-
QueryTimeInterval timeInterval, Class<T> type, LogsQueryOptions options) {
389+
LogsQueryTimeInterval timeInterval, Class<T> type, LogsQueryOptions options) {
390390
return queryResourceWithResponse(resourceId, query, timeInterval, options)
391391
.map(response -> new SimpleResponse<>(response.getRequest(), response.getStatusCode(),
392392
response.getHeaders(), LogsQueryHelper.toObject(response.getValue().getTable(), type)));
@@ -417,7 +417,7 @@ private Context updateContext(Duration serverTimeout, Context context) {
417417
}
418418

419419
Mono<Response<LogsQueryResult>> queryWorkspaceWithResponse(String workspaceId, String query,
420-
QueryTimeInterval timeInterval, LogsQueryOptions options, Context context) {
420+
LogsQueryTimeInterval timeInterval, LogsQueryOptions options, Context context) {
421421
String preferHeader = LogsQueryHelper.buildPreferHeaderString(options);
422422
context = updateContext(options.getServerTimeout(), context);
423423

@@ -448,7 +448,7 @@ Mono<Response<LogsQueryResult>> queryWorkspaceWithResponse(String workspaceId, S
448448
}
449449

450450
Mono<Response<LogsQueryResult>> queryResourceWithResponse(String resourceId, String query,
451-
QueryTimeInterval timeInterval, LogsQueryOptions options, Context context) {
451+
LogsQueryTimeInterval timeInterval, LogsQueryOptions options, Context context) {
452452
if (resourceId != null && resourceId.startsWith("/")) {
453453
resourceId = resourceId.substring(1);
454454
}

0 commit comments

Comments
 (0)