Merge branch 'main' into mark-otel-optional

googleapis · Apr 22, 2024 · e874e1f · e874e1f
2 parents 366a8ab + 0a71cbf
commit e874e1f
Show file tree

Hide file tree

Showing 14 changed files with 736 additions and 125 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -106,17 +106,6 @@ http_archive(
     urls = ["https://github.com/googleapis/disco-to-proto3-converter/archive/%s.zip" % _disco_to_proto3_converter_commit],
 )
 
-# Showcase
-_showcase_version = "0.28.2"
-
-http_archive(
-    name = "com_google_gapic_showcase",
-    strip_prefix = "gapic-showcase-%s" % _showcase_version,
-    urls = [
-        "https://github.com/googleapis/gapic-showcase/archive/refs/tags/v%s.zip" % _showcase_version,
-    ],
-)
-
 http_archive(
     name = "rules_pkg",
     sha256 = "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2",

diff --git a/gax-java/gax_java.bzl b/gax-java/gax_java.bzl
@@ -77,7 +77,7 @@ google_java_format_verification = rule(
         "srcs": attr.label_list(allow_files = True),
         "formatter": attr.label(
             executable = True,
-            cfg = "host",
+            cfg = "exec",
         ),
     },
     outputs = {"output_file": "%{name}.txt"},

diff --git a/rules_java_gapic/java_gapic.bzl b/rules_java_gapic/java_gapic.bzl
@@ -94,7 +94,7 @@ _java_gapic_postprocess_srcjar = rule(
         "formatter": attr.label(
             default = Label("//:google_java_format_binary"),
             executable = True,
-            cfg = "host",
+            cfg = "exec",
         ),
     },
     outputs = {
@@ -152,7 +152,7 @@ _java_gapic_samples_srcjar = rule(
         "formatter": attr.label(
             default = Label("//:google_java_format_binary"),
             executable = True,
-            cfg = "host",
+            cfg = "exec",
         ),
     },
     outputs = {

diff --git a/showcase/gapic-showcase/pom.xml b/showcase/gapic-showcase/pom.xml
@@ -19,7 +19,7 @@
   </parent>
 
   <properties>
-    <gapic-showcase.version>0.30.0</gapic-showcase.version>
+    <gapic-showcase.version>0.33.0</gapic-showcase.version>
   </properties>
 
   <build>

diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoClient.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoClient.java
@@ -75,6 +75,7 @@
  *           .setHeader("header-1221270899")
  *           .setOtherHeader("otherHeader-2026585667")
  *           .setRequestId("requestId693933066")
+ *           .setOtherRequestId("otherRequestId1248995034")
  *           .build();
  *   EchoResponse response = echoClient.echo(request);
  * }
@@ -440,6 +441,7 @@ public final OperationsClient getHttpJsonOperationsClient() {
    *           .setHeader("header-1221270899")
    *           .setOtherHeader("otherHeader-2026585667")
    *           .setRequestId("requestId693933066")
+   *           .setOtherRequestId("otherRequestId1248995034")
    *           .build();
    *   EchoResponse response = echoClient.echo(request);
    * }
@@ -471,6 +473,7 @@ public final EchoResponse echo(EchoRequest request) {
    *           .setHeader("header-1221270899")
    *           .setOtherHeader("otherHeader-2026585667")
    *           .setRequestId("requestId693933066")
+   *           .setOtherRequestId("otherRequestId1248995034")
    *           .build();
    *   ApiFuture<EchoResponse> future = echoClient.echoCallable().futureCall(request);
    *   // Do something.
@@ -620,6 +623,7 @@ public final ServerStreamingCallable<ExpandRequest, EchoResponse> expandCallable
    *           .setHeader("header-1221270899")
    *           .setOtherHeader("otherHeader-2026585667")
    *           .setRequestId("requestId693933066")
+   *           .setOtherRequestId("otherRequestId1248995034")
    *           .build();
    *   requestObserver.onNext(request);
    * }
@@ -650,6 +654,7 @@ public final ClientStreamingCallable<EchoRequest, EchoResponse> collectCallable(
    *           .setHeader("header-1221270899")
    *           .setOtherHeader("otherHeader-2026585667")
    *           .setRequestId("requestId693933066")
+   *           .setOtherRequestId("otherRequestId1248995034")
    *           .build();
    *   bidiStream.send(request);
    *   for (EchoResponse response : bidiStream) {

diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/package-info.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/package-info.java
@@ -76,6 +76,7 @@
  *           .setHeader("header-1221270899")
  *           .setOtherHeader("otherHeader-2026585667")
  *           .setRequestId("requestId693933066")
+ *           .setOtherRequestId("otherRequestId1248995034")
  *           .build();
  *   EchoResponse response = echoClient.echo(request);
  * }

diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcEchoStub.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcEchoStub.java
@@ -313,6 +313,9 @@ protected GrpcEchoStub(
                   if (Strings.isNullOrEmpty(request.getRequestId())) {
                     requestBuilder.setRequestId(UUID.randomUUID().toString());
                   }
+                  if (Strings.isNullOrEmpty(request.getOtherRequestId())) {
+                    requestBuilder.setOtherRequestId(UUID.randomUUID().toString());
+                  }
                   return requestBuilder.build();
                 })
             .build();

diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonEchoStub.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonEchoStub.java
@@ -668,6 +668,9 @@ protected HttpJsonEchoStub(
                   if (Strings.isNullOrEmpty(request.getRequestId())) {
                     requestBuilder.setRequestId(UUID.randomUUID().toString());
                   }
+                  if (Strings.isNullOrEmpty(request.getOtherRequestId())) {
+                    requestBuilder.setOtherRequestId(UUID.randomUUID().toString());
+                  }
                   return requestBuilder.build();
                 })
             .build();