Merge branch 'main' into dependabot/go_modules/golang.org/x/net-0.21.0

ExpediaGroup · Mar 9, 2024 · d2c9503 · d2c9503
2 parents e5344a4 + 3dce4d4
commit d2c9503
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git 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)

diff --git 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
@@ -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"
 
-[email protected].10:
-  version "6.0.10"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-6.0.10.tgz#91865ef0f07c9f2c41c99dc56189b96e036b921a"
+[email protected].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"