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 Benchmark and MeasurementSystem with population results #1164

Merged
merged 16 commits into from
Aug 31, 2023
Merged

Update Benchmark and MeasurementSystem with population results #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
10a2b64
add support for population service updated protos
stevenwarejones Aug 8, 2023
76f595d
add initial support for new population fields
stevenwarejones Aug 9, 2023
230a0d0
update commit for cmm-api
stevenwarejones Aug 9, 2023
a94d8e6
rebase
stevenwarejones Aug 10, 2023
30aef47
fixing wildcard imports
stevenwarejones Aug 10, 2023
d9e7701
fix linting
stevenwarejones Aug 10, 2023
27942f8
fix linting
stevenwarejones Aug 10, 2023
ea1e8c5
update Benchmark and MeasurementSystem with Population measurements
stevenwarejones Aug 10, 2023
760a351
fix linting
stevenwarejones Aug 11, 2023
60987d8
get tests working again
stevenwarejones Aug 29, 2023
32b6dc0
MeasurementSystem should use CreateMeasurementFlags for creating meas…
stevenwarejones Aug 29, 2023
cf3332d
Merge remote-tracking branch 'origin/main' into stevenwarejones_popul…
stevenwarejones Aug 29, 2023
94d850a
fix BenchmarkTest
stevenwarejones Aug 29, 2023
435dd85
address comments
stevenwarejones Aug 30, 2023
b214550
address comments
stevenwarejones Aug 30, 2023
2576e22
Merge branch 'main' into stevenwarejones_population_service_cmapi_2
stevenwarejones Aug 31, 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
23 changes: 21 additions & 2 deletions src/main/kotlin/org/wfanet/measurement/api/v2alpha/tools/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,25 @@ java_binary(
runtime_deps = [":encryption_public_keys"],
)

kt_jvm_library(
name = "create_measurement_flags",
srcs = [
"CreateMeasurementFlags.kt",
],
deps = [
"//src/main/proto/wfa/measurement/api/v2alpha:date_interval_kt_jvm_proto",
"//src/main/proto/wfa/measurement/api/v2alpha:measurement_spec_kt_jvm_proto",
"@wfa_common_jvm//imports/java/picocli",
],
)

kt_jvm_library(
name = "measurement_system",
srcs = ["MeasurementSystem.kt"],
srcs = [
"MeasurementSystem.kt",
],
deps = [
":create_measurement_flags",
"//src/main/kotlin/org/wfanet/measurement/api:account_constants",
"//src/main/kotlin/org/wfanet/measurement/api:api_key_constants",
"//src/main/kotlin/org/wfanet/measurement/api/v2alpha:resource_key",
Expand Down Expand Up @@ -82,8 +97,11 @@ java_binary(

kt_jvm_library(
name = "benchmark_library",
srcs = ["Benchmark.kt"],
srcs = [
"Benchmark.kt",
],
deps = [
":create_measurement_flags",
"//src/main/kotlin/org/wfanet/measurement/api:api_key_constants",
"//src/main/kotlin/org/wfanet/measurement/api/v2alpha:resource_key",
"//src/main/kotlin/org/wfanet/measurement/kingdom/deploy/common:flags",
Expand All @@ -95,6 +113,7 @@ kt_jvm_library(
"//src/main/proto/wfa/measurement/api/v2alpha:measurement_consumers_service_kt_jvm_grpc_proto",
"//src/main/proto/wfa/measurement/api/v2alpha:measurement_kt_jvm_proto",
"//src/main/proto/wfa/measurement/api/v2alpha:measurements_service_kt_jvm_grpc_proto",
"//src/main/proto/wfa/measurement/api/v2alpha:model_line_kt_jvm_proto",
"@wfa_common_jvm//imports/java/picocli",
"@wfa_common_jvm//imports/kotlin/com/google/protobuf/kotlin",
"@wfa_common_jvm//imports/kotlin/kotlinx/coroutines:core",
Expand Down
Loading