Skip to content

Commit b71c6d7

Browse files
samvaitysamvaity
authored
[Metrics Advisor] Update flakey tests (Azure#17398)
1 parent 3bab47a commit b71c6d7

36 files changed

+387
-314
lines changed

‎sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Release History
22

3-
## 1.0.0-beta.2 (Unreleased)
3+
## 1.0.0-beta.2 (2020-11-10)
44

55
### Breaking changes
66
- Updated `createdDataFeed` method to take one `DataFeed` object.

‎sdk/metricsadvisor/azure-ai-metricsadvisor/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ of business dataFeedMetrics.
1313
- [Cognitive Services or Metrics Advisor account][metrics_advisor_account] to use this package.
1414

1515
### Include the Package
16-
**Note:** This beta version targets Azure Metrics Advisor service API version v2.0-preview.
16+
**Note:** This beta version targets Azure Metrics Advisor service API version v1.0.
1717

1818
[//]: # ({x-version-update-start;com.azure:azure-ai-metricsadvisor;current})
1919
```xml
2020
<dependency>
2121
<groupId>com.azure</groupId>
2222
<artifactId>azure-ai-metricsadvisor</artifactId>
23-
<version>1.0.0-beta.1</version>
23+
<version>1.0.0-beta.2</version>
2424
</dependency>
2525
```
2626
[//]: # ({x-version-update-end})
@@ -347,7 +347,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m
347347
<!-- LINKS -->
348348
[aad_authorization]: https://docs.microsoft.com/azure/cognitive-services/authentication#authenticate-with-azure-active-directory
349349
[key]: https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account?tabs=multiservice%2Cwindows#get-the-keys-for-your-resource
350-
[api_reference_doc]: https://westus2.dev.cognitive.microsoft.com/docs/services/MetricsAdvisor/operations/createDataFeed
350+
[api_reference_doc]: https://docs.microsoft.com/java/api/com.azure.ai.metricsadvisor?view=azure-java-preview
351351
[azure_identity_credential_type]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/identity/azure-identity#credentials
352352
[azure_cli]: https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account-cli?tabs=windows
353353
[azure_cli_endpoint]: https://docs.microsoft.com/cli/azure/cognitiveservices/account?view=azure-cli-latest#az-cognitiveservices-account-show

‎sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public PagedIterable<EnrichmentStatus> listMetricEnrichmentStatus(
188188
* @param metricId metric unique id.
189189
* @param startTime The start time for querying the time series data.
190190
* @param endTime The end time for querying the time series data.
191-
* @param options th e additional configurable options to specify when querying the result..
191+
* @param options the additional configurable options to specify when querying the result.
192192
* @param context Additional context that is passed through the Http pipeline during the service call.
193193
*
194194
* @return the list of enrichment status's for the specified metric.

‎sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricsAdvisorServiceVersion.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
* The versions of Azure Metrics Advisor supported by this client library.
1010
*/
1111
public enum MetricsAdvisorServiceVersion implements ServiceVersion {
12-
// TODO: confirm and change
13-
V2_0("v2.0");
12+
V1_0("v1.0");
1413

1514
private final String version;
1615

@@ -32,7 +31,7 @@ public String getVersion() {
3231
* @return the latest {@link MetricsAdvisorServiceVersion}
3332
*/
3433
public static MetricsAdvisorServiceVersion getLatest() {
35-
return V2_0;
34+
return V1_0;
3635
}
3736

3837
}

‎sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsSample.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.azure.ai.metricsadvisor.models.ListAlertOptions;
99
import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential;
1010
import com.azure.core.http.rest.PagedIterable;
11+
import com.azure.core.util.Context;
1112

1213
import java.time.OffsetDateTime;
1314

@@ -38,7 +39,8 @@ public static void main(String[] args) {
3839
.setAlertQueryTimeMode(timeMode)
3940
.setTop(10);
4041

41-
PagedIterable<AnomalyAlert> alertsIterable = advisorClient.listAlerts(alertConfigurationId, startTime, endTime);
42+
PagedIterable<AnomalyAlert> alertsIterable = advisorClient.listAlerts(alertConfigurationId, startTime, endTime,
43+
options, Context.NONE);
4244
for (AnomalyAlert anomalyAlert : alertsIterable) {
4345
System.out.printf("Anomaly Alert Id: %s%n", anomalyAlert.getId());
4446
System.out.printf("Created Time: %s%n", anomalyAlert.getCreatedTime());

‎sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricSample.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import com.azure.ai.metricsadvisor.models.ListMetricEnrichmentStatusOptions;
77
import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential;
8+
import com.azure.core.util.Context;
89

910
import java.time.OffsetDateTime;
1011

@@ -24,7 +25,7 @@ public static void main(String[] args) {
2425
final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions()
2526
.setTop(10);
2627

27-
advisorClient.listMetricEnrichmentStatus(metricId, startTime, endTime)
28+
advisorClient.listMetricEnrichmentStatus(metricId, startTime, endTime, options, Context.NONE)
2829
.forEach(enrichmentStatus -> {
2930
System.out.printf("Data Feed Metric enrichment status : %s%n", enrichmentStatus.getStatus());
3031
System.out.printf("Data Feed Metric enrichment status message: %s%n", enrichmentStatus.getMessage());

‎sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsSample.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.azure.ai.metricsadvisor.models.ListAnomaliesAlertedOptions;
88
import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential;
99
import com.azure.core.http.rest.PagedIterable;
10+
import com.azure.core.util.Context;
1011

1112
/**
1213
* Sample demonstrates how to list anomalies that triggered an alert.
@@ -26,7 +27,9 @@ public static void main(String[] args) {
2627

2728
PagedIterable<DataPointAnomaly> anomaliesIterable = advisorClient.listAnomaliesForAlert(
2829
alertConfigurationId,
29-
alertId);
30+
alertId,
31+
options,
32+
Context.NONE);
3033

3134
for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) {
3235
System.out.printf("Data Feed Metric Id: %s%n", dataPointAnomaly.getMetricId());

‎sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ public void listAlertForAlertConfiguration() {
340340
final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299";
341341
final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z");
342342
final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
343-
final AlertQueryTimeMode timeMode = AlertQueryTimeMode.ANOMALY_TIME;
344343

345344
PagedIterable<AnomalyAlert> alertsIterable
346345
= metricsAdvisorClient.listAlerts(alertConfigurationId, startTime, endTime);
@@ -392,9 +391,6 @@ public void listValuesOfDimensionWithAnomalies() {
392391
final String dimensionName = "Dim1";
393392
final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z");
394393
final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
395-
final ListDimensionValuesWithAnomaliesOptions options
396-
= new ListDimensionValuesWithAnomaliesOptions()
397-
.setTop(10);
398394

399395
PagedIterable<String> dimensionValueIterable
400396
= metricsAdvisorClient.listDimensionValuesWithAnomalies(detectionConfigurationId,
@@ -446,8 +442,6 @@ public void listIncidentsForDetectionConfig() {
446442
final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8";
447443
final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
448444
final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z");
449-
final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions()
450-
.setTop(1000);
451445

452446
PagedIterable<AnomalyIncident> incidentsIterable
453447
= metricsAdvisorClient.listIncidentsForDetectionConfig(detectionConfigurationId, startTime, endTime);
@@ -514,7 +508,8 @@ public void listAnomaliesForDetectionConfiguration() {
514508
.setTop(10)
515509
.setFilter(filter);
516510
PagedIterable<DataPointAnomaly> anomaliesIterable
517-
= metricsAdvisorClient.listAnomaliesForDetectionConfig(detectionConfigurationId, startTime, endTime);
511+
= metricsAdvisorClient.listAnomaliesForDetectionConfig(detectionConfigurationId, startTime, endTime,
512+
options, Context.NONE);
518513

519514
for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) {
520515
System.out.printf("DataPointAnomaly AnomalySeverity: %s%n", dataPointAnomaly.getSeverity());
@@ -603,7 +598,8 @@ public void createMetricFeedbackWithResponse() {
603598
final Response<MetricFeedback> metricFeedbackResponse
604599
= metricsAdvisorClient.createMetricFeedbackWithResponse(metricId, metricChangePointFeedback, Context.NONE);
605600

606-
System.out.printf("Data Feed Metric feedback creation operation status %s%n", metricFeedbackResponse.getStatusCode());
601+
System.out.printf("Data Feed Metric feedback creation operation status %s%n",
602+
metricFeedbackResponse.getStatusCode());
607603
MetricChangePointFeedback createdMetricChangePointFeedback
608604
= (MetricChangePointFeedback) metricFeedbackResponse.getValue();
609605
System.out.printf("Data Feed Metric feedback Id: %s%n", createdMetricChangePointFeedback.getId());
@@ -824,7 +820,7 @@ public void listMetricEnrichmentStatus() {
824820
final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z");
825821
final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z");
826822
final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l";
827-
final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions().setTop(10);
823+
828824
metricsAdvisorClient.listMetricEnrichmentStatus(metricId, startTime, endTime)
829825
.forEach(enrichmentStatus -> {
830826
System.out.printf("Data Feed Metric enrichment status : %s%n", enrichmentStatus.getStatus());

‎sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedAsyncSample.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@
33

44
package com.azure.ai.metricsadvisor.administration;
55

6-
import com.azure.ai.metricsadvisor.implementation.models.DataSourceType;
76
import com.azure.ai.metricsadvisor.models.AzureAppInsightsDataFeedSource;
87
import com.azure.ai.metricsadvisor.models.DataFeed;
8+
import com.azure.ai.metricsadvisor.models.DataFeedDimension;
99
import com.azure.ai.metricsadvisor.models.DataFeedGranularity;
1010
import com.azure.ai.metricsadvisor.models.DataFeedGranularityType;
1111
import com.azure.ai.metricsadvisor.models.DataFeedIngestionSettings;
1212
import com.azure.ai.metricsadvisor.models.DataFeedMetric;
1313
import com.azure.ai.metricsadvisor.models.DataFeedOptions;
1414
import com.azure.ai.metricsadvisor.models.DataFeedSchema;
15-
import com.azure.ai.metricsadvisor.models.DataFeedDimension;
15+
import com.azure.ai.metricsadvisor.models.DataFeedSourceType;
1616
import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential;
1717
import reactor.core.publisher.Mono;
1818

1919
import java.time.OffsetDateTime;
2020
import java.util.Arrays;
21+
import java.util.Collections;
2122

2223
/**
2324
* Async sample demonstrates how to create, get, update, delete and list datafeed.
@@ -79,7 +80,7 @@ public static void main(String[] args) {
7980
dataFeed.getMetricIds().forEach(metricId -> System.out.println(metricId));
8081
System.out.printf("Data feed source type: %s%n", dataFeed.getSourceType());
8182

82-
if (DataSourceType.AZURE_APPLICATION_INSIGHTS.equals(dataFeed.getSource())) {
83+
if (DataFeedSourceType.AZURE_APP_INSIGHTS.equals(dataFeed.getSourceType())) {
8384
AzureAppInsightsDataFeedSource createdAppInsightsDatafeedSource
8485
= (AzureAppInsightsDataFeedSource) dataFeed.getSource();
8586
System.out.println("Data feed source details");
@@ -95,7 +96,7 @@ public static void main(String[] args) {
9596
Mono<DataFeed> updateDataFeedMono = fetchDataFeedMono
9697
.flatMap(dataFeed -> {
9798
return advisorAdministrationAsyncClient.updateDataFeed(dataFeed
98-
.setOptions(new DataFeedOptions().setAdminEmails(Arrays.asList("admin1@admin.com"))))
99+
.setOptions(new DataFeedOptions().setAdminEmails(Collections.singletonList("admin1@admin.com"))))
99100
.doOnSubscribe(__ ->
100101
System.out.printf("Updating data feed: %s%n", dataFeed.getId()))
101102
.doOnSuccess(config -> {
@@ -135,7 +136,7 @@ public static void main(String[] args) {
135136
System.out.printf("Data feed granularity value : %d%n",
136137
dataFeedItem.getGranularity().getCustomGranularityValue());
137138
System.out.println("Data feed related metric Id's:");
138-
dataFeedItem.getMetricIds().forEach(metricId -> System.out.println(metricId));
139+
dataFeedItem.getMetricIds().forEach(System.out::println);
139140
System.out.printf("Data feed source type: %s%n", dataFeedItem.getSourceType());
140141
});
141142
}

‎sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedSample.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
package com.azure.ai.metricsadvisor.administration;
55

6-
import com.azure.ai.metricsadvisor.implementation.models.DataSourceType;
76
import com.azure.ai.metricsadvisor.models.AzureAppInsightsDataFeedSource;
87
import com.azure.ai.metricsadvisor.models.DataFeed;
98
import com.azure.ai.metricsadvisor.models.DataFeedDimension;
@@ -13,10 +12,12 @@
1312
import com.azure.ai.metricsadvisor.models.DataFeedMetric;
1413
import com.azure.ai.metricsadvisor.models.DataFeedOptions;
1514
import com.azure.ai.metricsadvisor.models.DataFeedSchema;
15+
import com.azure.ai.metricsadvisor.models.DataFeedSourceType;
1616
import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential;
1717

1818
import java.time.OffsetDateTime;
1919
import java.util.Arrays;
20+
import java.util.Collections;
2021

2122
/**
2223
* Sample demonstrates how to create, get, update, delete and list datafeed.
@@ -63,10 +64,10 @@ public static void main(String[] args) {
6364
System.out.printf("Data feed granularity value : %d%n",
6465
dataFeed.getGranularity().getCustomGranularityValue());
6566
System.out.println("Data feed related metric Id's:");
66-
dataFeed.getMetricIds().forEach(metricId -> System.out.println(metricId));
67+
dataFeed.getMetricIds().forEach(System.out::println);
6768
System.out.printf("Data feed source type: %s%n", dataFeed.getSourceType());
6869

69-
if (DataSourceType.AZURE_APPLICATION_INSIGHTS.equals(dataFeed.getSource())) {
70+
if (DataFeedSourceType.AZURE_APP_INSIGHTS.equals(dataFeed.getSourceType())) {
7071
AzureAppInsightsDataFeedSource createdAppInsightsDatafeedSource
7172
= (AzureAppInsightsDataFeedSource) dataFeed.getSource();
7273
System.out.println("Data feed source details");
@@ -78,7 +79,7 @@ public static void main(String[] args) {
7879
// Update the data feed.
7980
System.out.printf("Updating data feed: %s%n", dataFeed.getId());
8081
dataFeed = advisorAdministrationClient.updateDataFeed(dataFeed
81-
.setOptions(new DataFeedOptions().setAdminEmails(Arrays.asList("admin1@admin.com"))));
82+
.setOptions(new DataFeedOptions().setAdminEmails(Collections.singletonList("admin1@admin.com"))));
8283
System.out.printf("Updated data feed admin list: %s%n", dataFeed.getOptions().getAdminEmails());
8384

8485
// Delete the data feed.
@@ -97,7 +98,7 @@ public static void main(String[] args) {
9798
System.out.printf("Data feed granularity value : %d%n",
9899
dataFeedItem.getGranularity().getCustomGranularityValue());
99100
System.out.println("Data feed related metric Id's:");
100-
dataFeedItem.getMetricIds().forEach(metricId -> System.out.println(metricId));
101+
dataFeedItem.getMetricIds().forEach(System.out::println);
101102
System.out.printf("Data feed source type: %s%n", dataFeedItem.getSourceType());
102103
});
103104
}

0 commit comments

Comments
 (0)