From 2864777700b58fefd0d7cfb329577f6833342190 Mon Sep 17 00:00:00 2001 From: Prashant Pandey Date: Fri, 9 Jul 2021 22:05:11 +0530 Subject: [PATCH 1/5] Added config for gateway gRPC client deadline --- hypertrace-graphql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypertrace-graphql b/hypertrace-graphql index cef8ab9..2f11a3a 160000 --- a/hypertrace-graphql +++ b/hypertrace-graphql @@ -1 +1 @@ -Subproject commit cef8ab9b579df1208d2fc783209bf0416021ce94 +Subproject commit 2f11a3a35497c77822fb176b38df739ffc4d2dc0 From 5ceadb64c2642c592e49fe6d3fd1c8057cb42cdf Mon Sep 17 00:00:00 2001 From: Prashant Pandey Date: Fri, 9 Jul 2021 22:05:19 +0530 Subject: [PATCH 2/5] Added config for gateway gRPC client deadline --- .../hypertrace-graphql-service/default-cluster/application.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hypertrace-service/src/main/resources/configs/hypertrace-graphql-service/default-cluster/application.conf b/hypertrace-service/src/main/resources/configs/hypertrace-graphql-service/default-cluster/application.conf index f549973..fc4bb9a 100644 --- a/hypertrace-service/src/main/resources/configs/hypertrace-graphql-service/default-cluster/application.conf +++ b/hypertrace-service/src/main/resources/configs/hypertrace-graphql-service/default-cluster/application.conf @@ -12,6 +12,8 @@ gateway.service = { host = ${?GATEWAY_SERVICE_HOST_CONFIG} port = 9001 port = ${?GATEWAY_SERVICE_PORT_CONFIG} + deadline = 30 + deadline = ${?GATEWAY_SERVICE_DEADLINE} } entity.service = { From 1e1d041d509b59177e1685b685ae6aba8ee1d300 Mon Sep 17 00:00:00 2001 From: Prashant Pandey Date: Sat, 10 Jul 2021 00:28:47 +0530 Subject: [PATCH 3/5] Changed gateway-service client timeout unit to java.time.Duration and added fallback configuration --- hypertrace-graphql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypertrace-graphql b/hypertrace-graphql index 2f11a3a..acb14fe 160000 --- a/hypertrace-graphql +++ b/hypertrace-graphql @@ -1 +1 @@ -Subproject commit 2f11a3a35497c77822fb176b38df739ffc4d2dc0 +Subproject commit acb14fe34135a4613e1856cd3c404ebed4d47276 From c772a3996e12834387bfa861254d1a8ac8cc6312 Mon Sep 17 00:00:00 2001 From: Prashant Pandey Date: Sat, 10 Jul 2021 00:29:41 +0530 Subject: [PATCH 4/5] Changed gateway-service client timeout placeholder name (gateway.service.deadline -> gateway.service.timeout) --- .../default-cluster/application.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hypertrace-service/src/main/resources/configs/hypertrace-graphql-service/default-cluster/application.conf b/hypertrace-service/src/main/resources/configs/hypertrace-graphql-service/default-cluster/application.conf index fc4bb9a..637e651 100644 --- a/hypertrace-service/src/main/resources/configs/hypertrace-graphql-service/default-cluster/application.conf +++ b/hypertrace-service/src/main/resources/configs/hypertrace-graphql-service/default-cluster/application.conf @@ -12,8 +12,8 @@ gateway.service = { host = ${?GATEWAY_SERVICE_HOST_CONFIG} port = 9001 port = ${?GATEWAY_SERVICE_PORT_CONFIG} - deadline = 30 - deadline = ${?GATEWAY_SERVICE_DEADLINE} + timeout = 10s + timeout = ${?GATEWAY_SERVICE_TIMEOUT} } entity.service = { From ac884ca0ceed1272dfc4a55e445c84a53c6b580c Mon Sep 17 00:00:00 2001 From: Prashant Pandey Date: Sat, 10 Jul 2021 21:00:19 +0530 Subject: [PATCH 5/5] updated submodule ref --- entity-service | 2 +- hypertrace-graphql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/entity-service b/entity-service index 200095f..88a7e4c 160000 --- a/entity-service +++ b/entity-service @@ -1 +1 @@ -Subproject commit 200095f2d5486e38bfe554f39dea250908f472c2 +Subproject commit 88a7e4c0b77e538daf73663e092fbd3c6d067d40 diff --git a/hypertrace-graphql b/hypertrace-graphql index acb14fe..2cdb158 160000 --- a/hypertrace-graphql +++ b/hypertrace-graphql @@ -1 +1 @@ -Subproject commit acb14fe34135a4613e1856cd3c404ebed4d47276 +Subproject commit 2cdb158f0d2ae07a599dcce640e032b517037c22