Merge pull request #20191 from jtattermusch/g_stands_for_useless

Remove g-stands-for from user agent string

src/core/ext/filters/http/client/http_client_filter.cc

@@ -538,9 +538,8 @@ static grpc_core::ManagedMemorySlice user_agent_from_args(
     }
   }
 
-  gpr_asprintf(&tmp, "%sgrpc-c/%s (%s; %s; %s)", is_first ? "" : " ",
+  gpr_asprintf(&tmp, "%sgrpc-c/%s (%s; %s)", is_first ? "" : " ",
-               grpc_version_string(), GPR_PLATFORM_STRING, transport_name,
+               grpc_version_string(), GPR_PLATFORM_STRING, transport_name);
-               grpc_g_stands_for());
   is_first = 0;
   gpr_strvec_add(&v, tmp);
 

src/objective-c/tests/UnitTests/APIv2Tests.m

@@ -235,12 +235,7 @@ static const NSTimeInterval kInvertedTimeout = 2;
                        expectedUserAgent = [expectedUserAgent stringByAppendingString:@" ("];
                        expectedUserAgent =
                            [expectedUserAgent stringByAppendingString:@GPR_PLATFORM_STRING];
-                       expectedUserAgent =
+                       expectedUserAgent = [expectedUserAgent stringByAppendingString:@"; chttp2)"];
-                           [expectedUserAgent stringByAppendingString:@"; chttp2; "];
-                       expectedUserAgent = [expectedUserAgent
-                           stringByAppendingString:[NSString
-                                                       stringWithUTF8String:grpc_g_stands_for()]];
-                       expectedUserAgent = [expectedUserAgent stringByAppendingString:@")"];
                        XCTAssertEqualObjects(userAgent, expectedUserAgent);
 
                        NSError *error = nil;

src/objective-c/tests/UnitTests/GRPCClientTests.m

@@ -307,10 +307,7 @@ static GRPCProtoMethod *kFullDuplexCallMethod;
         expectedUserAgent = [expectedUserAgent stringByAppendingString:GRPC_C_VERSION_STRING];
         expectedUserAgent = [expectedUserAgent stringByAppendingString:@" ("];
         expectedUserAgent = [expectedUserAgent stringByAppendingString:@GPR_PLATFORM_STRING];
-        expectedUserAgent = [expectedUserAgent stringByAppendingString:@"; chttp2; "];
+        expectedUserAgent = [expectedUserAgent stringByAppendingString:@"; chttp2)"];
-        expectedUserAgent = [expectedUserAgent
-            stringByAppendingString:[NSString stringWithUTF8String:grpc_g_stands_for()]];
-        expectedUserAgent = [expectedUserAgent stringByAppendingString:@")"];
         XCTAssertEqualObjects(userAgent, expectedUserAgent);
 
         // Change in format of user-agent field in a direction that does not match the regex will