From 89e9a91ef23e5ef750aa5dd13f36e6d2100ac5e2 Mon Sep 17 00:00:00 2001
From: rohanshah18 <rohan.s@pinecone.io>
Date: Wed, 26 Jun 2024 13:38:17 -0400
Subject: [PATCH 1/2] fix useragent for grpc

---
 .../java/io/pinecone/configs/PineconeConnection.java | 10 +++++-----
 src/test/java/io/pinecone/PineconeConfigTest.java    | 12 ------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/pinecone/configs/PineconeConnection.java b/src/main/java/io/pinecone/configs/PineconeConnection.java
index f82a7510..ffd046eb 100644
--- a/src/main/java/io/pinecone/configs/PineconeConnection.java
+++ b/src/main/java/io/pinecone/configs/PineconeConnection.java
@@ -77,7 +77,7 @@ public PineconeConnection(PineconeConfig config) {
             if (config.getHost() == null || config.getHost().isEmpty()) {
                 throw new PineconeValidationException("Index-name or host is required for data plane operations");
             }
-            channel = buildChannel(config.getHost());
+            channel = buildChannel();
         }
         initialize();
     }
@@ -134,14 +134,15 @@ private void onConnectivityStateChanged() {
                 channel.getState(false), channel);
     }
 
-    private ManagedChannel buildChannel(String host) {
-        String endpoint = formatEndpoint(host);
+    private ManagedChannel buildChannel() {
+        String endpoint = formatEndpoint(config.getHost());
         NettyChannelBuilder builder = NettyChannelBuilder.forTarget(endpoint);
 
         try {
             builder = builder.overrideAuthority(endpoint)
                     .negotiationType(NegotiationType.TLS)
-                    .sslContext(GrpcSslContexts.forClient().build());
+                    .sslContext(GrpcSslContexts.forClient().build())
+                    .userAgent(config.getUserAgent());
 
             if(config.getProxyConfig() != null) {
                 ProxyDetector proxyDetector = getProxyDetector();
@@ -169,7 +170,6 @@ private ProxyDetector getProxyDetector() {
     private static Metadata assembleMetadata(PineconeConfig config) {
         Metadata metadata = new Metadata();
         metadata.put(Metadata.Key.of("api-key", Metadata.ASCII_STRING_MARSHALLER), config.getApiKey());
-        metadata.put(Metadata.Key.of("User-Agent", Metadata.ASCII_STRING_MARSHALLER), config.getUserAgentGrpc());
         return metadata;
     }
 
diff --git a/src/test/java/io/pinecone/PineconeConfigTest.java b/src/test/java/io/pinecone/PineconeConfigTest.java
index 367edf2f..1e225315 100644
--- a/src/test/java/io/pinecone/PineconeConfigTest.java
+++ b/src/test/java/io/pinecone/PineconeConfigTest.java
@@ -33,11 +33,6 @@ public void testGetUserAgent() {
         assertEquals(config.getUserAgent(), "lang=java; pineconeClientVersion=" + pineconeClientVersion);
     }
 
-    @Test
-    public void testGetUserAgentGrpc() {
-        PineconeConfig config = new PineconeConfig("testApiKey");
-        assertEquals(config.getUserAgentGrpc(), "lang=java; pineconeClientVersion[grpc]=" + pineconeClientVersion);
-    }
     @Test
     public void testGetUserAgentWithSourceTag() {
         PineconeConfig config = new PineconeConfig("testApiKey");
@@ -45,13 +40,6 @@ public void testGetUserAgentWithSourceTag() {
         assertEquals(config.getUserAgent(), "lang=java; pineconeClientVersion=" + pineconeClientVersion + "; source_tag=testsourcetag");
     }
 
-    @Test
-    public void testGetUserAgentGrpcWithSourceTag() {
-        PineconeConfig config = new PineconeConfig("testApiKey");
-        config.setSourceTag("testSourceTag");
-        assertEquals(config.getUserAgentGrpc(), "lang=java; pineconeClientVersion[grpc]=" + pineconeClientVersion + "; source_tag=testsourcetag");
-    }
-
     @Test
     public void testSourceTagIsNormalized() {
         PineconeConfig config = new PineconeConfig("testApiKey");

From f521ff280eb57e34f23a1b709c20edddf4f51ab3 Mon Sep 17 00:00:00 2001
From: rohanshah18 <rohan.s@pinecone.io>
Date: Wed, 26 Jun 2024 13:54:14 -0400
Subject: [PATCH 2/2] remove getUserAgentGrpc()

---
 .../java/io/pinecone/configs/PineconeConfig.java  | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/pinecone/configs/PineconeConfig.java b/src/main/java/io/pinecone/configs/PineconeConfig.java
index cea26ec8..e28aaf45 100644
--- a/src/main/java/io/pinecone/configs/PineconeConfig.java
+++ b/src/main/java/io/pinecone/configs/PineconeConfig.java
@@ -202,20 +202,11 @@ public void validate() {
      * @return The user agent string.
      */
     public String getUserAgent() {
-        return buildUserAgent("pineconeClientVersion");
+        return buildUserAgent();
     }
 
-    /**
-     * Builds the user agent string for the Pinecone client's gRPC requests.
-     *
-     * @return The user agent string for gRPC requests.
-     */
-    public String getUserAgentGrpc() {
-        return buildUserAgent("pineconeClientVersion[grpc]");
-    }
-
-    private String buildUserAgent(String clientId) {
-        String userAgent = String.format("lang=java; %s=%s", clientId, "v1.2.1");
+    private String buildUserAgent() {
+        String userAgent = String.format("lang=java; %s=%s", "pineconeClientVersion", "v1.2.1");
         if (this.getSourceTag() != null && !this.getSourceTag().isEmpty()) {
             userAgent += "; source_tag=" + this.getSourceTag();
         }