Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update and Fix Tests #37225

Merged
merged 13 commits into from
Dec 7, 2023
Merged

Update and Fix Tests #37225

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
08e5e4f
Add more tests
heyams Oct 18, 2023
8d50e82
Merge remote-tracking branch 'upstream/main' into heya/update-test
heyams Nov 10, 2023
b73d522
Fix wrong httpclient for statsbeat tests
heyams Nov 17, 2023
f967384
Apply do not record
heyams Dec 4, 2023
a8bdff6
Revert
heyams Dec 4, 2023
fae5329
Fix
heyams Dec 4, 2023
d7e9d76
Move statsbeat tests out of end to end
heyams Dec 4, 2023
2e6a5c7
Merge remote-tracking branch 'upstream/main' into heya/update-test
heyams Dec 5, 2023
d850b83
Fix tests
heyams Dec 5, 2023
92b580b
Update records
heyams Dec 6, 2023
a428e32
Fix imports
heyams Dec 6, 2023
fb185f0
Ingore intellij suggestion
heyams Dec 6, 2023
be6d682
Fix json
heyams Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/monitor/azure-monitor-opentelemetry-exporter/assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "java",
"TagPrefix": "java/monitor/azure-monitor-opentelemetry-exporter",
"Tag": "java/monitor/azure-monitor-opentelemetry-exporter_61683f4a82"
"Tag": "java/monitor/azure-monitor-opentelemetry-exporter_c852f179b0"
}
69 changes: 44 additions & 25 deletions ...test/java/com/azure/monitor/opentelemetry/exporter/AzureMonitorExportersEndToEndTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,32 +217,22 @@ public void testStatsbeat() throws Exception {
assertThat(customValidationPolicy.url)
.isEqualTo(new URL("https://westus-0.in.applicationinsights.azure.com/v2.1/track"));

TelemetryItem attachStatsbeat =
customValidationPolicy.actualTelemetryItems.stream()
.filter(item -> item.getName().equals("Statsbeat"))
.filter(item -> {
MetricsData metricsData = (MetricsData) item.getData().getBaseData();
return metricsData.getMetrics().stream().allMatch(metricDataPoint -> metricDataPoint.getName().equals("Attach"));
})
.findFirst()
.get();
validateAttachStatsbeat(attachStatsbeat);

TelemetryItem featureStatsbeat =
customValidationPolicy.actualTelemetryItems.stream()
.filter(item -> item.getName().equals("Statsbeat"))
.filter(item -> {
MetricsData metricsData = (MetricsData) item.getData().getBaseData();
return metricsData.getMetrics().stream().allMatch(metricDataPoint -> metricDataPoint.getName().equals("Feature"));
})
.findFirst()
.get();
validateFeatureStatsbeat(featureStatsbeat);
verifyStatsbeatTelemetry(customValidationPolicy);
}

@Test
public void testStatsbeatShutdownWhen400InvalidIKeyReturned() throws Exception {
String fakeBody = "{\"itemsReceived\":1,\"itemsAccepted\":0,\"errors\":[{\"index\":0,\"statusCode\":400,\"message\":\"Invalid instrumentation key\"}]}";
String fakeBody = "{\"itemsReceived\":4,\"itemsAccepted\":0,\"errors\":[{\"index\":0,\"statusCode\":400,\"message\":\"Invalid instrumentation key\"},{\"index\":1,\"statusCode\":400,\"message\":\"Invalid instrumentation key\"},{\"index\":2,\"statusCode\":400,\"message\":\"Invalid instrumentation key\"},{\"index\":3,\"statusCode\":400,\"message\":\"Invalid instrumentation key\"}]}";
verifyStatsbeatShutdownOrnNot(fakeBody, true);
}

@Test
public void testStatsbeatNotShutDownWhen400InvalidDataReturned() throws Exception {
String fakeBody = "{\"itemsReceived\":1,\"itemsAccepted\":0,\"errors\":[{\"index\":0,\"statusCode\":400,\"message\":\"102: Field 'time' on type 'Envelope' is not a valid time string. Expected: date, Actual: fake\"}]}";
verifyStatsbeatShutdownOrnNot(fakeBody, false);
}

private void verifyStatsbeatShutdownOrnNot(String fakeBody, boolean shutdown) throws Exception {
MockedHttpClient mockedHttpClient =
new MockedHttpClient(
request -> {
Expand All @@ -254,20 +244,49 @@ public void testStatsbeatShutdownWhen400InvalidIKeyReturned() throws Exception {
AzureMonitorExportersEndToEndTest.CustomValidationPolicy customValidationPolicy = new AzureMonitorExportersEndToEndTest.CustomValidationPolicy(countDownLatch);
OpenTelemetrySdk openTelemetrySdk =
TestUtils.createOpenTelemetrySdk(
getHttpPipeline(customValidationPolicy, mockedHttpClient), getConfiguration(), STATSBEAT_CONNECTION_STRING);
getHttpPipeline(customValidationPolicy, mockedHttpClient), getStatsbeatConfiguration(), STATSBEAT_CONNECTION_STRING);

generateMetric(openTelemetrySdk);

// close to flush
openTelemetrySdk.close();

Thread.sleep(1000);
Thread.sleep(2000);

// wait for export
countDownLatch.await(10, SECONDS);
assertThat(customValidationPolicy.url)
.isEqualTo(new URL("https://westus-0.in.applicationinsights.azure.com/v2.1/track"));
assertThat(customValidationPolicy.actualTelemetryItems.stream().filter(item -> item.getName().equals("Statsbeat")).count()).isEqualTo(0);

if (shutdown) {
assertThat(customValidationPolicy.actualTelemetryItems.stream().filter(item -> item.getName().equals("Statsbeat")).count()).isEqualTo(0);
} else {
verifyStatsbeatTelemetry(customValidationPolicy);
}
}

private void verifyStatsbeatTelemetry(CustomValidationPolicy customValidationPolicy) {
TelemetryItem attachStatsbeat =
customValidationPolicy.actualTelemetryItems.stream()
.filter(item -> item.getName().equals("Statsbeat"))
.filter(item -> {
MetricsData metricsData = (MetricsData) item.getData().getBaseData();
return metricsData.getMetrics().stream().allMatch(metricDataPoint -> metricDataPoint.getName().equals("Attach"));
})
.findFirst()
.get();
validateAttachStatsbeat(attachStatsbeat);

TelemetryItem featureStatsbeat =
customValidationPolicy.actualTelemetryItems.stream()
.filter(item -> item.getName().equals("Statsbeat"))
.filter(item -> {
MetricsData metricsData = (MetricsData) item.getData().getBaseData();
return metricsData.getMetrics().stream().allMatch(metricDataPoint -> metricDataPoint.getName().equals("Feature"));
})
.findFirst()
.get();
validateFeatureStatsbeat(featureStatsbeat);
}

private static Map<String, String> getConfiguration() {
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/java/com/azure/monitor/opentelemetry/exporter/MonitorExporterClientTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ HttpPipeline getHttpPipeline(@Nullable HttpPipelinePolicy policy, HttpClient htt
policies.add(interceptorManager.getRecordPolicy());
}

if (getTestMode() == TestMode.PLAYBACK) {
if (getTestMode() == TestMode.PLAYBACK && httpClient == null) {
httpClient = interceptorManager.getPlaybackClient();
}

Expand Down