Skip to content

Commit 4e80613

Browse files
Oleksii MoskalenkoWirickwoop
authored
Upgrade Feast dependencies (feast-dev#876)
* Clean commit of dependency changes for spring-boot 2.3.0 * Bump to 2.3.1 * Remove exlusions and Javadoc config * Remove logging exclusion for ingestion * Increase versions of grpc, protoc, protobuf, hibernate, and grpc-starter * Bump version of kafka-clients and spring-security-oauth * Upgrade opencensus, beam, and google-cloud versions * fix ingestion tests * runtime deps * ingestion spec update: should take some time before ack Co-authored-by: Christopher Wirick <[email protected]> Co-authored-by: Willem Pienaar <[email protected]>
1 parent 2327b29 commit 4e80613

16 files changed

Lines changed: 154 additions & 71 deletions

File tree

‎auth/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@
3131
<dependency>
3232
<groupId>net.devh</groupId>
3333
<artifactId>grpc-server-spring-boot-starter</artifactId>
34-
<version>2.4.0.RELEASE</version>
34+
<version>${grpc.spring.boot.starter.version}</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.springframework.security</groupId>
3838
<artifactId>spring-security-oauth2-resource-server</artifactId>
39-
<version>5.3.0.RELEASE</version>
39+
<version>${spring.security.version}</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>org.springframework.security</groupId>
4343
<artifactId>spring-security-oauth2-jose</artifactId>
44-
<version>5.3.0.RELEASE</version>
44+
<version>${spring.security.version}</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>org.projectlombok</groupId>

‎core/pom.xml‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<artifactId>javax.inject</artifactId>
101101
<version>1</version>
102102
</dependency>
103-
<!--compile "org.springframework.boot:spring-boot-starter-web:${springBootVersion}"-->
103+
<!--compile "org.springframework.boot:spring-boot-starter-web:${spring.boot.version}"-->
104104
<dependency>
105105
<groupId>org.springframework.boot</groupId>
106106
<artifactId>spring-boot-starter-web</artifactId>
@@ -117,37 +117,42 @@
117117
<dependency>
118118
<groupId>org.springframework.security</groupId>
119119
<artifactId>spring-security-core</artifactId>
120-
<version>5.3.0.RELEASE</version>
120+
<version>${spring.security.version}</version>
121121
</dependency>
122122
<dependency>
123123
<groupId>org.springframework.security</groupId>
124124
<artifactId>spring-security-config</artifactId>
125-
<version>5.3.0.RELEASE</version>
125+
<version>${spring.security.version}</version>
126126
</dependency>
127127
<dependency>
128128
<groupId>org.springframework.security.oauth</groupId>
129129
<artifactId>spring-security-oauth2</artifactId>
130-
<version>2.4.0.RELEASE</version>
130+
<version>2.5.0.RELEASE</version>
131131
</dependency>
132132
<dependency>
133133
<groupId>org.springframework.security</groupId>
134134
<artifactId>spring-security-oauth2-client</artifactId>
135-
<version>5.3.0.RELEASE</version>
135+
<version>${spring.security.version}</version>
136136
</dependency>
137137
<dependency>
138138
<groupId>org.springframework.security</groupId>
139139
<artifactId>spring-security-web</artifactId>
140-
<version>5.3.0.RELEASE</version>
140+
<version>${spring.security.version}</version>
141+
</dependency>
142+
<dependency>
143+
<groupId>org.springframework.security</groupId>
144+
<artifactId>spring-security-oauth2-resource-server</artifactId>
145+
<version>${spring.security.version}</version>
141146
</dependency>
142147
<dependency>
143148
<groupId>org.springframework.security</groupId>
144149
<artifactId>spring-security-oauth2-jose</artifactId>
145-
<version>5.3.0.RELEASE</version>
146-
</dependency>
150+
<version>${spring.security.version}</version>
151+
</dependency>
147152
<dependency>
148153
<groupId>net.devh</groupId>
149154
<artifactId>grpc-server-spring-boot-starter</artifactId>
150-
<version>2.4.0.RELEASE</version>
155+
<version>${grpc.spring.boot.starter.version}</version>
151156
</dependency>
152157
<dependency>
153158
<groupId>com.nimbusds</groupId>
@@ -157,14 +162,14 @@
157162
<dependency>
158163
<groupId>org.springframework.security</groupId>
159164
<artifactId>spring-security-oauth2-core</artifactId>
160-
<version>5.3.0.RELEASE</version>
165+
<version>${spring.security.version}</version>
161166
</dependency>
162-
<!--compile "org.springframework.boot:spring-boot-starter-data-jpa:${springBootVersion}"-->
167+
<!--compile "org.springframework.boot:spring-boot-starter-data-jpa:${spring.boot.version}"-->
163168
<dependency>
164169
<groupId>org.springframework.boot</groupId>
165170
<artifactId>spring-boot-starter-data-jpa</artifactId>
166171
</dependency>
167-
<!--compile "org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}"-->
172+
<!--compile "org.springframework.boot:spring-boot-starter-actuator:${spring.boot.version}"-->
168173
<dependency>
169174
<groupId>org.springframework.boot</groupId>
170175
<artifactId>spring-boot-starter-actuator</artifactId>
@@ -175,17 +180,17 @@
175180
<groupId>org.springframework.boot</groupId>
176181
<artifactId>spring-boot-configuration-processor</artifactId>
177182
</dependency>
178-
<!--compile "io.grpc:grpc-services:${grpcVersion}"-->
183+
<!--compile "io.grpc:grpc-services:${grpc.version}"-->
179184
<dependency>
180185
<groupId>io.grpc</groupId>
181186
<artifactId>grpc-services</artifactId>
182187
</dependency>
183-
<!--compile "io.grpc:grpc-stub:${grpcVersion}"-->
188+
<!--compile "io.grpc:grpc-stub:${grpc.version}"-->
184189
<dependency>
185190
<groupId>io.grpc</groupId>
186191
<artifactId>grpc-stub</artifactId>
187192
</dependency>
188-
<!--compile "com.google.protobuf:protobuf-java-util:${protobufVersion}"-->
193+
<!--compile "com.google.protobuf:protobuf-java-util:${protobuf.version}"-->
189194
<dependency>
190195
<groupId>com.google.protobuf</groupId>
191196
<artifactId>protobuf-java-util</artifactId>
@@ -288,8 +293,6 @@
288293
<groupId>javax.xml.bind</groupId>
289294
<artifactId>jaxb-api</artifactId>
290295
</dependency>
291-
292-
293296
<dependency>
294297
<groupId>org.flywaydb</groupId>
295298
<artifactId>flyway-core</artifactId>
@@ -300,11 +303,10 @@
300303
<artifactId>hibernate-validator-annotation-processor</artifactId>
301304
<version>6.1.2.Final</version>
302305
</dependency>
303-
304306
<dependency>
305307
<groupId>org.mockito</groupId>
306308
<artifactId>mockito-core</artifactId>
307-
<version>2.23.0</version>
309+
<version>${mockito.version}</version>
308310
<scope>test</scope>
309311
</dependency>
310312
<dependency>

‎core/src/main/java/feast/core/config/FeatureStreamConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class FeatureStreamConfig {
4545

4646
String DEFAULT_KAFKA_REQUEST_TIMEOUT_MS_CONFIG = "15000";
4747
int DEFAULT_SPECS_TOPIC_PARTITIONING = 1;
48-
short DEFAULT_SPECS_TOPIC_REPLICATION = 3;
48+
short DEFAULT_SPECS_TOPIC_REPLICATION = 1;
4949

5050
@Bean
5151
public KafkaAdmin admin(FeastProperties feastProperties) {

‎datatypes/java/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@
5454
<configuration>
5555
<checkStaleness>true</checkStaleness>
5656
<protocArtifact>
57-
com.google.protobuf:protoc:${protocVersion}:exe:${os.detected.classifier}
57+
com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}
5858
</protocArtifact>
5959
<pluginId>grpc-java</pluginId>
6060
<pluginArtifact>
61-
io.grpc:protoc-gen-grpc-java:${grpcVersion}:exe:${os.detected.classifier}
61+
io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
6262
</pluginArtifact>
6363
</configuration>
6464
<executions>

‎infra/docker/ci/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
3030
ENV PATH="$HOME/bin:${PATH}"
3131

3232
# Install Protoc and Plugins
33-
ENV PROTOC_VERSION 3.10.0
33+
ENV PROTOC_VERSION 3.12.2
3434

3535
RUN PROTOC_ZIP=protoc-${PROTOC_VERSION}-linux-x86_64.zip && \
3636
curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/$PROTOC_ZIP && \

‎ingestion/src/test/java/feast/ingestion/transform/specs/FeatureSetSpecReadAndWriteTest.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.stream.Collectors;
3535
import org.apache.beam.repackaged.core.org.apache.commons.lang3.tuple.Pair;
3636
import org.apache.beam.runners.direct.DirectOptions;
37-
import org.apache.beam.sdk.PipelineResult;
3837
import org.apache.beam.sdk.options.PipelineOptions;
3938
import org.apache.beam.sdk.options.PipelineOptionsFactory;
4039
import org.apache.beam.sdk.testing.TestPipeline;
@@ -44,7 +43,6 @@
4443
import org.apache.kafka.clients.consumer.KafkaConsumer;
4544
import org.apache.kafka.common.serialization.ByteArraySerializer;
4645
import org.apache.kafka.common.serialization.Deserializer;
47-
import org.joda.time.Duration;
4846
import org.junit.*;
4947

5048
public class FeatureSetSpecReadAndWriteTest {
@@ -101,7 +99,7 @@ public static PipelineOptions makePipelineOptions() {
10199
}
102100

103101
@Test
104-
public void pipelineShouldReadSpecsAndAcknowledge() {
102+
public void pipelineShouldReadSpecsAndAcknowledge() throws InterruptedException {
105103
SourceProto.Source source =
106104
SourceProto.Source.newBuilder()
107105
.setKafkaSourceConfig(
@@ -153,8 +151,8 @@ public void pipelineShouldReadSpecsAndAcknowledge() {
153151
publishSpecToKafka("project", "fs", 3, source);
154152
publishSpecToKafka("project", "fs_2", 2, source);
155153

156-
PipelineResult run = p.run();
157-
run.waitUntilFinish(Duration.standardSeconds(10));
154+
p.run();
155+
Thread.sleep(10000);
158156

159157
List<IngestionJobProto.FeatureSetSpecAck> acks = getFeatureSetSpecAcks();
160158

@@ -178,7 +176,7 @@ public void pipelineShouldReadSpecsAndAcknowledge() {
178176
// in-flight update 1
179177
publishSpecToKafka("project", "fs", 4, source);
180178

181-
run.waitUntilFinish(Duration.standardSeconds(5));
179+
Thread.sleep(5000);
182180

183181
assertThat(
184182
getFeatureSetSpecAcks(),
@@ -192,7 +190,7 @@ public void pipelineShouldReadSpecsAndAcknowledge() {
192190
// in-flight update 2
193191
publishSpecToKafka("project", "fs_2", 3, source);
194192

195-
run.waitUntilFinish(Duration.standardSeconds(5));
193+
Thread.sleep(5000);
196194

197195
assertThat(
198196
getFeatureSetSpecAcks(),

‎ingestion/src/test/java/feast/test/TestUtil.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.google.common.io.Files;
2323
import com.google.protobuf.ByteString;
2424
import com.google.protobuf.Message;
25-
import com.google.protobuf.util.Timestamps;
25+
import com.google.protobuf.Timestamp;
2626
import feast.ingestion.transform.metrics.WriteSuccessMetricsTransform;
2727
import feast.proto.core.FeatureSetProto.FeatureSet;
2828
import feast.proto.core.FeatureSetProto.FeatureSetSpec;
@@ -36,6 +36,7 @@
3636
import java.net.DatagramSocket;
3737
import java.net.SocketException;
3838
import java.nio.charset.StandardCharsets;
39+
import java.time.Instant;
3940
import java.util.ArrayList;
4041
import java.util.Arrays;
4142
import java.util.List;
@@ -218,10 +219,15 @@ public static FeatureRow createRandomFeatureRow(FeatureSetSpec featureSetSpec) {
218219
*/
219220
public static FeatureRow createRandomFeatureRow(
220221
FeatureSetSpec featureSetSpec, int randomStringSize) {
222+
223+
Instant time = Instant.now();
224+
Timestamp timestamp =
225+
Timestamp.newBuilder().setSeconds(time.getEpochSecond()).setNanos(time.getNano()).build();
226+
221227
Builder builder =
222228
FeatureRow.newBuilder()
223229
.setFeatureSet(getFeatureSetStringRef(featureSetSpec))
224-
.setEventTimestamp(Timestamps.fromMillis(System.currentTimeMillis()));
230+
.setEventTimestamp(timestamp);
225231

226232
featureSetSpec
227233
.getEntitiesList()

0 commit comments

Comments
 (0)