From b1b0b498ba188a51b17d179988074bcf34fb7590 Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Fri, 7 May 2021 15:32:24 -0700 Subject: [PATCH] fix: Make x-goog-api-client header report rest-based transport clients with `rest/` token instead of `httpson/`. (#1370) We will still be able to disambiguate between discogapic and diregapic for compute by the `gapic/` token in the same header. Discogapic clients will be versioned as 0.x.x, while diregapics are `1.x.x-alpha` --- .../com/google/api/gax/httpjson/GaxHttpJsonProperties.java | 4 ++-- .../google/api/gax/httpjson/GaxHttpJsonPropertiesTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/GaxHttpJsonProperties.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/GaxHttpJsonProperties.java index d3c9f4e7f..fab63c320 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/GaxHttpJsonProperties.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/GaxHttpJsonProperties.java @@ -36,7 +36,7 @@ @InternalApi public class GaxHttpJsonProperties { private static final Pattern DEFAULT_API_CLIENT_HEADER_PATTERN = - Pattern.compile("gl-java/.+ gapic/.* gax/.+ httpjson/.*"); + Pattern.compile("gl-java/.+ gapic/.* gax/.+ rest/.*"); /** Returns default api client header pattern (to facilitate testing) */ public static Pattern getDefaultApiClientHeaderPattern() { @@ -44,7 +44,7 @@ public static Pattern getDefaultApiClientHeaderPattern() { } public static String getHttpJsonTokenName() { - return "httpjson"; + return "rest"; } public static String getHttpJsonVersion() { diff --git a/gax-httpjson/src/test/java/com/google/api/gax/httpjson/GaxHttpJsonPropertiesTest.java b/gax-httpjson/src/test/java/com/google/api/gax/httpjson/GaxHttpJsonPropertiesTest.java index ca0814b19..487605a62 100644 --- a/gax-httpjson/src/test/java/com/google/api/gax/httpjson/GaxHttpJsonPropertiesTest.java +++ b/gax-httpjson/src/test/java/com/google/api/gax/httpjson/GaxHttpJsonPropertiesTest.java @@ -41,7 +41,7 @@ public class GaxHttpJsonPropertiesTest { public void testDefaultHeaderPattern() { assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() - .matcher("gl-java/1.8_00 gapic/1.2.3-alpha gax/1.5.0 httpjson/1.7.0") + .matcher("gl-java/1.8_00 gapic/1.2.3-alpha gax/1.5.0 rest/1.7.0") .matches()); } }