From 0cd0340b32cf9008b5b9403bf3016cbbb3d322c3 Mon Sep 17 00:00:00 2001 From: rohanshah18 Date: Wed, 27 Sep 2023 16:30:03 -0400 Subject: [PATCH 1/2] Update grpc version to 1.58.0 --- build.gradle | 2 +- src/main/java/io/pinecone/PineconeConnection.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 606d871e..933e138c 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ repositories { jcenter() } -def grpcVersion = '1.53.0' +def grpcVersion = '1.58.0' dependencies { api "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/src/main/java/io/pinecone/PineconeConnection.java b/src/main/java/io/pinecone/PineconeConnection.java index 00e5f41b..5d74189d 100644 --- a/src/main/java/io/pinecone/PineconeConnection.java +++ b/src/main/java/io/pinecone/PineconeConnection.java @@ -46,9 +46,14 @@ public PineconeConnection(PineconeClientConfig clientConfig, PineconeConnectionC : buildChannel(clientConfig, connectionConfig); channel.notifyWhenStateChanged(channel.getState(false), this::onConnectivityStateChanged); Metadata metadata = assembleMetadata(clientConfig, connectionConfig); - blockingStub = applyDefaultBlockingStubConfig( - MetadataUtils.attachHeaders(VectorServiceGrpc.newBlockingStub(channel), metadata)); - asyncStub = MetadataUtils.attachHeaders(VectorServiceGrpc.newStub(channel), metadata); +// blockingStub = applyDefaultBlockingStubConfig( +// MetadataUtils.attachHeaders(VectorServiceGrpc.newBlockingStub(channel), metadata)); + blockingStub = VectorServiceGrpc + .newBlockingStub(channel) + .withInterceptors(MetadataUtils.newAttachHeadersInterceptor(metadata)); + asyncStub = VectorServiceGrpc + .newStub(channel) + .withInterceptors(MetadataUtils.newAttachHeadersInterceptor(metadata)); logger.debug("created new PineconeConnection for channel: {}", channel); } From 8d4c911fecb4902f00ca5d9b47077f044cfacbe6 Mon Sep 17 00:00:00 2001 From: rohanshah18 Date: Wed, 27 Sep 2023 16:52:09 -0400 Subject: [PATCH 2/2] run integration tests and clean up --- src/main/java/io/pinecone/PineconeConnection.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/io/pinecone/PineconeConnection.java b/src/main/java/io/pinecone/PineconeConnection.java index 5d74189d..d38d10e5 100644 --- a/src/main/java/io/pinecone/PineconeConnection.java +++ b/src/main/java/io/pinecone/PineconeConnection.java @@ -46,8 +46,6 @@ public PineconeConnection(PineconeClientConfig clientConfig, PineconeConnectionC : buildChannel(clientConfig, connectionConfig); channel.notifyWhenStateChanged(channel.getState(false), this::onConnectivityStateChanged); Metadata metadata = assembleMetadata(clientConfig, connectionConfig); -// blockingStub = applyDefaultBlockingStubConfig( -// MetadataUtils.attachHeaders(VectorServiceGrpc.newBlockingStub(channel), metadata)); blockingStub = VectorServiceGrpc .newBlockingStub(channel) .withInterceptors(MetadataUtils.newAttachHeadersInterceptor(metadata));