Skip to content

Upgrade Feast dependencies #876

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

Merged
feast-ci-bot merged 10 commits into from
Jul 13, 2020
Merged

Upgrade Feast dependencies #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a84576
Clean commit of dependency changes for spring-boot 2.3.0
Wirick Jul 1, 2020
60632d6
Bump to 2.3.1
Wirick Jul 3, 2020
7c2244c
Remove exlusions and Javadoc config
woop Jul 4, 2020
3224967
Remove logging exclusion for ingestion
woop Jul 4, 2020
9713075
Increase versions of grpc, protoc, protobuf, hibernate, and grpc-starter
woop Jul 4, 2020
c45a2da
Bump version of kafka-clients and spring-security-oauth
woop Jul 4, 2020
37d4208
Upgrade opencensus, beam, and google-cloud versions
woop Jul 4, 2020
e931203
fix ingestion tests
pyalex Jul 6, 2020
be42725
runtime deps
pyalex Jul 13, 2020
3ec7014
ingestion spec update: should take some time before ack
pyalex Jul 13, 2020
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
6 changes: 3 additions & 3 deletions auth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
<version>2.4.0.RELEASE</version>
<version>${grpc.spring.boot.starter.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-resource-server</artifactId>
<version>5.3.0.RELEASE</version>
<version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-jose</artifactId>
<version>5.3.0.RELEASE</version>
<version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down
40 changes: 21 additions & 19 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
<!--compile "org.springframework.boot:spring-boot-starter-web:${springBootVersion}"-->
<!--compile "org.springframework.boot:spring-boot-starter-web:${spring.boot.version}"-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
Expand All @@ -117,37 +117,42 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>5.3.0.RELEASE</version>
<version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>5.3.0.RELEASE</version>
<version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security.oauth</groupId>
<artifactId>spring-security-oauth2</artifactId>
<version>2.4.0.RELEASE</version>
<version>2.5.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-client</artifactId>
<version>5.3.0.RELEASE</version>
<version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>5.3.0.RELEASE</version>
<version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-resource-server</artifactId>
<version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-jose</artifactId>
<version>5.3.0.RELEASE</version>
</dependency>
<version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
<version>2.4.0.RELEASE</version>
<version>${grpc.spring.boot.starter.version}</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
Expand All @@ -157,14 +162,14 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-core</artifactId>
<version>5.3.0.RELEASE</version>
<version>${spring.security.version}</version>
</dependency>
<!--compile "org.springframework.boot:spring-boot-starter-data-jpa:${springBootVersion}"-->
<!--compile "org.springframework.boot:spring-boot-starter-data-jpa:${spring.boot.version}"-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<!--compile "org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}"-->
<!--compile "org.springframework.boot:spring-boot-starter-actuator:${spring.boot.version}"-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
Expand All @@ -175,17 +180,17 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
</dependency>
<!--compile "io.grpc:grpc-services:${grpcVersion}"-->
<!--compile "io.grpc:grpc-services:${grpc.version}"-->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-services</artifactId>
</dependency>
<!--compile "io.grpc:grpc-stub:${grpcVersion}"-->
<!--compile "io.grpc:grpc-stub:${grpc.version}"-->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
</dependency>
<!--compile "com.google.protobuf:protobuf-java-util:${protobufVersion}"-->
<!--compile "com.google.protobuf:protobuf-java-util:${protobuf.version}"-->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
Expand Down Expand Up @@ -288,8 +293,6 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>


<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
Expand All @@ -300,11 +303,10 @@
<artifactId>hibernate-validator-annotation-processor</artifactId>
<version>6.1.2.Final</version>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.23.0</version>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/feast/core/config/FeatureStreamConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class FeatureStreamConfig {

String DEFAULT_KAFKA_REQUEST_TIMEOUT_MS_CONFIG = "15000";
int DEFAULT_SPECS_TOPIC_PARTITIONING = 1;
short DEFAULT_SPECS_TOPIC_REPLICATION = 3;
short DEFAULT_SPECS_TOPIC_REPLICATION = 1;

@Bean
public KafkaAdmin admin(FeastProperties feastProperties) {
Expand Down
4 changes: 2 additions & 2 deletions datatypes/java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<configuration>
<checkStaleness>true</checkStaleness>
<protocArtifact>
com.google.protobuf:protoc:${protocVersion}:exe:${os.detected.classifier}
com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}
</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>
io.grpc:protoc-gen-grpc-java:${grpcVersion}:exe:${os.detected.classifier}
io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
</pluginArtifact>
</configuration>
<executions>
Expand Down
2 changes: 1 addition & 1 deletion infra/docker/ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
12 changes: 5 additions & 7 deletions ingestion/src/test/java/feast/ingestion/transform/specs/FeatureSetSpecReadAndWriteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -101,7 +99,7 @@ public static PipelineOptions makePipelineOptions() {
}

@Test
public void pipelineShouldReadSpecsAndAcknowledge() {
public void pipelineShouldReadSpecsAndAcknowledge() throws InterruptedException {
SourceProto.Source source =
SourceProto.Source.newBuilder()
.setKafkaSourceConfig(
Expand Down Expand Up @@ -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<IngestionJobProto.FeatureSetSpecAck> acks = getFeatureSetSpecAcks();

Expand All @@ -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(),
Expand All @@ -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(),
Expand Down
10 changes: 8 additions & 2 deletions ingestion/src/test/java/feast/test/TestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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()
Expand Down
Loading