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

fix: Modify IDs used in Report creation in Cloud Correctness Test #1950

Merged
merged 5 commits into from
Dec 5, 2024
Merged

fix: Modify IDs used in Report creation in Cloud Correctness Test #1950

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f9e7e7
fix id
tristanvuong2021 Dec 3, 2024
48983d1
lint fix
tristanvuong2021 Dec 3, 2024
296a22d
Merge branch 'main' into tristanvuong-fix-report-creation-for-cloud-c…
tristanvuong2021 Dec 4, 2024
2129537
Merge branch 'main' into tristanvuong-fix-report-creation-for-cloud-c…
tristanvuong2021 Dec 4, 2024
c805a3a
Merge branch 'main' into tristanvuong-fix-report-creation-for-cloud-c…
tristanvuong2021 Dec 5, 2024
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
15 changes: 9 additions & 6 deletions src/main/kotlin/org/wfanet/measurement/loadtest/reporting/ReportingUserSimulator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ class ReportingUserSimulator(
.firstOrNull {
getDataProvider(it.cmmsDataProvider).capabilities.honestMajorityShareShuffleSupported
} ?: listEventGroups().first()
val createdPrimitiveReportingSet = createPrimitiveReportingSet(eventGroup)
val createdMetricCalculationSpec = createMetricCalculationSpec()
val createdPrimitiveReportingSet = createPrimitiveReportingSet(eventGroup, runId)
val createdMetricCalculationSpec = createMetricCalculationSpec(runId)

val report = report {
reportingMetricEntries +=
Expand Down Expand Up @@ -154,7 +154,10 @@ class ReportingUserSimulator(
}
}

private suspend fun createPrimitiveReportingSet(eventGroup: EventGroup): ReportingSet {
private suspend fun createPrimitiveReportingSet(
eventGroup: EventGroup,
runId: String,
): ReportingSet {
val primitiveReportingSet = reportingSet {
primitive = ReportingSetKt.primitive { cmmsEventGroups += eventGroup.cmmsEventGroup }
}
Expand All @@ -164,20 +167,20 @@ class ReportingUserSimulator(
createReportingSetRequest {
parent = measurementConsumerName
reportingSet = primitiveReportingSet
reportingSetId = "a-123"
reportingSetId = "a-$runId"
}
)
} catch (e: StatusException) {
throw Exception("Error creating ReportingSet", e)
}
}

private suspend fun createMetricCalculationSpec(): MetricCalculationSpec {
private suspend fun createMetricCalculationSpec(runId: String): MetricCalculationSpec {
try {
return metricCalculationSpecsClient.createMetricCalculationSpec(
createMetricCalculationSpecRequest {
parent = measurementConsumerName
metricCalculationSpecId = "a-123"
metricCalculationSpecId = "a-$runId"
metricCalculationSpec = metricCalculationSpec {
displayName = "union reach"
metricSpecs += metricSpec {
Expand Down