From 6eba3d64bf155abec472f989273b56d4632cce92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Melinder?= Date: Fri, 8 Mar 2024 21:22:51 +0100 Subject: [PATCH 1/2] Set grpc timeout on all requests, not just the first one. (#355) Co-authored-by: Bjorn Melinder --- internal/pkg/grpc/client.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/pkg/grpc/client.go b/internal/pkg/grpc/client.go index db4f37f..333e1da 100644 --- a/internal/pkg/grpc/client.go +++ b/internal/pkg/grpc/client.go @@ -128,7 +128,8 @@ func (c *Client) SendRequest(serviceMethod string, message string, headers []str return response.Response{Duration: time.Duration(0), Err: errors.New("no connection available"), Type: respType} } - err = grpcurl.InvokeRPC(context.Background(), c.descriptorSource, c.conn, serviceMethod, interpolatedHeaders, loggingEventHandler, requestParser.Next) + ctx, _ := context.WithTimeout(context.Background(), time.Duration(c.timeoutMilliseconds)*time.Millisecond) + err = grpcurl.InvokeRPC(ctx, c.descriptorSource, c.conn, serviceMethod, interpolatedHeaders, loggingEventHandler, requestParser.Next) endTime := time.Now() if err != nil { log.Printf("grpc response error: %s", err) From 3dce4d4dded252d4e2b5ff4cc75ab80f3b2720d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 9 Mar 2024 13:57:39 +0000 Subject: [PATCH 2/2] build(deps-dev): bump bl from 6.0.10 to 6.0.11 in /website (#352) Bumps [bl](https://github.com/rvagg/bl) from 6.0.10 to 6.0.11. - [Release notes](https://github.com/rvagg/bl/releases) - [Changelog](https://github.com/rvagg/bl/blob/master/CHANGELOG.md) - [Commits](https://github.com/rvagg/bl/compare/v6.0.10...v6.0.11) --- updated-dependencies: - dependency-name: bl dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nikos Katirtzis --- website/package.json | 2 +- website/yarn.lock | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/website/package.json b/website/package.json index 46aafce..2bfdc99 100644 --- a/website/package.json +++ b/website/package.json @@ -13,6 +13,6 @@ "devDependencies": { "docusaurus": "1.14.7", "minimist": "1.2.8", - "bl": "6.0.10" + "bl": "6.0.11" } } diff --git a/website/yarn.lock b/website/yarn.lock index 6686d78..ea2c988 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -957,6 +957,13 @@ version "1.5.4" resolved "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz" +"@types/readable-stream@^4.0.0": + version "4.0.10" + resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-4.0.10.tgz#009bb80d5211619cdccbe0a4c075ae18ef52eab1" + dependencies: + "@types/node" "*" + safe-buffer "~5.1.1" + abort-controller@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz" @@ -1301,10 +1308,11 @@ bin-wrapper@^4.0.0: os-filter-obj "^2.0.0" pify "^4.0.1" -bl@6.0.10: - version "6.0.10" - resolved "https://registry.yarnpkg.com/bl/-/bl-6.0.10.tgz#91865ef0f07c9f2c41c99dc56189b96e036b921a" +bl@6.0.11: + version "6.0.11" + resolved "https://registry.yarnpkg.com/bl/-/bl-6.0.11.tgz#e264651d5f4adaaedf1813c94642cb24d3d30aeb" dependencies: + "@types/readable-stream" "^4.0.0" buffer "^6.0.3" inherits "^2.0.4" readable-stream "^4.2.0"