From 38dfc808e17001d84ae830428df99c65a7000e80 Mon Sep 17 00:00:00 2001 From: Christopher Wirick Date: Wed, 1 Jul 2020 09:40:05 -0700 Subject: [PATCH 1/8] Clean commit of dependency changes for spring-boot 2.3.0 --- core/pom.xml | 19 ++++++++++++------- ingestion/pom.xml | 10 ++++++++++ pom.xml | 16 ++++++++++++++-- serving/pom.xml | 6 ++++++ storage/api/pom.xml | 10 ++++++++++ storage/connectors/bigquery/pom.xml | 10 ++++++++++ 6 files changed, 62 insertions(+), 9 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 4a0d3791c92..ce31fdc0962 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -117,12 +117,12 @@ org.springframework.security spring-security-core - 5.3.0.RELEASE + ${spring.security.version} org.springframework.security spring-security-config - 5.3.0.RELEASE + ${spring.security.version} org.springframework.security.oauth @@ -132,18 +132,23 @@ org.springframework.security spring-security-oauth2-client - 5.3.0.RELEASE + ${spring.security.version} org.springframework.security spring-security-web - 5.3.0.RELEASE + ${spring.security.version} + + + org.springframework.security + spring-security-oauth2-resource-server + ${spring.security.version} org.springframework.security spring-security-oauth2-jose - 5.3.0.RELEASE - + ${spring.security.version} + net.devh grpc-server-spring-boot-starter @@ -157,7 +162,7 @@ org.springframework.security spring-security-oauth2-core - 5.3.0.RELEASE + ${spring.security.version} diff --git a/ingestion/pom.xml b/ingestion/pom.xml index de50789a67b..281d6775d34 100644 --- a/ingestion/pom.xml +++ b/ingestion/pom.xml @@ -211,6 +211,16 @@ org.apache.beam beam-sdks-java-io-kafka ${org.apache.beam.version} + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + diff --git a/pom.xml b/pom.xml index 4f1a5dc6244..7675316f715 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,9 @@ 1.17.1 3.10.0 3.10.0 - 2.0.9.RELEASE + 2.3.0.RELEASE + 5.3.0.RELEASE + 2.4.0.RELEASE 2.18.0 1.91.0 0.8.0 @@ -63,7 +65,9 @@ 0.21.0 2.12.1 - 5.2.4 + 6.0.8 + 2.9.9 + 2.0.2 @@ -207,6 +211,11 @@ + + joda-time + joda-time + ${joda.time.version} + com.datadoghq java-dogstatsd-client @@ -367,6 +376,9 @@ jar + + ${java.home}/bin/javadoc + diff --git a/serving/pom.xml b/serving/pom.xml index 66a840e0097..a06f691fa97 100644 --- a/serving/pom.xml +++ b/serving/pom.xml @@ -278,6 +278,12 @@ embedded-redis test + + + jakarta.validation + jakarta.validation-api + ${jakarta.validation.api.version} + diff --git a/storage/api/pom.xml b/storage/api/pom.xml index 231471e9cbf..1348df3214d 100644 --- a/storage/api/pom.xml +++ b/storage/api/pom.xml @@ -46,6 +46,16 @@ org.apache.beam beam-sdks-java-core ${org.apache.beam.version} + + + org.slf4j + slf4j-log4j12 + + + org.slf4j + slf4j-api + + diff --git a/storage/connectors/bigquery/pom.xml b/storage/connectors/bigquery/pom.xml index 32c6dda4810..4af7656be82 100644 --- a/storage/connectors/bigquery/pom.xml +++ b/storage/connectors/bigquery/pom.xml @@ -17,6 +17,16 @@ io.pebbletemplates pebble 3.1.0 + + + org.slf4j + slf4j-log4j12 + + + org.slf4j + slf4j-api + + From e094d4557a9fd4768d3de437e0ebd02baf3a0e42 Mon Sep 17 00:00:00 2001 From: Christopher Wirick Date: Fri, 3 Jul 2020 13:03:53 -0700 Subject: [PATCH 2/8] Bump to 2.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7675316f715..d88cdb7c579 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 1.17.1 3.10.0 3.10.0 - 2.3.0.RELEASE + 2.3.1.RELEASE 5.3.0.RELEASE 2.4.0.RELEASE 2.18.0 From b07a2e6c8fbfb547a075a51e4ddca437c24cde9b Mon Sep 17 00:00:00 2001 From: Willem Pienaar Date: Sat, 4 Jul 2020 14:43:58 +0800 Subject: [PATCH 3/8] Remove exlusions and Javadoc config --- pom.xml | 3 --- storage/api/pom.xml | 10 ---------- storage/connectors/bigquery/pom.xml | 10 ---------- 3 files changed, 23 deletions(-) diff --git a/pom.xml b/pom.xml index d88cdb7c579..66f5dbfb92c 100644 --- a/pom.xml +++ b/pom.xml @@ -376,9 +376,6 @@ jar - - ${java.home}/bin/javadoc - diff --git a/storage/api/pom.xml b/storage/api/pom.xml index 1348df3214d..231471e9cbf 100644 --- a/storage/api/pom.xml +++ b/storage/api/pom.xml @@ -46,16 +46,6 @@ org.apache.beam beam-sdks-java-core ${org.apache.beam.version} - - - org.slf4j - slf4j-log4j12 - - - org.slf4j - slf4j-api - - diff --git a/storage/connectors/bigquery/pom.xml b/storage/connectors/bigquery/pom.xml index 4af7656be82..32c6dda4810 100644 --- a/storage/connectors/bigquery/pom.xml +++ b/storage/connectors/bigquery/pom.xml @@ -17,16 +17,6 @@ io.pebbletemplates pebble 3.1.0 - - - org.slf4j - slf4j-log4j12 - - - org.slf4j - slf4j-api - - From 9f6a3c37a1c432f4e10b4e81bfc11933178622c5 Mon Sep 17 00:00:00 2001 From: Willem Pienaar Date: Sat, 4 Jul 2020 19:11:04 +0800 Subject: [PATCH 4/8] Remove logging exclusion for ingestion --- ingestion/pom.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ingestion/pom.xml b/ingestion/pom.xml index 281d6775d34..de50789a67b 100644 --- a/ingestion/pom.xml +++ b/ingestion/pom.xml @@ -211,16 +211,6 @@ org.apache.beam beam-sdks-java-io-kafka ${org.apache.beam.version} - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - From 0fde89bd95a44903a6affbe31f8ad5ac270683de Mon Sep 17 00:00:00 2001 From: Willem Pienaar Date: Sat, 4 Jul 2020 22:40:19 +0800 Subject: [PATCH 5/8] Increase versions of grpc, protoc, protobuf, hibernate, and grpc-starter --- auth/pom.xml | 6 ++-- core/pom.xml | 19 +++++----- datatypes/java/pom.xml | 4 +-- infra/docker/ci/Dockerfile | 2 +- .../src/test/java/feast/test/TestUtil.java | 10 ++++-- pom.xml | 36 +++++++++---------- serving/pom.xml | 12 +++---- .../storage/common/testing/TestUtil.java | 10 ++++-- storage/connectors/bigquery/pom.xml | 6 ++++ storage/connectors/redis/pom.xml | 2 +- 10 files changed, 61 insertions(+), 46 deletions(-) diff --git a/auth/pom.xml b/auth/pom.xml index 4804075f8c5..0716ce97983 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -20,17 +20,17 @@ net.devh grpc-server-spring-boot-starter - 2.4.0.RELEASE + ${grpc.spring.boot.starter.version} org.springframework.security spring-security-oauth2-resource-server - 5.3.0.RELEASE + ${spring.security.version} org.springframework.security spring-security-oauth2-jose - 5.3.0.RELEASE + ${spring.security.version} sh.ory.keto diff --git a/core/pom.xml b/core/pom.xml index ce31fdc0962..5aed944ad46 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -100,7 +100,7 @@ javax.inject 1 - + org.springframework.boot spring-boot-starter-web @@ -152,7 +152,7 @@ net.devh grpc-server-spring-boot-starter - 2.4.0.RELEASE + ${grpc.spring.boot.starter.version} com.nimbusds @@ -164,12 +164,12 @@ spring-security-oauth2-core ${spring.security.version} - + org.springframework.boot spring-boot-starter-data-jpa - + org.springframework.boot spring-boot-starter-actuator @@ -180,17 +180,17 @@ org.springframework.boot spring-boot-configuration-processor - + io.grpc grpc-services - + io.grpc grpc-stub - + com.google.protobuf protobuf-java-util @@ -293,8 +293,6 @@ javax.xml.bind jaxb-api - - org.flywaydb flyway-core @@ -305,11 +303,10 @@ hibernate-validator-annotation-processor 6.1.2.Final - org.mockito mockito-core - 2.23.0 + ${mockito.version} test diff --git a/datatypes/java/pom.xml b/datatypes/java/pom.xml index 5810a6db96a..dd2a162c01c 100644 --- a/datatypes/java/pom.xml +++ b/datatypes/java/pom.xml @@ -54,11 +54,11 @@ true - com.google.protobuf:protoc:${protocVersion}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:${grpcVersion}:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} diff --git a/infra/docker/ci/Dockerfile b/infra/docker/ci/Dockerfile index 08da02ae202..4e7c383524e 100644 --- a/infra/docker/ci/Dockerfile +++ b/infra/docker/ci/Dockerfile @@ -30,7 +30,7 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH ENV PATH="$HOME/bin:${PATH}" # Install Protoc and Plugins -ENV PROTOC_VERSION 3.10.0 +ENV PROTOC_VERSION 3.12.2 RUN PROTOC_ZIP=protoc-${PROTOC_VERSION}-linux-x86_64.zip && \ curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/$PROTOC_ZIP && \ diff --git a/ingestion/src/test/java/feast/test/TestUtil.java b/ingestion/src/test/java/feast/test/TestUtil.java index f3ae9f6a988..b003137846b 100644 --- a/ingestion/src/test/java/feast/test/TestUtil.java +++ b/ingestion/src/test/java/feast/test/TestUtil.java @@ -22,7 +22,7 @@ import com.google.common.io.Files; import com.google.protobuf.ByteString; import com.google.protobuf.Message; -import com.google.protobuf.util.Timestamps; +import com.google.protobuf.Timestamp; import feast.ingestion.transform.metrics.WriteSuccessMetricsTransform; import feast.proto.core.FeatureSetProto.FeatureSet; import feast.proto.core.FeatureSetProto.FeatureSetSpec; @@ -36,6 +36,7 @@ import java.net.DatagramSocket; import java.net.SocketException; import java.nio.charset.StandardCharsets; +import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -218,10 +219,15 @@ public static FeatureRow createRandomFeatureRow(FeatureSetSpec featureSetSpec) { */ public static FeatureRow createRandomFeatureRow( FeatureSetSpec featureSetSpec, int randomStringSize) { + + Instant time = Instant.now(); + Timestamp timestamp = + Timestamp.newBuilder().setSeconds(time.getEpochSecond()).setNanos(time.getNano()).build(); + Builder builder = FeatureRow.newBuilder() .setFeatureSet(getFeatureSetStringRef(featureSetSpec)) - .setEventTimestamp(Timestamps.fromMillis(System.currentTimeMillis())); + .setEventTimestamp(timestamp); featureSetSpec .getEntitiesList() diff --git a/pom.xml b/pom.xml index 66f5dbfb92c..22eca85921b 100644 --- a/pom.xml +++ b/pom.xml @@ -47,18 +47,18 @@ UTF-8 UTF-8 - 1.17.1 - 3.10.0 - 3.10.0 - 2.3.1.RELEASE + 1.30.2 + 3.12.2 + 3.12.2 + 2.3.1.RELEASE 5.3.0.RELEASE - 2.4.0.RELEASE + 2.9.0.RELEASE 2.18.0 1.91.0 0.8.0 1.9.10 1.3 - 5.3.6.Final + 5.4.18.Final 2.3.0 2.28.2 @@ -157,37 +157,37 @@ io.grpc grpc-core - ${grpcVersion} + ${grpc.version} io.grpc grpc-netty - ${grpcVersion} + ${grpc.version} io.grpc grpc-netty-shaded - ${grpcVersion} + ${grpc.version} io.grpc grpc-protobuf - ${grpcVersion} + ${grpc.version} io.grpc grpc-services - ${grpcVersion} + ${grpc.version} io.grpc grpc-stub - ${grpcVersion} + ${grpc.version} io.grpc grpc-testing - ${grpcVersion} + ${grpc.version} test @@ -229,12 +229,12 @@ com.google.protobuf protobuf-java - ${protobufVersion} + ${protobuf.version} com.google.protobuf protobuf-java-util - ${protobufVersion} + ${protobuf.version} org.projectlombok @@ -281,7 +281,7 @@ org.springframework.boot spring-boot-starter-web - ${springBootVersion} + ${spring.boot.version} org.springframework.boot @@ -325,7 +325,7 @@ org.springframework.boot spring-boot-dependencies - ${springBootVersion} + ${spring.boot.version} pom import @@ -652,7 +652,7 @@ org.springframework.boot spring-boot-maven-plugin - ${springBootVersion} + ${spring.boot.version} diff --git a/serving/pom.xml b/serving/pom.xml index a06f691fa97..986775058d8 100644 --- a/serving/pom.xml +++ b/serving/pom.xml @@ -134,7 +134,7 @@ true - + org.springframework.boot spring-boot-starter-web @@ -161,23 +161,23 @@ grpc-spring-boot-starter - + org.springframework.boot spring-boot-starter-actuator - + io.grpc grpc-services - + io.grpc grpc-stub - + com.google.protobuf protobuf-java-util @@ -249,7 +249,7 @@ - + io.grpc grpc-testing diff --git a/storage/api/src/main/java/feast/storage/common/testing/TestUtil.java b/storage/api/src/main/java/feast/storage/common/testing/TestUtil.java index 43a96e97efa..5f191d276ce 100644 --- a/storage/api/src/main/java/feast/storage/common/testing/TestUtil.java +++ b/storage/api/src/main/java/feast/storage/common/testing/TestUtil.java @@ -17,13 +17,14 @@ package feast.storage.common.testing; import com.google.protobuf.ByteString; -import com.google.protobuf.util.Timestamps; +import com.google.protobuf.Timestamp; import feast.proto.core.FeatureSetProto.FeatureSet; import feast.proto.core.FeatureSetProto.FeatureSetSpec; import feast.proto.types.FeatureRowProto.FeatureRow; import feast.proto.types.FeatureRowProto.FeatureRow.Builder; import feast.proto.types.FieldProto.Field; import feast.proto.types.ValueProto.*; +import java.time.Instant; import java.util.concurrent.ThreadLocalRandom; import org.apache.commons.lang3.RandomStringUtils; @@ -53,10 +54,15 @@ public static FeatureRow createRandomFeatureRow(FeatureSet featureSet) { * @return {@link FeatureRow} */ public static FeatureRow createRandomFeatureRow(FeatureSet featureSet, int randomStringSize) { + + Instant time = Instant.now(); + Timestamp timestamp = + Timestamp.newBuilder().setSeconds(time.getEpochSecond()).setNanos(time.getNano()).build(); + Builder builder = FeatureRow.newBuilder() .setFeatureSet(getFeatureSetReference(featureSet)) - .setEventTimestamp(Timestamps.fromMillis(System.currentTimeMillis())); + .setEventTimestamp(timestamp); featureSet .getSpec() diff --git a/storage/connectors/bigquery/pom.xml b/storage/connectors/bigquery/pom.xml index 32c6dda4810..1b97d57b2cb 100644 --- a/storage/connectors/bigquery/pom.xml +++ b/storage/connectors/bigquery/pom.xml @@ -96,5 +96,11 @@ hamcrest-library test + + org.mockito + mockito-core + ${mockito.version} + test + diff --git a/storage/connectors/redis/pom.xml b/storage/connectors/redis/pom.xml index 3aa863f6811..807ee86fe5e 100644 --- a/storage/connectors/redis/pom.xml +++ b/storage/connectors/redis/pom.xml @@ -45,7 +45,7 @@ org.mockito mockito-core - 2.23.0 + ${mockito.version} test From db6a379efb07673871c3f36294e4d6e8e485db62 Mon Sep 17 00:00:00 2001 From: Willem Pienaar Date: Sat, 4 Jul 2020 23:07:32 +0800 Subject: [PATCH 6/8] Bump version of kafka-clients and spring-security-oauth --- core/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 5aed944ad46..716d8fdd394 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -127,7 +127,7 @@ org.springframework.security.oauth spring-security-oauth2 - 2.4.0.RELEASE + 2.5.0.RELEASE org.springframework.security diff --git a/pom.xml b/pom.xml index 22eca85921b..fc71599a17a 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 1.9.10 1.3 5.4.18.Final - 2.3.0 + 2.5.0 2.28.2 0.21.0 From 52c94191d40b5aed23b51e30b2cb8bfc563c2e7f Mon Sep 17 00:00:00 2001 From: Willem Pienaar Date: Sun, 5 Jul 2020 01:20:15 +0800 Subject: [PATCH 7/8] Upgrade opencensus, beam, and google-cloud versions --- pom.xml | 43 +++++++++++++++++-- .../serving/service/OnlineServingService.java | 2 +- .../compression/FeatureRowsBatch.java | 2 +- .../io/gcp/bigquery/BatchLoadsWithResult.java | 4 +- 4 files changed, 44 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index fc71599a17a..f403f3d2beb 100644 --- a/pom.xml +++ b/pom.xml @@ -53,8 +53,8 @@ 2.3.1.RELEASE 5.3.0.RELEASE 2.9.0.RELEASE - 2.18.0 - 1.91.0 + 2.22.0 + 1.111.1 0.8.0 1.9.10 1.3 @@ -62,7 +62,7 @@ 2.5.0 2.28.2 - 0.21.0 + 0.26.0 2.12.1 6.0.8 @@ -159,6 +159,41 @@ grpc-core ${grpc.version} + + io.grpc + grpc-api + ${grpc.version} + + + io.grpc + grpc-context + ${grpc.version} + + + io.grpc + grpc-all + ${grpc.version} + + + io.grpc + grpc-okhttp + ${grpc.version} + + + io.grpc + grpc-auth + ${grpc.version} + + + io.grpc + grpc-grpclb + ${grpc.version} + + + io.grpc + grpc-alts + ${grpc.version} + io.grpc grpc-netty @@ -195,7 +230,7 @@ io.github.lognet grpc-spring-boot-starter - 3.0.2 + 3.5.5 diff --git a/serving/src/main/java/feast/serving/service/OnlineServingService.java b/serving/src/main/java/feast/serving/service/OnlineServingService.java index a357904e32f..a7d9d284aa2 100644 --- a/serving/src/main/java/feast/serving/service/OnlineServingService.java +++ b/serving/src/main/java/feast/serving/service/OnlineServingService.java @@ -17,6 +17,7 @@ package feast.serving.service; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Streams; import com.google.protobuf.Duration; import feast.common.models.Feature; import feast.common.models.FeatureSet; @@ -36,7 +37,6 @@ import io.opentracing.Tracer; import java.util.*; import java.util.stream.Collectors; -import org.apache.beam.vendor.grpc.v1p21p0.com.google.common.collect.Streams; import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; diff --git a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/compression/FeatureRowsBatch.java b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/compression/FeatureRowsBatch.java index ee5b1d67bce..854b9cc7148 100644 --- a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/compression/FeatureRowsBatch.java +++ b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/compression/FeatureRowsBatch.java @@ -169,7 +169,7 @@ public FeatureRowsBatch withFeatureSetReference(String featureSetReference) { } public Row toRow() { - return Row.withSchema(schema).attachValues(values).build(); + return Row.withSchema(schema).attachValues(values); } public static FeatureRowsBatch fromRow(Row row) { diff --git a/storage/connectors/bigquery/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoadsWithResult.java b/storage/connectors/bigquery/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoadsWithResult.java index c0c3f6f84c2..1d1ea2c951c 100644 --- a/storage/connectors/bigquery/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoadsWithResult.java +++ b/storage/connectors/bigquery/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoadsWithResult.java @@ -1,7 +1,7 @@ package org.apache.beam.sdk.io.gcp.bigquery; import static org.apache.beam.sdk.io.gcp.bigquery.BigQueryHelpers.resolveTempLocation; -import static org.apache.beam.vendor.grpc.v1p21p0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.grpc.v1p26p0.com.google.common.base.Preconditions.checkArgument; import com.google.api.services.bigquery.model.TableRow; import com.google.auto.value.AutoValue; @@ -312,6 +312,8 @@ PCollection> writeSinglePartitionWithResult( getIgnoreUnknownValues(), getKmsKey(), getRowWriterFactory().getSourceFormat(), + true, getSchemaUpdateOptions())); } + } From 9912990b74ba1a0a7a0e61bec88d551851f55220 Mon Sep 17 00:00:00 2001 From: pyalex Date: Mon, 6 Jul 2020 11:24:59 +0300 Subject: [PATCH 8/8] fix ingestion tests --- .../specs/FeatureSetSpecReadAndWriteTest.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ingestion/src/test/java/feast/ingestion/transform/specs/FeatureSetSpecReadAndWriteTest.java b/ingestion/src/test/java/feast/ingestion/transform/specs/FeatureSetSpecReadAndWriteTest.java index e73123a810e..340af58e8c5 100644 --- a/ingestion/src/test/java/feast/ingestion/transform/specs/FeatureSetSpecReadAndWriteTest.java +++ b/ingestion/src/test/java/feast/ingestion/transform/specs/FeatureSetSpecReadAndWriteTest.java @@ -34,7 +34,6 @@ import java.util.stream.Collectors; import org.apache.beam.repackaged.core.org.apache.commons.lang3.tuple.Pair; import org.apache.beam.runners.direct.DirectOptions; -import org.apache.beam.sdk.PipelineResult; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.testing.TestPipeline; @@ -44,7 +43,6 @@ import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.common.serialization.Deserializer; -import org.joda.time.Duration; import org.junit.*; public class FeatureSetSpecReadAndWriteTest { @@ -101,7 +99,7 @@ public static PipelineOptions makePipelineOptions() { } @Test - public void pipelineShouldReadSpecsAndAcknowledge() { + public void pipelineShouldReadSpecsAndAcknowledge() throws InterruptedException { SourceProto.Source source = SourceProto.Source.newBuilder() .setKafkaSourceConfig( @@ -153,8 +151,8 @@ public void pipelineShouldReadSpecsAndAcknowledge() { publishSpecToKafka("project", "fs", 3, source); publishSpecToKafka("project", "fs_2", 2, source); - PipelineResult run = p.run(); - run.waitUntilFinish(Duration.standardSeconds(10)); + p.run(); + Thread.sleep(10000); List acks = getFeatureSetSpecAcks(); @@ -178,7 +176,7 @@ public void pipelineShouldReadSpecsAndAcknowledge() { // in-flight update 1 publishSpecToKafka("project", "fs", 4, source); - run.waitUntilFinish(Duration.standardSeconds(5)); + Thread.sleep(5000); assertThat( getFeatureSetSpecAcks(), @@ -192,7 +190,7 @@ public void pipelineShouldReadSpecsAndAcknowledge() { // in-flight update 2 publishSpecToKafka("project", "fs_2", 3, source); - run.waitUntilFinish(Duration.standardSeconds(5)); + Thread.sleep(5000); assertThat( getFeatureSetSpecAcks(),