Add ads_assistant to metadata headers (#546)

* Add ads_assistant to metadata headers

Change-Id: I7998c98776d96365abb5f5babf468fdc1816671d

* Small change to header format

Change-Id: I9cea682eb3ed7a0a78db106e9d727d10f4fbc719

Author: dorasun

CHANGELOG.md

@@ -1,3 +1,7 @@
+39.1.0
+-----
+- Added workaround for gRPC issue affecting metadata headers.
+
 39.0.0
 -----
 - Compatibility with v23.2 of the API: https://developers.google.com/google-ads/api/docs/release-notes

lib/google/ads/google_ads/interceptors/metadata_interceptor.rb

@@ -58,8 +58,7 @@ def update_metadata(metadata)
               metadata[:"linked-customer-id"] = @linked_customer_id.to_s
             end
 
-            # The python library iterates over metadata and modifies x-goog-api-client
-            # Here we can directly access it.
+            # Update metadata for x-goog-api-client
             if metadata.key?(:"x-goog-api-client")
               if @ads_assistant
                 metadata[:"x-goog-api-client"] += " gaada/#{@ads_assistant}"

lib/google/ads/google_ads/service_lookup.rb

@@ -78,22 +78,26 @@ def gax_service_params
         # Pass headers as initial metadata here until the upstream fix
         # (grpc/grpc#42073) is released.
         def headers
-          h = {}
+          headers = {}
           if config.login_customer_id
             validate_customer_id(:login_customer_id)
-            h[:"login-customer-id"] = config.login_customer_id.to_s
+            headers[:"login-customer-id"] = config.login_customer_id.to_s
           end
 
           if config.linked_customer_id
             validate_customer_id(:linked_customer_id)
-            h[:"linked-customer-id"] = config.linked_customer_id.to_s
+            headers[:"linked-customer-id"] = config.linked_customer_id.to_s
           end
 
           unless config.use_cloud_org_for_api_access
-            h[:"developer-token"] = config.developer_token if config.developer_token
+            headers[:"developer-token"] = config.developer_token if config.developer_token
           end
 
-          h
+          if config.ads_assistant
+            headers[:"x-goog-api-client"] = "gaada/#{config.ads_assistant}"
+          end
+
+          headers
         end
 
         def validate_customer_id(field)

lib/google/ads/google_ads/version.rb

@@ -20,7 +20,7 @@ module Google
   module Ads
     module GoogleAds
       CLIENT_LIB_NAME = 'gccl'.freeze
-      CLIENT_LIB_VERSION = '39.0.0'.freeze
+      CLIENT_LIB_VERSION = '39.1.0'.freeze
       VERSION = CLIENT_LIB_VERSION
     end
   end

test/test_service_lookup.rb

@@ -29,13 +29,15 @@ def test_headers_includes_all_when_fully_configured
       c.login_customer_id = 1234567890
       c.linked_customer_id = 9876543210
       c.developer_token = "test-dev-token"
+      c.ads_assistant = "v0"
     end
     lookup = create_lookup(config)
 
     headers = lookup.send(:headers)
     assert_equal "1234567890", headers[:"login-customer-id"]
     assert_equal "9876543210", headers[:"linked-customer-id"]
     assert_equal "test-dev-token", headers[:"developer-token"]
+    assert_equal "gaada/v0", headers[:"x-goog-api-client"]
   end
 
   def test_headers_excludes_developer_token_when_cloud_org