diff --git a/sdk/monitor/azure-monitor-query/README.md b/sdk/monitor/azure-monitor-query/README.md index 073d88886954..1be65b35114c 100644 --- a/sdk/monitor/azure-monitor-query/README.md +++ b/sdk/monitor/azure-monitor-query/README.md @@ -539,12 +539,12 @@ MetricsClient metricsBatchQueryClient = new MetricsClientBuilder() .endpoint("{endpoint}") .buildClient(); -MetricsBatchQueryResult metricsBatchQueryResult = metricsBatchQueryClient.queryBatch( +MetricsQueryResourcesResult metricsQueryResourcesResult = metricsBatchQueryClient.queryResources( Arrays.asList("{resourceId1}", "{resourceId2}"), Arrays.asList("{metric1}", "{metric2}"), "{metricNamespace}"); -for (MetricsQueryResult metricsQueryResult : metricsBatchQueryResult.getMetricsQueryResults()) { +for (MetricsQueryResult metricsQueryResult : metricsQueryResourcesResult.getMetricsQueryResults()) { // Each MetricsQueryResult corresponds to one of the resourceIds in the batch request. List metrics = metricsQueryResult.getMetrics(); metrics.forEach(metric -> { diff --git a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsAsyncClient.java b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsAsyncClient.java index af58fac92aa9..742f7a872199 100644 --- a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsAsyncClient.java +++ b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsAsyncClient.java @@ -15,8 +15,8 @@ import com.azure.monitor.query.implementation.metricsbatch.models.MetricResultsResponseValuesItem; import com.azure.monitor.query.implementation.metricsbatch.models.ResourceIdList; import com.azure.monitor.query.models.AggregationType; -import com.azure.monitor.query.models.MetricsBatchQueryResult; -import com.azure.monitor.query.models.MetricsBatchQueryOptions; +import com.azure.monitor.query.models.MetricsQueryResourcesOptions; +import com.azure.monitor.query.models.MetricsQueryResourcesResult; import com.azure.monitor.query.models.MetricsQueryResult; import reactor.core.publisher.Mono; @@ -46,34 +46,34 @@ public final class MetricsAsyncClient { /** * Returns all the Azure Monitor metrics requested for the batch of resources. * - * @param resourceUris The resource URIs for which the metrics is requested. + * @param resourceIds The resource ids for which the metrics is requested. * @param metricsNames The names of the metrics to query. * @param metricsNamespace The namespace of the metrics to query. * @return A time-series metrics result for the requested metric names. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono queryBatch(List resourceUris, List metricsNames, String metricsNamespace) { - return this.queryBatchWithResponse(resourceUris, metricsNames, metricsNamespace, new MetricsBatchQueryOptions()) + public Mono queryResources(List resourceIds, List metricsNames, String metricsNamespace) { + return this.queryResourcesWithResponse(resourceIds, metricsNames, metricsNamespace, new MetricsQueryResourcesOptions()) .map(Response::getValue); } /** * Returns all the Azure Monitor metrics requested for the batch of resources. * - * @param resourceUris The resource URIs for which the metrics is requested. + * @param resourceIds The resource ids for which the metrics is requested. * @param metricsNames The names of the metrics to query. * @param metricsNamespace The namespace of the metrics to query. - * @param options The {@link MetricsBatchQueryOptions} to include for the request. + * @param options The {@link MetricsQueryResourcesOptions} to include for the request. * @return A time-series metrics result for the requested metric names. - * @throws IllegalArgumentException thrown if {@code resourceUris}, {@code metricsNames} or {@code metricsNamespace} are empty. - * @throws NullPointerException thrown if {@code resourceUris}, {@code metricsNames} or {@code metricsNamespace} are null. + * @throws IllegalArgumentException thrown if {@code resourceIds}, {@code metricsNames} or {@code metricsNamespace} are empty. + * @throws NullPointerException thrown if {@code resourceIds}, {@code metricsNames} or {@code metricsNamespace} are null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> queryBatchWithResponse(List resourceUris, List metricsNames, - String metricsNamespace, MetricsBatchQueryOptions options) { + public Mono> queryResourcesWithResponse(List resourceIds, List metricsNames, + String metricsNamespace, MetricsQueryResourcesOptions options) { - if (CoreUtils.isNullOrEmpty(Objects.requireNonNull(resourceUris, "'resourceUris cannot be null."))) { - return monoError(LOGGER, new IllegalArgumentException("resourceUris cannot be empty")); + if (CoreUtils.isNullOrEmpty(Objects.requireNonNull(resourceIds, "'resourceIds cannot be null."))) { + return monoError(LOGGER, new IllegalArgumentException("resourceIds cannot be empty")); } if (CoreUtils.isNullOrEmpty(Objects.requireNonNull(metricsNames, "metricsNames cannot be null"))) { @@ -119,9 +119,9 @@ public Mono> queryBatchWithResponse(List> responseMono = this.serviceClient.getMetricsBatches() .batchWithResponseAsync(subscriptionId, metricsNamespace, metricsNames, resourceIdList, startTime, endTime, granularity, aggregations, top, orderBy, filter, rollupBy); @@ -133,9 +133,9 @@ public Mono> queryBatchWithResponse(List metricsQueryResults = values.stream() .map(result -> mapToMetricsQueryResult(result)) .collect(Collectors.toList()); - MetricsBatchQueryResult metricsBatchQueryResult = new MetricsBatchQueryResult(metricsQueryResults); + MetricsQueryResourcesResult metricsQueryResourcesResult = new MetricsQueryResourcesResult(metricsQueryResults); return new SimpleResponse<>(response.getRequest(), response.getStatusCode(), - response.getHeaders(), metricsBatchQueryResult); + response.getHeaders(), metricsQueryResourcesResult); }); } } diff --git a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsClient.java b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsClient.java index eb46e7f34ee5..02863c20bb6d 100644 --- a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsClient.java +++ b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsClient.java @@ -16,8 +16,8 @@ import com.azure.monitor.query.implementation.metricsbatch.models.MetricResultsResponseValuesItem; import com.azure.monitor.query.implementation.metricsbatch.models.ResourceIdList; import com.azure.monitor.query.models.AggregationType; -import com.azure.monitor.query.models.MetricsBatchQueryResult; -import com.azure.monitor.query.models.MetricsBatchQueryOptions; +import com.azure.monitor.query.models.MetricsQueryResourcesOptions; +import com.azure.monitor.query.models.MetricsQueryResourcesResult; import com.azure.monitor.query.models.MetricsQueryResult; import java.time.Duration; @@ -45,34 +45,34 @@ public final class MetricsClient { /** * Returns all the Azure Monitor metrics requested for the batch of resources. * - * @param resourceUris The resource URIs for which the metrics is requested. + * @param resourceIds The resource ids for which the metrics is requested. * @param metricsNames The names of the metrics to query. * @param metricsNamespace The namespace of the metrics to query. * @return A time-series metrics result for the requested metric names. */ @ServiceMethod(returns = ReturnType.SINGLE) - public MetricsBatchQueryResult queryBatch(List resourceUris, List metricsNames, String metricsNamespace) { - return this.queryBatchWithResponse(resourceUris, metricsNames, metricsNamespace, new MetricsBatchQueryOptions(), + public MetricsQueryResourcesResult queryResources(List resourceIds, List metricsNames, String metricsNamespace) { + return this.queryResourcesWithResponse(resourceIds, metricsNames, metricsNamespace, new MetricsQueryResourcesOptions(), Context.NONE).getValue(); } /** * Returns all the Azure Monitor metrics requested for the batch of resources. * - * @param resourceUris The resource URIs for which the metrics is requested. + * @param resourceIds The resource ids for which the metrics is requested. * @param metricsNames The names of the metrics to query. * @param metricsNamespace The namespace of the metrics to query. - * @param options The {@link MetricsBatchQueryOptions} to include for the request. + * @param options The {@link MetricsQueryResourcesOptions} to include for the request. * @param context The context to associate with this operation. * @return A time-series metrics result for the requested metric names. - * @throws IllegalArgumentException thrown if {@code resourceUris}, {@code metricsNames} or {@code metricsNamespace} are empty. - * @throws NullPointerException thrown if {@code resourceUris}, {@code metricsNames} or {@code metricsNamespace} are null. + * @throws IllegalArgumentException thrown if {@code resourceIds}, {@code metricsNames} or {@code metricsNamespace} are empty. + * @throws NullPointerException thrown if {@code resourceIds}, {@code metricsNames} or {@code metricsNamespace} are null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response queryBatchWithResponse(List resourceUris, List metricsNames, - String metricsNamespace, MetricsBatchQueryOptions options, Context context) { - if (CoreUtils.isNullOrEmpty(Objects.requireNonNull(resourceUris, "'resourceUris cannot be null."))) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException("resourceUris cannot be empty")); + public Response queryResourcesWithResponse(List resourceIds, List metricsNames, + String metricsNamespace, MetricsQueryResourcesOptions options, Context context) { + if (CoreUtils.isNullOrEmpty(Objects.requireNonNull(resourceIds, "'resourceIds cannot be null."))) { + throw LOGGER.logExceptionAsError(new IllegalArgumentException("resourceIds cannot be empty")); } if (CoreUtils.isNullOrEmpty(Objects.requireNonNull(metricsNames, "metricsNames cannot be null"))) { @@ -118,9 +118,9 @@ public Response queryBatchWithResponse(List res top = options.getTop(); orderBy = options.getOrderBy(); } - String subscriptionId = getSubscriptionFromResourceId(resourceUris.get(0)); + String subscriptionId = getSubscriptionFromResourceId(resourceIds.get(0)); ResourceIdList resourceIdList = new ResourceIdList(); - resourceIdList.setResourceids(resourceUris); + resourceIdList.setResourceids(resourceIds); Response response = this.serviceClient.getMetricsBatches() .batchWithResponse(subscriptionId, metricsNamespace, metricsNames, resourceIdList, startTime, endTime, granularity, aggregations, top, orderBy, filter, rollupBy, context); @@ -129,10 +129,10 @@ public Response queryBatchWithResponse(List res List metricsQueryResults = values.stream() .map(result -> mapToMetricsQueryResult(result)) .collect(Collectors.toList()); - MetricsBatchQueryResult metricsBatchQueryResult = new MetricsBatchQueryResult(metricsQueryResults); + MetricsQueryResourcesResult metricsQueryResourcesResult = new MetricsQueryResourcesResult(metricsQueryResults); return new SimpleResponse<>(response.getRequest(), response.getStatusCode(), - response.getHeaders(), metricsBatchQueryResult); + response.getHeaders(), metricsQueryResourcesResult); } diff --git a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsQueryServiceVersion.java b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsQueryServiceVersion.java index 9f1a74004ade..82d2fe9e4a30 100644 --- a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsQueryServiceVersion.java +++ b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsQueryServiceVersion.java @@ -12,7 +12,11 @@ public enum MetricsQueryServiceVersion implements ServiceVersion { /** * Service version {@code 2018-01-01}. */ - V2018_01_01("2018-01-01"); + V2018_01_01("2018-01-01"), + /** + * Service version {@code 2024-02-01}. + */ + V2024_02_01("2024-02-01"); String version; @@ -29,7 +33,7 @@ public enum MetricsQueryServiceVersion implements ServiceVersion { * @return The latest supported service version by this library. */ public static MetricsQueryServiceVersion getLatest() { - return V2018_01_01; + return V2024_02_01; } @Override diff --git a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsServiceVersion.java b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsServiceVersion.java index 417cfff40109..358b26a07ae2 100644 --- a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsServiceVersion.java +++ b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/MetricsServiceVersion.java @@ -12,7 +12,7 @@ public enum MetricsServiceVersion implements ServiceVersion { /** * The preview version of the Metrics Query service. */ - V2023_10_01("2023-10-01"); + V2024_02_01("2024-02-01"); private final String version; @@ -30,6 +30,6 @@ public String getVersion() { * @return the latest {@link MetricsServiceVersion}. */ public static MetricsServiceVersion getLatest() { - return V2023_10_01; + return V2024_02_01; } } diff --git a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/implementation/metrics/models/MetricsHelper.java b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/implementation/metrics/models/MetricsHelper.java index 2e15ceb101e9..e1b519069c51 100644 --- a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/implementation/metrics/models/MetricsHelper.java +++ b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/implementation/metrics/models/MetricsHelper.java @@ -216,7 +216,7 @@ public static MetricsQueryResult mapToMetricsQueryResult(MetricResultsResponseVa .map(metric -> mapToMetrics(metric)) .collect(Collectors.toList()); - MetricsQueryResult metricsQueryResult = new MetricsQueryResult(/* TODO (srnagar): fix this item.getCost() */ null, + MetricsQueryResult metricsQueryResult = new MetricsQueryResult(null, QueryTimeInterval.parse(item.getStarttime() + "/" + item.getEndtime()), Duration.parse(item.getInterval()), item.getNamespace(), item.getResourceregion(), metrics); return metricsQueryResult; } diff --git a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/models/MetricsBatchQueryOptions.java b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/models/MetricsQueryResourcesOptions.java similarity index 90% rename from sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/models/MetricsBatchQueryOptions.java rename to sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/models/MetricsQueryResourcesOptions.java index 108ebb5b57f3..02d6cd2ba54a 100644 --- a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/models/MetricsBatchQueryOptions.java +++ b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/models/MetricsQueryResourcesOptions.java @@ -12,7 +12,7 @@ * The model class to configure the metrics batch query options. */ @Fluent -public final class MetricsBatchQueryOptions { +public final class MetricsQueryResourcesOptions { private QueryTimeInterval timeInterval; private Duration granularity; private List aggregations; @@ -37,7 +37,7 @@ public QueryTimeInterval getTimeInterval() { * * @return The updated options instance */ - public MetricsBatchQueryOptions setTimeInterval(QueryTimeInterval timeInterval) { + public MetricsQueryResourcesOptions setTimeInterval(QueryTimeInterval timeInterval) { this.timeInterval = timeInterval; return this; } @@ -56,7 +56,7 @@ public Duration getGranularity() { * * @return The updated options instance */ - public MetricsBatchQueryOptions setGranularity(Duration granularity) { + public MetricsQueryResourcesOptions setGranularity(Duration granularity) { this.granularity = granularity; return this; } @@ -74,7 +74,7 @@ public List getAggregations() { * @param aggregations the list of aggregations that should be applied to the metrics data. * @return The updated options instance */ - public MetricsBatchQueryOptions setAggregations(List aggregations) { + public MetricsQueryResourcesOptions setAggregations(List aggregations) { this.aggregations = aggregations; return this; } @@ -93,7 +93,7 @@ public Integer getTop() { * * @return The updated options instance */ - public MetricsBatchQueryOptions setTop(Integer top) { + public MetricsQueryResourcesOptions setTop(Integer top) { this.top = top; return this; } @@ -112,7 +112,7 @@ public String getOrderBy() { * * @return The updated options instance */ - public MetricsBatchQueryOptions setOrderBy(String orderBy) { + public MetricsQueryResourcesOptions setOrderBy(String orderBy) { this.orderBy = orderBy; return this; } @@ -131,7 +131,7 @@ public String getFilter() { * * @return The updated options instance */ - public MetricsBatchQueryOptions setFilter(String filter) { + public MetricsQueryResourcesOptions setFilter(String filter) { this.filter = filter; return this; } @@ -159,7 +159,7 @@ public String getRollupBy() { * specify 'RollUpBy=City' to see the results for Seattle and Tacoma rolled up into one timeseries. * @return The updated options instance */ - public MetricsBatchQueryOptions setRollupBy(String rollupBy) { + public MetricsQueryResourcesOptions setRollupBy(String rollupBy) { this.rollupBy = rollupBy; return this; } diff --git a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/models/MetricsBatchQueryResult.java b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/models/MetricsQueryResourcesResult.java similarity index 85% rename from sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/models/MetricsBatchQueryResult.java rename to sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/models/MetricsQueryResourcesResult.java index 4de74cd34e3f..a1e83c9a17a1 100644 --- a/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/models/MetricsBatchQueryResult.java +++ b/sdk/monitor/azure-monitor-query/src/main/java/com/azure/monitor/query/models/MetricsQueryResourcesResult.java @@ -8,14 +8,14 @@ /** * The result of a metrics query batch. It contains the results of individual queries. */ -public final class MetricsBatchQueryResult { +public final class MetricsQueryResourcesResult { private final List metricsQueryResults; /** * Creates an instance of MetricsBatchResult. * @param metricsQueryResults the metrics results for individual queries */ - public MetricsBatchQueryResult(List metricsQueryResults) { + public MetricsQueryResourcesResult(List metricsQueryResults) { this.metricsQueryResults = metricsQueryResults; } diff --git a/sdk/monitor/azure-monitor-query/src/samples/java/com/azure/monitor/query/MetricsBatchQuerySample.java b/sdk/monitor/azure-monitor-query/src/samples/java/com/azure/monitor/query/MetricsBatchQuerySample.java index 6ef22212bcbf..08e4a56b3ee3 100644 --- a/sdk/monitor/azure-monitor-query/src/samples/java/com/azure/monitor/query/MetricsBatchQuerySample.java +++ b/sdk/monitor/azure-monitor-query/src/samples/java/com/azure/monitor/query/MetricsBatchQuerySample.java @@ -5,7 +5,7 @@ import com.azure.identity.DefaultAzureCredentialBuilder; import com.azure.monitor.query.models.MetricResult; -import com.azure.monitor.query.models.MetricsBatchQueryResult; +import com.azure.monitor.query.models.MetricsQueryResourcesResult; import com.azure.monitor.query.models.MetricsQueryResult; import java.util.Arrays; @@ -26,12 +26,12 @@ public static void main(String[] args) { .endpoint("https://westus2.monitoring.azure.com") .buildClient(); - MetricsBatchQueryResult metricsBatchQueryResult = metricsBatchQueryClient.queryBatch( + MetricsQueryResourcesResult metricsQueryResourcesResult = metricsBatchQueryClient.queryResources( Arrays.asList("{resourceId1}", "{resourceId2}"), Arrays.asList("{metric1}", "{metric2}"), "{metricNamespace}"); - for (MetricsQueryResult metricsQueryResult : metricsBatchQueryResult.getMetricsQueryResults()) { + for (MetricsQueryResult metricsQueryResult : metricsQueryResourcesResult.getMetricsQueryResults()) { // Each MetricsQueryResult corresponds to one of the resourceIds in the batch request. List metrics = metricsQueryResult.getMetrics(); metrics.forEach(metric -> { diff --git a/sdk/monitor/azure-monitor-query/src/samples/java/com/azure/monitor/query/ReadmeSamples.java b/sdk/monitor/azure-monitor-query/src/samples/java/com/azure/monitor/query/ReadmeSamples.java index 9d2ea302797a..d24a146f6edd 100644 --- a/sdk/monitor/azure-monitor-query/src/samples/java/com/azure/monitor/query/ReadmeSamples.java +++ b/sdk/monitor/azure-monitor-query/src/samples/java/com/azure/monitor/query/ReadmeSamples.java @@ -21,7 +21,7 @@ import com.azure.monitor.query.models.LogsTableRow; import com.azure.monitor.query.models.MetricResult; import com.azure.monitor.query.models.MetricValue; -import com.azure.monitor.query.models.MetricsBatchQueryResult; +import com.azure.monitor.query.models.MetricsQueryResourcesResult; import com.azure.monitor.query.models.MetricsQueryOptions; import com.azure.monitor.query.models.MetricsQueryResult; import com.azure.monitor.query.models.QueryTimeInterval; @@ -453,12 +453,12 @@ public void getMetricsBatch() { .endpoint("{endpoint}") .buildClient(); - MetricsBatchQueryResult metricsBatchQueryResult = metricsBatchQueryClient.queryBatch( + MetricsQueryResourcesResult metricsQueryResourcesResult = metricsBatchQueryClient.queryResources( Arrays.asList("{resourceId1}", "{resourceId2}"), Arrays.asList("{metric1}", "{metric2}"), "{metricNamespace}"); - for (MetricsQueryResult metricsQueryResult : metricsBatchQueryResult.getMetricsQueryResults()) { + for (MetricsQueryResult metricsQueryResult : metricsQueryResourcesResult.getMetricsQueryResults()) { // Each MetricsQueryResult corresponds to one of the resourceIds in the batch request. List metrics = metricsQueryResult.getMetrics(); metrics.forEach(metric -> { diff --git a/sdk/monitor/azure-monitor-query/src/samples/java/com/azure/monitor/query/codesnippets/MetricsBatchQueryClientJavaDocCodeSnippets.java b/sdk/monitor/azure-monitor-query/src/samples/java/com/azure/monitor/query/codesnippets/MetricsBatchQueryClientJavaDocCodeSnippets.java index 1f0d2dfc6260..5f055a45e572 100644 --- a/sdk/monitor/azure-monitor-query/src/samples/java/com/azure/monitor/query/codesnippets/MetricsBatchQueryClientJavaDocCodeSnippets.java +++ b/sdk/monitor/azure-monitor-query/src/samples/java/com/azure/monitor/query/codesnippets/MetricsBatchQueryClientJavaDocCodeSnippets.java @@ -8,7 +8,7 @@ import com.azure.monitor.query.MetricsClient; import com.azure.monitor.query.MetricsClientBuilder; import com.azure.monitor.query.models.MetricResult; -import com.azure.monitor.query.models.MetricsBatchQueryResult; +import com.azure.monitor.query.models.MetricsQueryResourcesResult; import com.azure.monitor.query.models.MetricsQueryResult; import java.util.Arrays; @@ -41,7 +41,7 @@ public void createAsyncClient() { } /** - * Generates a code sample for using {@link MetricsClient#queryBatch(List, List, String)}. + * Generates a code sample for using {@link MetricsClient#queryResources(List, List, String)}. */ public void queryBatch() { MetricsClient metricsBatchQueryClient = new MetricsClientBuilder() @@ -50,11 +50,11 @@ public void queryBatch() { .buildClient(); // BEGIN: com.azure.monitor.query.MetricsBatchQueryClient.queryBatch#List-List-String - MetricsBatchQueryResult metricsBatchQueryResult = metricsBatchQueryClient.queryBatch( + MetricsQueryResourcesResult metricsQueryResourcesResult = metricsBatchQueryClient.queryResources( Arrays.asList("{resourceId1}", "{resourceId2}"), Arrays.asList("{metricId}"), "{metricNamespace}"); - for (MetricsQueryResult metricsQueryResult : metricsBatchQueryResult.getMetricsQueryResults()) { + for (MetricsQueryResult metricsQueryResult : metricsQueryResourcesResult.getMetricsQueryResults()) { // Each MetricsQueryResult corresponds to one of the resourceIds in the batch request. List metrics = metricsQueryResult.getMetrics(); metrics.forEach(metric -> { @@ -82,7 +82,7 @@ public void queryBatchAsync() { .buildAsyncClient(); // BEGIN: com.azure.monitor.query.MetricsBatchQueryAsyncClient.queryBatch#List-List-String - metricsAsyncClient.queryBatch( + metricsAsyncClient.queryResources( Arrays.asList("{resourceId1}", "{resourceId2}"), Arrays.asList("{metricId}"), "{metricNamespace}") .subscribe(metricsBatchResult -> { diff --git a/sdk/monitor/azure-monitor-query/src/test/java/com/azure/monitor/query/MetricsClientTest.java b/sdk/monitor/azure-monitor-query/src/test/java/com/azure/monitor/query/MetricsClientTest.java index ce1ea8d3540e..2bf88ba61daf 100644 --- a/sdk/monitor/azure-monitor-query/src/test/java/com/azure/monitor/query/MetricsClientTest.java +++ b/sdk/monitor/azure-monitor-query/src/test/java/com/azure/monitor/query/MetricsClientTest.java @@ -10,8 +10,8 @@ import com.azure.core.util.Context; import com.azure.core.util.CoreUtils; import com.azure.monitor.query.models.MetricResult; -import com.azure.monitor.query.models.MetricsBatchQueryOptions; -import com.azure.monitor.query.models.MetricsBatchQueryResult; +import com.azure.monitor.query.models.MetricsQueryResourcesOptions; +import com.azure.monitor.query.models.MetricsQueryResourcesResult; import com.azure.monitor.query.models.QueryTimeInterval; import org.junit.jupiter.api.Test; @@ -40,12 +40,12 @@ public void testMetricsBatchQuery() { // ignore as this is only to generate some metrics } - MetricsBatchQueryOptions options = new MetricsBatchQueryOptions() + MetricsQueryResourcesOptions options = new MetricsQueryResourcesOptions() .setGranularity(Duration.ofMinutes(15)) .setTop(10) .setTimeInterval(new QueryTimeInterval(OffsetDateTime.now().minusDays(1), OffsetDateTime.now())); - MetricsBatchQueryResult metricsQueryResults = metricsClient.queryBatchWithResponse( + MetricsQueryResourcesResult metricsQueryResults = metricsClient.queryResourcesWithResponse( Arrays.asList(resourceId), Arrays.asList("HttpIncomingRequestCount"), "microsoft.appconfiguration/configurationstores", options, Context.NONE) .getValue(); @@ -66,7 +66,7 @@ public void testMetricsBatchQueryDifferentResourceTypes() { String updatedResource1 = resourceId1.substring(resourceId1.indexOf("/subscriptions")); String updatedResource2 = resourceId2.substring(resourceId2.indexOf("/subscriptions")); - assertThrows(HttpResponseException.class, () -> metricsBatchQueryClient.queryBatch( + assertThrows(HttpResponseException.class, () -> metricsBatchQueryClient.queryResources( Arrays.asList(updatedResource1, updatedResource2), Arrays.asList("Successful Requests"), " Microsoft.Eventhub/Namespaces"));