Skip to content

Commit 99abe8f

Browse files
rajuGTrajuGT
andauthored
chore: elastic-search client upgrade (#59)
* chore: elastic-search client upgrade * ignore setMaxRetryTimeoutMillis config * bump up dagger version --------- Co-authored-by: rajuGT <raju.gt@gojek.com>
1 parent 2a4091b commit 99abe8f

3 files changed

Lines changed: 13 additions & 8 deletions

File tree

dagger-core/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def flinkVersion = rootProject.flinkVersion
2929
version = rootProject.file('version.txt').text.trim()
3030

3131
def minimalVersion = version
32-
def dependenciesVersion = "0.5.1"
32+
def dependenciesVersion = "0.5.2"
3333

3434
description = """dagger to the heart!"""
3535

@@ -106,7 +106,7 @@ dependencies {
106106
dependenciesJar 'com.google.protobuf:protobuf-java:3.23.2'
107107
dependenciesJar 'com.google.protobuf:protobuf-java-util:3.1.0'
108108
dependenciesJar 'org.influxdb:influxdb-java:2.8'
109-
dependenciesJar 'org.elasticsearch.client:elasticsearch-rest-client:6.6.1'
109+
dependenciesJar 'org.elasticsearch.client:elasticsearch-rest-client:8.18.1'
110110
dependenciesJar 'com.google.cloud.bigtable:bigtable-hbase-2.x:2.10.0'
111111
dependenciesJar 'org.asynchttpclient:async-http-client:2.10.1'
112112
dependenciesJar 'io.vertx:vertx-pg-client:3.9.0'

dagger-core/src/main/java/com/gotocompany/dagger/core/processors/external/es/EsAsyncConnector.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,16 @@ public EsAsyncConnector(EsSourceConfig esSourceConfig, ExternalMetricConfig exte
6666
protected void createClient() {
6767
if (esClient == null) {
6868
esClient = RestClient.builder(
69-
getHttpHosts()
70-
).setHttpClientConfigCallback(httpClientBuilder ->
71-
httpClientBuilder
72-
.setDefaultCredentialsProvider(getCredentialsProvider())
73-
.setDefaultRequestConfig(getRequestConfig())).setMaxRetryTimeoutMillis(esSourceConfig.getRetryTimeout()).build();
69+
getHttpHosts()
70+
).setHttpClientConfigCallback(httpClientBuilder ->
71+
httpClientBuilder
72+
.setDefaultCredentialsProvider(getCredentialsProvider())
73+
.setDefaultRequestConfig(getRequestConfig()))
74+
.setRequestConfigCallback(requestConfigBuilder ->
75+
requestConfigBuilder
76+
.setConnectTimeout(esSourceConfig.getConnectTimeout())
77+
.setSocketTimeout(esSourceConfig.getSocketTimeout()))
78+
.build();
7479
}
7580
}
7681

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.11.7
1+
0.11.8

0 commit comments

Comments
 (0)