Skip to content

Commit ad7537e

Browse files
samvaitysamvaity
authored
Fix Live pipeline for Metrics Advisor (Azure#34783)
1 parent 1cd88a7 commit ad7537e

File tree

4 files changed

+49
-30
lines changed

4 files changed

+49
-30
lines changed

‎sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsAdvisorAdminClientBuilderTest.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,9 @@ private void clientBuilderWithTokenCredentialRunner(HttpClient httpClient, Metri
146146
.configuration(Configuration.getGlobalConfiguration())
147147
.httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS));
148148

149-
interceptorManager.addSanitizers(getEmailSanitizers());
149+
if (!interceptorManager.isLiveMode()) {
150+
interceptorManager.addSanitizers(getEmailSanitizers());
151+
}
150152
if (interceptorManager.isPlaybackMode()) {
151153
clientBuilder.credential(new MetricsAdvisorKeyCredential("subscription_key", "api_key"));
152154
} else {
@@ -176,7 +178,9 @@ private MetricsAdvisorAdministrationClientBuilder createClientBuilder(HttpClient
176178
.endpoint(endpoint)
177179
.httpClient(interceptorManager.isPlaybackMode() ? interceptorManager.getPlaybackClient() : httpClient)
178180
.serviceVersion(serviceVersion);
179-
interceptorManager.addSanitizers(getEmailSanitizers());
181+
if (!interceptorManager.isLiveMode()) {
182+
interceptorManager.addSanitizers(getEmailSanitizers());
183+
}
180184
if (interceptorManager.isRecordMode()) {
181185
clientBuilder.addPolicy(interceptorManager.getRecordPolicy());
182186
} else if (interceptorManager.isPlaybackMode()) {

‎sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsAdvisorAdministrationClientTestBase.java‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,30 +65,37 @@ MetricsAdvisorAdministrationClientBuilder getMetricsAdvisorAdministrationBuilder
6565
.httpClient(httpClient)
6666
.httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS))
6767
.serviceVersion(serviceVersion);
68-
interceptorManager.addSanitizers(getEmailSanitizers());
6968

7069
if (useKeyCredential) {
71-
if (interceptorManager.isPlaybackMode()) {
72-
builder.credential(new MetricsAdvisorKeyCredential("subscription_key", "api_key"));
73-
// setting bodiless matcher to "exclude" matching request bodies with UUID's
74-
interceptorManager.addMatchers(Arrays.asList(new BodilessMatcher(), new CustomMatcher().setHeadersKeyOnlyMatch(Arrays.asList("x-api-key"))));
75-
} else if (interceptorManager.isRecordMode()) {
70+
if (!interceptorManager.isPlaybackMode()) {
71+
if (interceptorManager.isRecordMode()) {
72+
builder.addPolicy(interceptorManager.getRecordPolicy());
73+
}
7674
builder
7775
.credential(new MetricsAdvisorKeyCredential(
7876
Configuration.getGlobalConfiguration().get("AZURE_METRICS_ADVISOR_SUBSCRIPTION_KEY"),
79-
Configuration.getGlobalConfiguration().get("AZURE_METRICS_ADVISOR_API_KEY")))
80-
.addPolicy(interceptorManager.getRecordPolicy());
77+
Configuration.getGlobalConfiguration().get("AZURE_METRICS_ADVISOR_API_KEY")));
78+
79+
} else {
80+
builder.credential(new MetricsAdvisorKeyCredential("subscription_key", "api_key"));
81+
// setting bodiless matcher to "exclude" matching request bodies with UUID's
82+
interceptorManager.addMatchers(Arrays.asList(new BodilessMatcher(), new CustomMatcher().setHeadersKeyOnlyMatch(Arrays.asList("x-api-key"))));
8183
}
8284
} else {
83-
if (interceptorManager.isPlaybackMode()) {
85+
if (!interceptorManager.isPlaybackMode()) {
86+
if (interceptorManager.isRecordMode()) {
87+
builder.addPolicy(interceptorManager.getRecordPolicy());
88+
}
89+
builder
90+
.credential(new DefaultAzureCredentialBuilder().build());
91+
} else {
8492
builder.credential(new MockTokenCredential());
8593
interceptorManager.addMatchers(Arrays.asList(new BodilessMatcher()));
86-
} else if (interceptorManager.isRecordMode()) {
87-
builder
88-
.credential(new DefaultAzureCredentialBuilder().build())
89-
.addPolicy(interceptorManager.getRecordPolicy());
9094
}
9195
}
96+
if (!interceptorManager.isLiveMode()) {
97+
interceptorManager.addSanitizers(getEmailSanitizers());
98+
}
9299
return builder;
93100
}
94101

