diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md index 8350e9c93d566..460491f2211e7 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md @@ -28,12 +28,9 @@ of business dataFeedMetrics. #### Create a Metrics Advisor resource ### Authenticate the client -You will need two keys to authenticate the client: - -- The subscription key to your Metrics Advisor resource. You can find this in the Keys and Endpoint section of your resource in the Azure portal. -- The API key for your Metrics Advisor instance. You can find this on the web portal for Metrics Advisor, in API keys on the left navigation menu. - -We can use the keys to create a new `MetricsAdvisorClient` or `MetricsAdvisorAdministrationClient`. +In order to interact with the Metrics Advisor service, you will need to create an instance of the Metrics Advisor client. +Both the asynchronous and synchronous clients can be created by using `MetricsAdvisorClientBuilder`. Invoking `buildClient()` +will create the synchronous client, while invoking `buildAsyncClient` will create its asynchronous counterpart. ##### Looking up the endpoint You can find the **endpoint** for your Metric Advisor resource in the [Azure Portal][azure_portal], @@ -43,8 +40,16 @@ or [Azure CLI][azure_cli_endpoint]. az cognitiveservices account show --name "resource-name" --resource-group "resource-group-name" --query "endpoint" ``` +#### Create a MetricsAdvisor client using MetricsAdvisorKeyCredential +You will need two keys to authenticate the client: + +- The subscription key to your Metrics Advisor resource. You can find this in the Keys and Endpoint section of your resource in the Azure portal. +- The API key for your Metrics Advisor instance. You can find this on the web portal for Metrics Advisor, in API keys on the left navigation menu. + +Once you have the two keys and endpoint, you can use the `MetricsAdvisorKeyCredential` class to authenticate the clients as follows: + #### Create a Metrics Advisor client using MetricsAdvisorKeyCredential - + ```java MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder() @@ -54,7 +59,7 @@ MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder() ``` #### Create a Metrics Administration client using MetricsAdvisorKeyCredential - + ```java MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); MetricsAdvisorAdministrationClient metricsAdvisorAdminClient = @@ -64,6 +69,54 @@ MetricsAdvisorAdministrationClient metricsAdvisorAdminClient = .buildClient(); ``` +#### Create a MetricsAdvisor client using Azure Service Directory +Azure SDK for Java supports an Azure Identity package, making it easy to get credentials from Microsoft identity +platform. + +Authentication with AAD requires some initial setup: +* Add the Azure Identity package + +[//]: # ({x-version-update-start;com.azure:azure-identity;dependency}) +```xml + + com.azure + azure-identity + 1.2.2 + +``` +[//]: # ({x-version-update-end}) +* [Register a new Azure Active Directory application][register_AAD_application] +* [Grant access][grant_access] to Metrics Advisor by assigning the `"Cognitive Services User"` role to your service principal. + +After the setup, you can choose which type of [credential][azure_identity_credential_type] from azure.identity to use. +As an example, [DefaultAzureCredential][wiki_identity] can be used to authenticate the client: +Set the values of the client ID, tenant ID, and client secret of the AAD application as environment variables: +AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_CLIENT_SECRET. + +Authorization is easiest using [DefaultAzureCredential][wiki_identity]. It finds the best credential to use in its +running environment. For more information about using Azure Active Directory authorization with Metrics Advisor, please +refer to [the associated documentation][aad_authorization]. +#### Create a Metrics Advisor client using AAD authentication + +```java +TokenCredential credential = new DefaultAzureCredentialBuilder().build(); +MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder() + .endpoint("{endpoint}") + .credential(credential) + .buildClient(); +``` + +#### Create a Metrics Administration client using AAD authentication + +```java +TokenCredential credential = new DefaultAzureCredentialBuilder().build(); +MetricsAdvisorAdministrationClient metricsAdvisorAdminClient = + new MetricsAdvisorAdministrationClientBuilder() + .endpoint("{endpoint}") + .credential(credential) + .buildClient(); +``` + ## Key concepts ### MetricsAdvisorClient `MetricsAdvisorClient` helps with: @@ -121,7 +174,7 @@ A notification hook is the entry point that allows the users to subscribe to rea #### Add a data feed from a sample or data source This example ingests the user specified `SQLServerDataFeedSource` data feed source data to the service. - + ```java DataFeed dataFeed = new DataFeed() .setName("dataFeedName") @@ -165,7 +218,7 @@ if (SQL_SERVER_DB == createdSqlDataFeed.getSourceType()) { #### Check ingestion status This example checks the ingestion status of a previously provided data feed source. - + ```java String dataFeedId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5"; @@ -184,7 +237,7 @@ metricsAdvisorAdminClient.listDataFeedIngestionStatus( #### Configure anomaly detection configuration This example demonstrates how a user can configure an anomaly detection configuration for their data. - + ```java String metricId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5"; @@ -221,7 +274,7 @@ final AnomalyDetectionConfiguration anomalyDetectionConfiguration = ### Add hooks for receiving anomaly alerts This example creates an email hook that receives anomaly incident alerts. - + ```java NotificationHook emailNotificationHook = new EmailNotificationHook("email Hook") .setDescription("my email Hook") @@ -240,8 +293,8 @@ System.out.printf("Email Hook emails to alert: %s%n", #### Configure an anomaly alert configuration This example demonstrates how a user can configure an alerting configuration for detected anomalies in their data. + - ```java String detectionConfigurationId1 = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; String detectionConfigurationId2 = "3e58er30-6e6e-4391-b78f-b00dfee1e6f5"; @@ -265,7 +318,6 @@ final AnomalyAlertConfiguration anomalyAlertConfiguration .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))); ``` - #### Query anomaly detection results This example demonstrates how a user can query alerts triggered for an anomaly detection configuration and get anomalies for that anomalyAlert. @@ -299,7 +351,7 @@ Metrics Advisor clients raises `HttpResponseException` [exceptions][http_respons to provide a non existing feedback Id an `HttpResponseException` would be raised with an error indicating the failure cause. In the following code snippet, the error is handled gracefully by catching the exception and display the additional information about the error. - + ```java try { metricsAdvisorClient.getFeedback("non_existing_feedback_id"); @@ -324,7 +376,7 @@ For more details see the [samples README][samples_readme]. #### Async APIs All the examples shown so far have been using synchronous APIs, but we provide full support for async APIs as well. You'll need to use `MetricsAdvisorAsyncClient` - + ```java MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); MetricsAdvisorAsyncClient metricsAdvisorAsyncClient = new MetricsAdvisorClientBuilder() @@ -362,6 +414,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m [create_new_resource]: https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account?tabs=multiservice%2Cwindows#create-a-new-azure-cognitive-services-resource [http_clients_wiki]: https://github.com/Azure/azure-sdk-for-java/wiki/HTTP-clients [jdk_link]: https://docs.microsoft.com/java/azure/jdk/?view=azure-java-stable +[register_AAD_application]: https://docs.microsoft.com/azure/cognitive-services/authentication#assign-a-role-to-a-service-principal [metrics_advisor_account]: https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesMetricsAdvisor [metrics_advisor_doc]: https://docs.microsoft.com/azure/cognitive-services/Metrics-advisor/glossary [mvn_package]: https://search.maven.org/artifact/com.azure/azure-ai-metricsadvisor/1.0.0-beta.1/jar @@ -369,5 +422,6 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m [source_code]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/metricsadvisor/azure-ai-metricsadvisor/src [samples]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples [samples_readme]: https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/README.md +[wiki_identity]: https://github.com/Azure/azure-sdk-for-java/wiki/Identity-and-Authentication ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%metricsadvisor%2Fazure-ai-metricsadvisor%2FREADME.png) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml b/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml index ffa5a26dc864f..336e2be9aa228 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml @@ -100,11 +100,6 @@ --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED --add-opens com.azure.ai.metricsadvisor/com.azure.ai.metricsadvisor=ALL-UNNAMED - - - - false - diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java index 946cf79ef2cca..b0c3c631f1c14 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java @@ -23,7 +23,6 @@ import com.azure.ai.metricsadvisor.models.DetectionConditionsOperator; import com.azure.ai.metricsadvisor.models.EmailNotificationHook; import com.azure.ai.metricsadvisor.models.HardThresholdCondition; -import com.azure.ai.metricsadvisor.models.NotificationHook; import com.azure.ai.metricsadvisor.models.ListDataFeedIngestionOptions; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConditions; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; @@ -32,11 +31,14 @@ import com.azure.ai.metricsadvisor.models.MetricWholeSeriesDetectionCondition; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import com.azure.ai.metricsadvisor.models.MySqlDataFeedSource; +import com.azure.ai.metricsadvisor.models.NotificationHook; import com.azure.ai.metricsadvisor.models.SQLServerDataFeedSource; import com.azure.ai.metricsadvisor.models.SeverityCondition; import com.azure.ai.metricsadvisor.models.SmartDetectionCondition; import com.azure.ai.metricsadvisor.models.SuppressCondition; +import com.azure.core.credential.TokenCredential; import com.azure.core.exception.HttpResponseException; +import com.azure.identity.DefaultAzureCredentialBuilder; import java.time.OffsetDateTime; import java.util.Arrays; @@ -78,6 +80,29 @@ public void getMetricsAdvisorAdministrationClient() { .buildClient(); } + /** + * Code snippet for getting advisor client using AAD Authentication. + */ + public void useAADAuthentication() { + TokenCredential credential = new DefaultAzureCredentialBuilder().build(); + MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder() + .endpoint("{endpoint}") + .credential(credential) + .buildClient(); + } + + /** + * Code snippet for getting administration client using AAD Authentication. + */ + public void metricsAdvisorAdministrationClientAAD() { + TokenCredential credential = new DefaultAzureCredentialBuilder().build(); + MetricsAdvisorAdministrationClient metricsAdvisorAdminClient = + new MetricsAdvisorAdministrationClientBuilder() + .endpoint("{endpoint}") + .credential(credential) + .buildClient(); + } + /** * Code snippet for creating a data feed. */ diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertAsyncTest.java index a7766927e84e3..4af1de26708a0 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertAsyncTest.java @@ -17,6 +17,7 @@ import java.time.Duration; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; public final class AlertAsyncTest extends AlertTestBase { @@ -24,7 +25,7 @@ public final class AlertAsyncTest extends AlertTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTest.java index aefe894868266..a38f55dab0c72 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTest.java @@ -18,6 +18,7 @@ import java.time.Duration; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; public final class AlertTest extends AlertTestBase { @@ -25,7 +26,7 @@ public final class AlertTest extends AlertTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertAsyncTest.java index 45dce67ec8dea..9e48eedf33894 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertAsyncTest.java @@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID; import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID_ERROR; @@ -42,7 +43,7 @@ public class AnomalyAlertAsyncTest extends AnomalyAlertTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertTest.java index 59147d9898a2e..d2a197eb3177e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertTest.java @@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID; import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID_ERROR; @@ -43,7 +44,7 @@ public final class AnomalyAlertTest extends AnomalyAlertTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyDimensionValuesAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyDimensionValuesAsyncTest.java index 89ac62ebda430..b35637cfe6fba 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyDimensionValuesAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyDimensionValuesAsyncTest.java @@ -16,13 +16,14 @@ import java.time.Duration; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; public final class AnomalyDimensionValuesAsyncTest extends AnomalyDimensionValuesTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyDimensionValuesTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyDimensionValuesTest.java index 7bc267783953b..1c68dee3a30fa 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyDimensionValuesTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyDimensionValuesTest.java @@ -16,12 +16,13 @@ import java.time.Duration; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; public final class AnomalyDimensionValuesTest extends AnomalyDimensionValuesTestBase { @BeforeAll static void beforeAll() { - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedAsyncTest.java index 821a9edf982cb..f39b0a4e40900 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedAsyncTest.java @@ -17,6 +17,7 @@ import java.time.Duration; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -25,7 +26,7 @@ public class AnomalyIncidentDetectedAsyncTest extends IncidentDetectedTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedTest.java index b3246e2872a7c..95b5be7a937f4 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedTest.java @@ -17,6 +17,7 @@ import java.time.Duration; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; public class AnomalyIncidentDetectedTest extends IncidentDetectedTestBase { @@ -24,7 +25,7 @@ public class AnomalyIncidentDetectedTest extends IncidentDetectedTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertAsyncTest.java index 772cab8d1980b..dd37b2ae96e16 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertAsyncTest.java @@ -17,13 +17,14 @@ import java.time.Duration; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; public class AnomalyIncidentForAlertAsyncTest extends IncidentForAlertTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertTest.java index 2df75dfb3bc70..393ee04a22aca 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertTest.java @@ -19,6 +19,7 @@ import java.time.Duration; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; public class AnomalyIncidentForAlertTest extends IncidentForAlertTestBase { @@ -26,7 +27,7 @@ public class AnomalyIncidentForAlertTest extends IncidentForAlertTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseAsyncTest.java index 05ead6dd3db22..4a43a6d04878b 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseAsyncTest.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.List; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -26,7 +27,7 @@ public class AnomalyIncidentRootCauseAsyncTest extends IncidentRootCauseTestBase @BeforeAll static void beforeAll() { - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseTest.java index e9f58ec9166d3..6ef538aa139af 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseTest.java @@ -16,6 +16,7 @@ import java.util.List; import java.util.stream.Collectors; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -26,7 +27,7 @@ public class AnomalyIncidentRootCauseTest extends IncidentRootCauseTestBase { @BeforeAll static void beforeAll() { - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedAsyncClientTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedAsyncClientTest.java index 3f637a98e3d7a..e8b989d54f913 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedAsyncClientTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedAsyncClientTest.java @@ -34,6 +34,7 @@ import java.util.stream.Collectors; import static com.azure.ai.metricsadvisor.TestUtils.DATAFEED_ID_REQUIRED_ERROR; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID; import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID_ERROR; @@ -61,7 +62,7 @@ public class DataFeedAsyncClientTest extends DataFeedTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java index ee5c26801f192..8c3c52f7906a0 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java @@ -40,6 +40,7 @@ import java.util.stream.Collectors; import static com.azure.ai.metricsadvisor.TestUtils.DATAFEED_ID_REQUIRED_ERROR; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID; import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID_ERROR; @@ -68,7 +69,7 @@ public class DataFeedClientTest extends DataFeedTestBase { @BeforeAll static void beforeAll() { - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationAsyncTest.java index 07198306a1a91..cdd4510f0331d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationAsyncTest.java @@ -21,6 +21,7 @@ import java.time.Duration; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; public final class DataFeedIngestionOperationAsyncTest extends DataFeedIngestionOperationTestBase { @@ -28,7 +29,7 @@ public final class DataFeedIngestionOperationAsyncTest extends DataFeedIngestion @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationTest.java index 18b7dea570b1f..da81403b8d625 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedIngestionOperationTest.java @@ -21,6 +21,7 @@ import java.time.Duration; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; public class DataFeedIngestionOperationTest extends DataFeedIngestionOperationTestBase { @@ -28,7 +29,7 @@ public class DataFeedIngestionOperationTest extends DataFeedIngestionOperationTe @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationAsyncTest.java index cb863517149a5..a4de774996ce7 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationAsyncTest.java @@ -21,6 +21,7 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -28,7 +29,7 @@ public class DetectionConfigurationAsyncTest extends DetectionConfigurationTestB @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTest.java index 3011e77f30a01..3c860033641d9 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTest.java @@ -22,6 +22,7 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -30,7 +31,7 @@ public class DetectionConfigurationTest extends DetectionConfigurationTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/FeedbackAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/FeedbackAsyncTest.java index ad1b2ae801139..235d23371359e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/FeedbackAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/FeedbackAsyncTest.java @@ -29,6 +29,7 @@ import java.util.stream.Collectors; import static com.azure.ai.metricsadvisor.MetricsSeriesTestBase.METRIC_ID; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID; import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID_ERROR; @@ -44,7 +45,7 @@ public class FeedbackAsyncTest extends FeedbackTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/FeedbackTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/FeedbackTest.java index 6baa767620642..f86d07f5778de 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/FeedbackTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/FeedbackTest.java @@ -31,6 +31,7 @@ import java.util.stream.Collectors; import static com.azure.ai.metricsadvisor.MetricsSeriesTestBase.METRIC_ID; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static com.azure.ai.metricsadvisor.models.FeedbackType.ANOMALY; import static com.azure.ai.metricsadvisor.models.FeedbackType.CHANGE_POINT; @@ -45,7 +46,7 @@ public class FeedbackTest extends FeedbackTestBase { @BeforeAll static void beforeAll() { - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricEnrichedSeriesDataAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricEnrichedSeriesDataAsyncTest.java index b0c4e9662ef88..18f34981fba3f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricEnrichedSeriesDataAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricEnrichedSeriesDataAsyncTest.java @@ -17,6 +17,7 @@ import java.time.Duration; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; public class MetricEnrichedSeriesDataAsyncTest extends MetricEnrichedSeriesDataTestBase { @@ -24,7 +25,7 @@ public class MetricEnrichedSeriesDataAsyncTest extends MetricEnrichedSeriesDataT @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricEnrichedSeriesDataTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricEnrichedSeriesDataTest.java index 26c50e8337910..ff2817d7164b3 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricEnrichedSeriesDataTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricEnrichedSeriesDataTest.java @@ -19,6 +19,7 @@ import java.util.List; import java.util.stream.Collectors; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; public final class MetricEnrichedSeriesDataTest extends MetricEnrichedSeriesDataTestBase { @@ -26,7 +27,7 @@ public final class MetricEnrichedSeriesDataTest extends MetricEnrichedSeriesData @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java index 5bbc9e1102407..99c63f9910e17 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.List; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -34,7 +35,7 @@ public class MetricsSeriesAsyncTest extends MetricsSeriesTestBase { @BeforeAll static void beforeAll() { - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java index 99e154830a35f..6d9d7c6690e72 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.stream.Collectors; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -34,7 +35,7 @@ public class MetricsSeriesTest extends MetricsSeriesTestBase { @BeforeAll static void beforeAll() { - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookAsyncTest.java index a6ce5f068b653..ee37626059f81 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookAsyncTest.java @@ -22,13 +22,14 @@ import java.util.ArrayList; import java.util.List; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; public final class NotificationHookAsyncTest extends NotificationHookTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookTest.java index 040d3de6183e7..c229a857f45d7 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookTest.java @@ -21,12 +21,13 @@ import java.util.List; import java.util.stream.Collectors; +import static com.azure.ai.metricsadvisor.TestUtils.DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS; import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; public final class NotificationHookTest extends NotificationHookTestBase { @BeforeAll static void beforeAll() { - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS)); } @AfterAll diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/TestUtils.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/TestUtils.java index 5fddc2b6ad63e..66d8f618779ec 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/TestUtils.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/TestUtils.java @@ -125,6 +125,8 @@ public final class TestUtils { .getGlobalConfiguration() .get("AZURE_METRICS_ADVISOR_AZURE_DATALAKE_ACCOUNT_KEY", "azDataLakeAccountKey"); + static final long DEFAULT_SUBSCRIBER_TIMEOUT_SECONDS = 60; + private TestUtils() { } diff --git a/sdk/metricsadvisor/tests.yml b/sdk/metricsadvisor/tests.yml index 7688b42e8a792..7153fc7142668 100644 --- a/sdk/metricsadvisor/tests.yml +++ b/sdk/metricsadvisor/tests.yml @@ -10,6 +10,9 @@ jobs: safeName: azureaimetricsadvisor EnvVars: AZURE_TEST_MODE: RECORD + AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id) + AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id) + AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret) AZURE_METRICS_ADVISOR_ENDPOINT: $(metricsadvisor-test-service-endpoint) AZURE_METRICS_ADVISOR_SUBSCRIPTION_KEY: $(metricsadvisor-test-subscription-key) AZURE_METRICS_ADVISOR_API_KEY: $(java-metricsadvisor-test-api-key)