docs(regen): update sample code to set total timeout, add API client header test

google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigSettings.java

@@ -73,8 +73,12 @@
  * <code>
  * ConfigSettings.Builder configSettingsBuilder =
  *     ConfigSettings.newBuilder();
- * configSettingsBuilder.getSinkSettings().getRetrySettings().toBuilder()
- *     .setTotalTimeout(Duration.ofSeconds(30));
+ * configSettingsBuilder
+ *     .getSinkSettings()
+ *     .setRetrySettings(
+ *         configSettingsBuilder.getSinkSettings().getRetrySettings().toBuilder()
+ *             .setTotalTimeout(Duration.ofSeconds(30))
+ *             .build());
  * ConfigSettings configSettings = configSettingsBuilder.build();
  * </code>
  * </pre>

google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingSettings.java

@@ -67,8 +67,12 @@
  * <code>
  * LoggingSettings.Builder loggingSettingsBuilder =
  *     LoggingSettings.newBuilder();
- * loggingSettingsBuilder.deleteLogSettings().getRetrySettings().toBuilder()
- *     .setTotalTimeout(Duration.ofSeconds(30));
+ * loggingSettingsBuilder
+ *     .deleteLogSettings()
+ *     .setRetrySettings(
+ *         loggingSettingsBuilder.deleteLogSettings().getRetrySettings().toBuilder()
+ *             .setTotalTimeout(Duration.ofSeconds(30))
+ *             .build());
  * LoggingSettings loggingSettings = loggingSettingsBuilder.build();
  * </code>
  * </pre>

google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsSettings.java

@@ -62,8 +62,12 @@
  * <code>
  * MetricsSettings.Builder metricsSettingsBuilder =
  *     MetricsSettings.newBuilder();
- * metricsSettingsBuilder.getLogMetricSettings().getRetrySettings().toBuilder()
- *     .setTotalTimeout(Duration.ofSeconds(30));
+ * metricsSettingsBuilder
+ *     .getLogMetricSettings()
+ *     .setRetrySettings(
+ *         metricsSettingsBuilder.getLogMetricSettings().getRetrySettings().toBuilder()
+ *             .setTotalTimeout(Duration.ofSeconds(30))
+ *             .build());
  * MetricsSettings metricsSettings = metricsSettingsBuilder.build();
  * </code>
  * </pre>

google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java

@@ -88,8 +88,12 @@
  * <code>
  * ConfigServiceV2StubSettings.Builder configSettingsBuilder =
  *     ConfigServiceV2StubSettings.newBuilder();
- * configSettingsBuilder.getSinkSettings().getRetrySettings().toBuilder()
- *     .setTotalTimeout(Duration.ofSeconds(30));
+ * configSettingsBuilder
+ *     .getSinkSettings()
+ *     .setRetrySettings(
+ *         configSettingsBuilder.getSinkSettings().getRetrySettings().toBuilder()
+ *             .setTotalTimeout(Duration.ofSeconds(30))
+ *             .build());
  * ConfigServiceV2StubSettings configSettings = configSettingsBuilder.build();
  * </code>
  * </pre>

google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java

@@ -92,8 +92,12 @@
  * <code>
  * LoggingServiceV2StubSettings.Builder loggingSettingsBuilder =
  *     LoggingServiceV2StubSettings.newBuilder();
- * loggingSettingsBuilder.deleteLogSettings().getRetrySettings().toBuilder()
- *     .setTotalTimeout(Duration.ofSeconds(30));
+ * loggingSettingsBuilder
+ *     .deleteLogSettings()
+ *     .setRetrySettings(
+ *         loggingSettingsBuilder.deleteLogSettings().getRetrySettings().toBuilder()
+ *             .setTotalTimeout(Duration.ofSeconds(30))
+ *             .build());
  * LoggingServiceV2StubSettings loggingSettings = loggingSettingsBuilder.build();
  * </code>
  * </pre>

google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java

@@ -77,8 +77,12 @@
  * <code>
  * MetricsServiceV2StubSettings.Builder metricsSettingsBuilder =
  *     MetricsServiceV2StubSettings.newBuilder();
- * metricsSettingsBuilder.getLogMetricSettings().getRetrySettings().toBuilder()
- *     .setTotalTimeout(Duration.ofSeconds(30));
+ * metricsSettingsBuilder
+ *     .getLogMetricSettings()
+ *     .setRetrySettings(
+ *         metricsSettingsBuilder.getLogMetricSettings().getRetrySettings().toBuilder()
+ *             .setTotalTimeout(Duration.ofSeconds(30))
+ *             .build());
  * MetricsServiceV2StubSettings metricsSettings = metricsSettingsBuilder.build();
  * </code>
  * </pre>