‎sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientBuilderTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@ private MetricsAdvisorClientBuilder createClientBuilder(HttpClient httpClient, M
191191
.httpClient(interceptorManager.isPlaybackMode() ? interceptorManager.getPlaybackClient() : httpClient)
192192
.serviceVersion(serviceVersion);
193193

194-
interceptorManager.addSanitizers(getEmailSanitizers());
194+
if (!interceptorManager.isLiveMode()) {
195+
interceptorManager.addSanitizers(getEmailSanitizers());
196+
}
195197
if (interceptorManager.isRecordMode()) {
196198
clientBuilder.addPolicy(interceptorManager.getRecordPolicy());
197199
} else if (interceptorManager.isPlaybackMode()) {

‎sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientTestBase.java‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,30 +58,36 @@ MetricsAdvisorClientBuilder getMetricsAdvisorBuilderInternal(HttpClient httpClie
5858
.httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS))
5959
.serviceVersion(serviceVersion);
6060

61-
interceptorManager.addSanitizers(getEmailSanitizers());
6261
if (useKeyCredential) {
63-
if (interceptorManager.isPlaybackMode()) {
64-
builder.credential(new MetricsAdvisorKeyCredential("subscription_key", "api_key"));
65-
// setting bodiless matcher to "exclude" matching request bodies with UUID's
66-
interceptorManager.addMatchers(Arrays.asList(new BodilessMatcher(), new CustomMatcher().setHeadersKeyOnlyMatch(Arrays.asList("x-api-key"))));
67-
} else if (interceptorManager.isRecordMode()) {
62+
if (!interceptorManager.isPlaybackMode()) {
63+
if (interceptorManager.isRecordMode()) {
64+
builder.addPolicy(interceptorManager.getRecordPolicy());
65+
}
6866
builder
6967
.credential(new MetricsAdvisorKeyCredential(
7068
Configuration.getGlobalConfiguration().get("AZURE_METRICS_ADVISOR_SUBSCRIPTION_KEY"),
71-
Configuration.getGlobalConfiguration().get("AZURE_METRICS_ADVISOR_API_KEY")))
72-
.addPolicy(interceptorManager.getRecordPolicy());
69+
Configuration.getGlobalConfiguration().get("AZURE_METRICS_ADVISOR_API_KEY")));
70+
71+
} else {
72+
builder.credential(new MetricsAdvisorKeyCredential("subscription_key", "api_key"));
73+
// setting bodiless matcher to "exclude" matching request bodies with UUID's
74+
interceptorManager.addMatchers(Arrays.asList(new BodilessMatcher(), new CustomMatcher().setHeadersKeyOnlyMatch(Arrays.asList("x-api-key"))));
7375
}
7476
} else {
75-
if (interceptorManager.isPlaybackMode()) {
77+
if (!interceptorManager.isPlaybackMode()) {
78+
if (interceptorManager.isRecordMode()) {
79+
builder.addPolicy(interceptorManager.getRecordPolicy());
80+
}
81+
builder
82+
.credential(new DefaultAzureCredentialBuilder().build());
83+
} else {
7684
builder.credential(new MockTokenCredential());
77-
// setting bodiless matcher to "exclude" matching request bodies with UUID's
7885
interceptorManager.addMatchers(Arrays.asList(new BodilessMatcher()));
79-
} else if (interceptorManager.isRecordMode()) {
80-
builder
81-
.credential(new DefaultAzureCredentialBuilder().build())
82-
.addPolicy(interceptorManager.getRecordPolicy());
8386
}
8487
}
88+
if (!interceptorManager.isLiveMode()) {
89+
interceptorManager.addSanitizers(getEmailSanitizers());
90+
}
8591
return builder;
8692
}
8793

0 commit comments

Comments
 (0)