google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java

@@ -28,12 +28,14 @@
 import com.google.api.resourcenames.ResourceName;
 import com.google.common.collect.Lists;
 import com.google.logging.v2.BillingName;
+import com.google.logging.v2.CmekSettings;
 import com.google.logging.v2.CreateExclusionRequest;
 import com.google.logging.v2.CreateSinkRequest;
 import com.google.logging.v2.DeleteExclusionRequest;
 import com.google.logging.v2.DeleteSinkRequest;
 import com.google.logging.v2.ExclusionName;
 import com.google.logging.v2.ExclusionNames;
+import com.google.logging.v2.GetCmekSettingsRequest;
 import com.google.logging.v2.GetExclusionRequest;
 import com.google.logging.v2.GetSinkRequest;
 import com.google.logging.v2.ListExclusionsRequest;
@@ -49,6 +51,7 @@
 import com.google.logging.v2.ProjectSinkName;
 import com.google.logging.v2.SinkName;
 import com.google.logging.v2.SinkNames;
+import com.google.logging.v2.UpdateCmekSettingsRequest;
 import com.google.logging.v2.UpdateExclusionRequest;
 import com.google.logging.v2.UpdateSinkRequest;
 import com.google.protobuf.AbstractMessage;
@@ -658,4 +661,94 @@ public void deleteExclusionExceptionTest() throws Exception {
       // Expected exception
     }
   }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getCmekSettingsTest() {
+    String name = "name3373707";
+    String kmsKeyName = "kmsKeyName2094986649";
+    String serviceAccountId = "serviceAccountId-111486921";
+    CmekSettings expectedResponse =
+        CmekSettings.newBuilder()
+            .setName(name)
+            .setKmsKeyName(kmsKeyName)
+            .setServiceAccountId(serviceAccountId)
+            .build();
+    mockConfigServiceV2.addResponse(expectedResponse);
+
+    GetCmekSettingsRequest request = GetCmekSettingsRequest.newBuilder().build();
+
+    CmekSettings actualResponse = client.getCmekSettings(request);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    GetCmekSettingsRequest actualRequest = (GetCmekSettingsRequest) actualRequests.get(0);
+
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getCmekSettingsExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockConfigServiceV2.addException(exception);
+
+    try {
+      GetCmekSettingsRequest request = GetCmekSettingsRequest.newBuilder().build();
+
+      client.getCmekSettings(request);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateCmekSettingsTest() {
+    String name = "name3373707";
+    String kmsKeyName = "kmsKeyName2094986649";
+    String serviceAccountId = "serviceAccountId-111486921";
+    CmekSettings expectedResponse =
+        CmekSettings.newBuilder()
+            .setName(name)
+            .setKmsKeyName(kmsKeyName)
+            .setServiceAccountId(serviceAccountId)
+            .build();
+    mockConfigServiceV2.addResponse(expectedResponse);
+
+    UpdateCmekSettingsRequest request = UpdateCmekSettingsRequest.newBuilder().build();
+
+    CmekSettings actualResponse = client.updateCmekSettings(request);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    UpdateCmekSettingsRequest actualRequest = (UpdateCmekSettingsRequest) actualRequests.get(0);
+
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateCmekSettingsExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockConfigServiceV2.addException(exception);
+
+    try {
+      UpdateCmekSettingsRequest request = UpdateCmekSettingsRequest.newBuilder().build();
+
+      client.updateCmekSettings(request);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
 }

google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java

@@ -17,8 +17,10 @@
 
 import static com.google.cloud.logging.v2.LoggingClient.ListLogEntriesPagedResponse;
 import static com.google.cloud.logging.v2.LoggingClient.ListLogsPagedResponse;
+import static com.google.cloud.logging.v2.LoggingClient.ListMonitoredResourceDescriptorsPagedResponse;
 
 import com.google.api.MonitoredResource;
+import com.google.api.MonitoredResourceDescriptor;
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.api.gax.grpc.GaxGrpcProperties;
 import com.google.api.gax.grpc.testing.LocalChannelProvider;
@@ -32,6 +34,8 @@
 import com.google.logging.v2.ListLogEntriesResponse;
 import com.google.logging.v2.ListLogsRequest;
 import com.google.logging.v2.ListLogsResponse;
+import com.google.logging.v2.ListMonitoredResourceDescriptorsRequest;
+import com.google.logging.v2.ListMonitoredResourceDescriptorsResponse;
 import com.google.logging.v2.LogEntry;
 import com.google.logging.v2.LogName;
 import com.google.logging.v2.LogNames;
@@ -243,6 +247,60 @@ public void listLogEntriesExceptionTest() throws Exception {
     }
   }
 
+  @Test
+  @SuppressWarnings("all")
+  public void listMonitoredResourceDescriptorsTest() {
+    String nextPageToken = "";
+    MonitoredResourceDescriptor resourceDescriptorsElement =
+        MonitoredResourceDescriptor.newBuilder().build();
+    List<MonitoredResourceDescriptor> resourceDescriptors =
+        Arrays.asList(resourceDescriptorsElement);
+    ListMonitoredResourceDescriptorsResponse expectedResponse =
+        ListMonitoredResourceDescriptorsResponse.newBuilder()
+            .setNextPageToken(nextPageToken)
+            .addAllResourceDescriptors(resourceDescriptors)
+            .build();
+    mockLoggingServiceV2.addResponse(expectedResponse);
+
+    ListMonitoredResourceDescriptorsRequest request =
+        ListMonitoredResourceDescriptorsRequest.newBuilder().build();
+
+    ListMonitoredResourceDescriptorsPagedResponse pagedListResponse =
+        client.listMonitoredResourceDescriptors(request);
+
+    List<MonitoredResourceDescriptor> resources =
+        Lists.newArrayList(pagedListResponse.iterateAll());
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getResourceDescriptorsList().get(0), resources.get(0));
+
+    List<AbstractMessage> actualRequests = mockLoggingServiceV2.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ListMonitoredResourceDescriptorsRequest actualRequest =
+        (ListMonitoredResourceDescriptorsRequest) actualRequests.get(0);
+
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listMonitoredResourceDescriptorsExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockLoggingServiceV2.addException(exception);
+
+    try {
+      ListMonitoredResourceDescriptorsRequest request =
+          ListMonitoredResourceDescriptorsRequest.newBuilder().build();
+
+      client.listMonitoredResourceDescriptors(request);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
   @Test
   @SuppressWarnings("all")
   public void listLogsTest() {

proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java

@@ -100,47 +100,47 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + ".v2.LogMetric\022\027\n\017next_page_token\030\002 \001(\t\"Q"
           + "\n\023GetLogMetricRequest\022:\n\013metric_name\030\001 \001"
           + "(\tB%\340A\002\372A\037\n\035logging.googleapis.com/Metri"
-          + "c\"\217\001\n\026CreateLogMetricRequest\022B\n\006parent\030\001"
-          + " \001(\tB2\340A\002\372A,\n*cloudresourcemanager.googl"
-          + "eapis.com/Metric\0221\n\006metric\030\002 \001(\0132\034.googl"
-          + "e.logging.v2.LogMetricB\003\340A\002\"\207\001\n\026UpdateLo"
-          + "gMetricRequest\022:\n\013metric_name\030\001 \001(\tB%\340A\002"
-          + "\372A\037\n\035logging.googleapis.com/Metric\0221\n\006me"
-          + "tric\030\002 \001(\0132\034.google.logging.v2.LogMetric"
-          + "B\003\340A\002\"T\n\026DeleteLogMetricRequest\022:\n\013metri"
-          + "c_name\030\001 \001(\tB%\340A\002\372A\037\n\035logging.googleapis"
-          + ".com/Metric2\256\010\n\020MetricsServiceV2\022\227\001\n\016Lis"
-          + "tLogMetrics\022(.google.logging.v2.ListLogM"
-          + "etricsRequest\032).google.logging.v2.ListLo"
-          + "gMetricsResponse\"0\202\323\344\223\002!\022\037/v2/{parent=pr"
-          + "ojects/*}/metrics\332A\006parent\022\222\001\n\014GetLogMet"
-          + "ric\022&.google.logging.v2.GetLogMetricRequ"
-          + "est\032\034.google.logging.v2.LogMetric\"<\202\323\344\223\002"
-          + "(\022&/v2/{metric_name=projects/*/metrics/*"
-          + "}\332A\013metric_name\022\233\001\n\017CreateLogMetric\022).go"
-          + "ogle.logging.v2.CreateLogMetricRequest\032\034"
-          + ".google.logging.v2.LogMetric\"?\202\323\344\223\002)\"\037/v"
-          + "2/{parent=projects/*}/metrics:\006metric\332A\r"
-          + "parent,metric\022\247\001\n\017UpdateLogMetric\022).goog"
-          + "le.logging.v2.UpdateLogMetricRequest\032\034.g"
-          + "oogle.logging.v2.LogMetric\"K\202\323\344\223\0020\032&/v2/"
-          + "{metric_name=projects/*/metrics/*}:\006metr"
-          + "ic\332A\022metric_name,metric\022\222\001\n\017DeleteLogMet"
-          + "ric\022).google.logging.v2.DeleteLogMetricR"
-          + "equest\032\026.google.protobuf.Empty\"<\202\323\344\223\002(*&"
-          + "/v2/{metric_name=projects/*/metrics/*}\332A"
-          + "\013metric_name\032\215\002\312A\026logging.googleapis.com"
-          + "\322A\360\001https://www.googleapis.com/auth/clou"
-          + "d-platform,https://www.googleapis.com/au"
-          + "th/cloud-platform.read-only,https://www."
-          + "googleapis.com/auth/logging.admin,https:"
-          + "//www.googleapis.com/auth/logging.read,h"
-          + "ttps://www.googleapis.com/auth/logging.w"
-          + "riteB\237\001\n\025com.google.logging.v2B\023LoggingM"
-          + "etricsProtoP\001Z8google.golang.org/genprot"
-          + "o/googleapis/logging/v2;logging\370\001\001\252\002\027Goo"
-          + "gle.Cloud.Logging.V2\312\002\027Google\\Cloud\\Logg"
-          + "ing\\V2b\006proto3"
+          + "c\"\202\001\n\026CreateLogMetricRequest\0225\n\006parent\030\001"
+          + " \001(\tB%\340A\002\372A\037\n\035logging.googleapis.com/Met"
+          + "ric\0221\n\006metric\030\002 \001(\0132\034.google.logging.v2."
+          + "LogMetricB\003\340A\002\"\207\001\n\026UpdateLogMetricReques"
+          + "t\022:\n\013metric_name\030\001 \001(\tB%\340A\002\372A\037\n\035logging."
+          + "googleapis.com/Metric\0221\n\006metric\030\002 \001(\0132\034."
+          + "google.logging.v2.LogMetricB\003\340A\002\"T\n\026Dele"
+          + "teLogMetricRequest\022:\n\013metric_name\030\001 \001(\tB"
+          + "%\340A\002\372A\037\n\035logging.googleapis.com/Metric2\256"
+          + "\010\n\020MetricsServiceV2\022\227\001\n\016ListLogMetrics\022("
+          + ".google.logging.v2.ListLogMetricsRequest"
+          + "\032).google.logging.v2.ListLogMetricsRespo"
+          + "nse\"0\202\323\344\223\002!\022\037/v2/{parent=projects/*}/met"
+          + "rics\332A\006parent\022\222\001\n\014GetLogMetric\022&.google."
+          + "logging.v2.GetLogMetricRequest\032\034.google."
+          + "logging.v2.LogMetric\"<\202\323\344\223\002(\022&/v2/{metri"
+          + "c_name=projects/*/metrics/*}\332A\013metric_na"
+          + "me\022\233\001\n\017CreateLogMetric\022).google.logging."
+          + "v2.CreateLogMetricRequest\032\034.google.loggi"
+          + "ng.v2.LogMetric\"?\202\323\344\223\002)\"\037/v2/{parent=pro"
+          + "jects/*}/metrics:\006metric\332A\rparent,metric"
+          + "\022\247\001\n\017UpdateLogMetric\022).google.logging.v2"
+          + ".UpdateLogMetricRequest\032\034.google.logging"
+          + ".v2.LogMetric\"K\202\323\344\223\0020\032&/v2/{metric_name="
+          + "projects/*/metrics/*}:\006metric\332A\022metric_n"
+          + "ame,metric\022\222\001\n\017DeleteLogMetric\022).google."
+          + "logging.v2.DeleteLogMetricRequest\032\026.goog"
+          + "le.protobuf.Empty\"<\202\323\344\223\002(*&/v2/{metric_n"
+          + "ame=projects/*/metrics/*}\332A\013metric_name\032"
+          + "\215\002\312A\026logging.googleapis.com\322A\360\001https://w"
+          + "ww.googleapis.com/auth/cloud-platform,ht"
+          + "tps://www.googleapis.com/auth/cloud-plat"
+          + "form.read-only,https://www.googleapis.co"
+          + "m/auth/logging.admin,https://www.googlea"
+          + "pis.com/auth/logging.read,https://www.go"
+          + "ogleapis.com/auth/logging.writeB\237\001\n\025com."
+          + "google.logging.v2B\023LoggingMetricsProtoP\001"
+          + "Z8google.golang.org/genproto/googleapis/"
+          + "logging/v2;logging\370\001\001\252\002\027Google.Cloud.Log"
+          + "ging.V2\312\002\027Google\\Cloud\\Logging\\V2b\006proto"
+          + "3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(