diff --git a/java-cloudbuild/README.md b/java-cloudbuild/README.md
index b6818bcf8fcb..e1bf318e8385 100644
--- a/java-cloudbuild/README.md
+++ b/java-cloudbuild/README.md
@@ -42,20 +42,20 @@ If you are using Maven without the BOM, add this to your dependencies:
+ * Optional. Option to specify whether structured logging is enabled. + * + * If true, JSON-formatted logs are parsed as structured logs. + *+ * + *
bool enable_structured_logging = 23 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * @return The enableStructuredLogging.
+ */
+ @java.lang.Override
+ public boolean getEnableStructuredLogging() {
+ return enableStructuredLogging_;
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
@@ -2695,6 +2715,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (automapSubstitutions_ != false) {
output.writeBool(22, automapSubstitutions_);
}
+ if (enableStructuredLogging_ != false) {
+ output.writeBool(23, enableStructuredLogging_);
+ }
getUnknownFields().writeTo(output);
}
@@ -2777,6 +2800,9 @@ public int getSerializedSize() {
if (automapSubstitutions_ != false) {
size += com.google.protobuf.CodedOutputStream.computeBoolSize(22, automapSubstitutions_);
}
+ if (enableStructuredLogging_ != false) {
+ size += com.google.protobuf.CodedOutputStream.computeBoolSize(23, enableStructuredLogging_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -2810,6 +2836,7 @@ public boolean equals(final java.lang.Object obj) {
if (!getSecretEnvList().equals(other.getSecretEnvList())) return false;
if (!getVolumesList().equals(other.getVolumesList())) return false;
if (defaultLogsBucketBehavior_ != other.defaultLogsBucketBehavior_) return false;
+ if (getEnableStructuredLogging() != other.getEnableStructuredLogging()) return false;
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}
@@ -2861,6 +2888,8 @@ public int hashCode() {
}
hash = (37 * hash) + DEFAULT_LOGS_BUCKET_BEHAVIOR_FIELD_NUMBER;
hash = (53 * hash) + defaultLogsBucketBehavior_;
+ hash = (37 * hash) + ENABLE_STRUCTURED_LOGGING_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getEnableStructuredLogging());
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
@@ -3035,6 +3064,7 @@ public Builder clear() {
}
bitField0_ = (bitField0_ & ~0x00002000);
defaultLogsBucketBehavior_ = 0;
+ enableStructuredLogging_ = false;
return this;
}
@@ -3132,6 +3162,9 @@ private void buildPartial0(com.google.cloudbuild.v1.BuildOptions result) {
if (((from_bitField0_ & 0x00004000) != 0)) {
result.defaultLogsBucketBehavior_ = defaultLogsBucketBehavior_;
}
+ if (((from_bitField0_ & 0x00008000) != 0)) {
+ result.enableStructuredLogging_ = enableStructuredLogging_;
+ }
result.bitField0_ |= to_bitField0_;
}
@@ -3272,6 +3305,9 @@ public Builder mergeFrom(com.google.cloudbuild.v1.BuildOptions other) {
if (other.defaultLogsBucketBehavior_ != 0) {
setDefaultLogsBucketBehaviorValue(other.getDefaultLogsBucketBehaviorValue());
}
+ if (other.getEnableStructuredLogging() != false) {
+ setEnableStructuredLogging(other.getEnableStructuredLogging());
+ }
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
@@ -3409,6 +3445,12 @@ public Builder mergeFrom(
bitField0_ |= 0x00000040;
break;
} // case 176
+ case 184:
+ {
+ enableStructuredLogging_ = input.readBool();
+ bitField0_ |= 0x00008000;
+ break;
+ } // case 184
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -5741,6 +5783,65 @@ public Builder clearDefaultLogsBucketBehavior() {
return this;
}
+ private boolean enableStructuredLogging_;
+ /**
+ *
+ *
+ * + * Optional. Option to specify whether structured logging is enabled. + * + * If true, JSON-formatted logs are parsed as structured logs. + *+ * + *
bool enable_structured_logging = 23 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * @return The enableStructuredLogging.
+ */
+ @java.lang.Override
+ public boolean getEnableStructuredLogging() {
+ return enableStructuredLogging_;
+ }
+ /**
+ *
+ *
+ * + * Optional. Option to specify whether structured logging is enabled. + * + * If true, JSON-formatted logs are parsed as structured logs. + *+ * + *
bool enable_structured_logging = 23 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * @param value The enableStructuredLogging to set.
+ * @return This builder for chaining.
+ */
+ public Builder setEnableStructuredLogging(boolean value) {
+
+ enableStructuredLogging_ = value;
+ bitField0_ |= 0x00008000;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * Optional. Option to specify whether structured logging is enabled. + * + * If true, JSON-formatted logs are parsed as structured logs. + *+ * + *
bool enable_structured_logging = 23 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearEnableStructuredLogging() {
+ bitField0_ = (bitField0_ & ~0x00008000);
+ enableStructuredLogging_ = false;
+ onChanged();
+ return this;
+ }
+
@java.lang.Override
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
diff --git a/java-cloudbuild/proto-google-cloud-build-v1/src/main/java/com/google/cloudbuild/v1/BuildOptionsOrBuilder.java b/java-cloudbuild/proto-google-cloud-build-v1/src/main/java/com/google/cloudbuild/v1/BuildOptionsOrBuilder.java
index d66ff18ac95c..675fe8fba56a 100644
--- a/java-cloudbuild/proto-google-cloud-build-v1/src/main/java/com/google/cloudbuild/v1/BuildOptionsOrBuilder.java
+++ b/java-cloudbuild/proto-google-cloud-build-v1/src/main/java/com/google/cloudbuild/v1/BuildOptionsOrBuilder.java
@@ -616,4 +616,19 @@ public interface BuildOptionsOrBuilder
* @return The defaultLogsBucketBehavior.
*/
com.google.cloudbuild.v1.BuildOptions.DefaultLogsBucketBehavior getDefaultLogsBucketBehavior();
+
+ /**
+ *
+ *
+ * + * Optional. Option to specify whether structured logging is enabled. + * + * If true, JSON-formatted logs are parsed as structured logs. + *+ * + *
bool enable_structured_logging = 23 [(.google.api.field_behavior) = OPTIONAL];
+ *
+ * @return The enableStructuredLogging.
+ */
+ boolean getEnableStructuredLogging();
}
diff --git a/java-cloudbuild/proto-google-cloud-build-v1/src/main/java/com/google/cloudbuild/v1/Cloudbuild.java b/java-cloudbuild/proto-google-cloud-build-v1/src/main/java/com/google/cloudbuild/v1/Cloudbuild.java
index 7737c1acc501..d0c5f685ba5f 100644
--- a/java-cloudbuild/proto-google-cloud-build-v1/src/main/java/com/google/cloudbuild/v1/Cloudbuild.java
+++ b/java-cloudbuild/proto-google-cloud-build-v1/src/main/java/com/google/cloudbuild/v1/Cloudbuild.java
@@ -742,7 +742,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "\027\n\ntrigger_id\030\002 \001(\tB\003\340A\002\022A\n\007trigger\030\003 \001("
+ "\0132+.google.devtools.cloudbuild.v1.BuildT"
+ "riggerB\003\340A\002\022/\n\013update_mask\030\005 \001(\0132\032.googl"
- + "e.protobuf.FieldMask\"\372\013\n\014BuildOptions\022L\n"
+ + "e.protobuf.FieldMask\"\242\014\n\014BuildOptions\022L\n"
+ "\026source_provenance_hash\030\001 \003(\0162,.google.d"
+ "evtools.cloudbuild.v1.Hash.HashType\022Y\n\027r"
+ "equested_verify_option\030\002 \001(\01628.google.de"
@@ -765,7 +765,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "loudbuild.v1.Volume\022p\n\034default_logs_buck"
+ "et_behavior\030\025 \001(\0162E.google.devtools.clou"
+ "dbuild.v1.BuildOptions.DefaultLogsBucket"
- + "BehaviorB\003\340A\001\032E\n\nPoolOption\0227\n\004name\030\001 \001("
+ + "BehaviorB\003\340A\001\022&\n\031enable_structured_loggi"
+ + "ng\030\027 \001(\010B\003\340A\001\032E\n\nPoolOption\0227\n\004name\030\001 \001("
+ "\tB)\372A&\n$cloudbuild.googleapis.com/Worker"
+ "Pool\".\n\014VerifyOption\022\020\n\014NOT_VERIFIED\020\000\022\014"
+ "\n\010VERIFIED\020\001\"w\n\013MachineType\022\017\n\013UNSPECIFI"
@@ -779,9 +780,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "_ONLY\020\002\022\030\n\020STACKDRIVER_ONLY\020\003\032\002\010\001\022\026\n\022CLO"
+ "UD_LOGGING_ONLY\020\005\022\010\n\004NONE\020\004\"|\n\031DefaultLo"
+ "gsBucketBehavior\022,\n(DEFAULT_LOGS_BUCKET_"
- + "BEHAVIOR_UNSPECIFIED\020\000\022\036\n\032REGIONAL_USER_"
- + "OWNED_BUCKET\020\001\022\021\n\rLEGACY_BUCKET\020\002\"\205\001\n\034Re",
- "ceiveTriggerWebhookRequest\022\014\n\004name\030\005 \001(\t"
+ + "BEHAVIOR_UNSPECIFIED\020\000\022\036\n\032REGIONAL_USER_",
+ "OWNED_BUCKET\020\001\022\021\n\rLEGACY_BUCKET\020\002\"\205\001\n\034Re"
+ + "ceiveTriggerWebhookRequest\022\014\n\004name\030\005 \001(\t"
+ "\022\"\n\004body\030\001 \001(\0132\024.google.api.HttpBody\022\022\n\n"
+ "project_id\030\002 \001(\t\022\017\n\007trigger\030\003 \001(\t\022\016\n\006sec"
+ "ret\030\004 \001(\t\"\037\n\035ReceiveTriggerWebhookRespon"
@@ -1723,6 +1724,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
"SecretEnv",
"Volumes",
"DefaultLogsBucketBehavior",
+ "EnableStructuredLogging",
});
internal_static_google_devtools_cloudbuild_v1_BuildOptions_PoolOption_descriptor =
internal_static_google_devtools_cloudbuild_v1_BuildOptions_descriptor
diff --git a/java-cloudbuild/proto-google-cloud-build-v1/src/main/proto/google/devtools/cloudbuild/v1/cloudbuild.proto b/java-cloudbuild/proto-google-cloud-build-v1/src/main/proto/google/devtools/cloudbuild/v1/cloudbuild.proto
index 7c69fa7a8be2..efe98627bbe4 100644
--- a/java-cloudbuild/proto-google-cloud-build-v1/src/main/proto/google/devtools/cloudbuild/v1/cloudbuild.proto
+++ b/java-cloudbuild/proto-google-cloud-build-v1/src/main/proto/google/devtools/cloudbuild/v1/cloudbuild.proto
@@ -2388,6 +2388,11 @@ message BuildOptions {
// Optional. Option to specify how default logs buckets are setup.
DefaultLogsBucketBehavior default_logs_bucket_behavior = 21
[(google.api.field_behavior) = OPTIONAL];
+
+ // Optional. Option to specify whether structured logging is enabled.
+ //
+ // If true, JSON-formatted logs are parsed as structured logs.
+ bool enable_structured_logging = 23 [(google.api.field_behavior) = OPTIONAL];
}
// ReceiveTriggerWebhookRequest [Experimental] is the request object accepted by
diff --git a/java-tpu/README.md b/java-tpu/README.md
index a0bfb9f12799..270c3f71ea57 100644
--- a/java-tpu/README.md
+++ b/java-tpu/README.md
@@ -42,20 +42,20 @@ If you are using Maven without the BOM, add this to your dependencies:
UNHIDING = 15;
*/
UNHIDING(15),
+ /**
+ *
+ *
+ * + * TPU node has unknown state after a failed repair. + *+ * + *
UNKNOWN = 16;
+ */
+ UNKNOWN(16),
UNRECOGNIZED(-1),
;
@@ -405,6 +415,16 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
* UNHIDING = 15;
*/
public static final int UNHIDING_VALUE = 15;
+ /**
+ *
+ *
+ * + * TPU node has unknown state after a failed repair. + *+ * + *
UNKNOWN = 16;
+ */
+ public static final int UNKNOWN_VALUE = 16;
public final int getNumber() {
if (this == UNRECOGNIZED) {
@@ -460,6 +480,8 @@ public static State forNumber(int value) {
return HIDDEN;
case 15:
return UNHIDING;
+ case 16:
+ return UNKNOWN;
default:
return null;
}
@@ -1092,7 +1114,7 @@ public com.google.protobuf.ByteString getAcceleratorTypeBytes() {
* string ip_address = 8 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.ip_address is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=279
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=282
* @return The ipAddress.
*/
@java.lang.Override
@@ -1120,7 +1142,7 @@ public java.lang.String getIpAddress() {
* string ip_address = 8 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.ip_address is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=279
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=282
* @return The bytes for ipAddress.
*/
@java.lang.Override
@@ -1152,7 +1174,7 @@ public com.google.protobuf.ByteString getIpAddressBytes() {
* string port = 14 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.port is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=283
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=286
* @return The port.
*/
@java.lang.Override
@@ -1179,7 +1201,7 @@ public java.lang.String getPort() {
* string port = 14 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.port is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=283
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=286
* @return The bytes for port.
*/
@java.lang.Override
@@ -3243,7 +3265,7 @@ public Builder setAcceleratorTypeBytes(com.google.protobuf.ByteString value) {
* string ip_address = 8 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.ip_address is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=279
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=282
* @return The ipAddress.
*/
@java.lang.Deprecated
@@ -3270,7 +3292,7 @@ public java.lang.String getIpAddress() {
* string ip_address = 8 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.ip_address is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=279
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=282
* @return The bytes for ipAddress.
*/
@java.lang.Deprecated
@@ -3297,7 +3319,7 @@ public com.google.protobuf.ByteString getIpAddressBytes() {
* string ip_address = 8 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.ip_address is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=279
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=282
* @param value The ipAddress to set.
* @return This builder for chaining.
*/
@@ -3323,7 +3345,7 @@ public Builder setIpAddress(java.lang.String value) {
* string ip_address = 8 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.ip_address is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=279
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=282
* @return This builder for chaining.
*/
@java.lang.Deprecated
@@ -3345,7 +3367,7 @@ public Builder clearIpAddress() {
* string ip_address = 8 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.ip_address is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=279
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=282
* @param value The bytes for ipAddress to set.
* @return This builder for chaining.
*/
@@ -3373,7 +3395,7 @@ public Builder setIpAddressBytes(com.google.protobuf.ByteString value) {
* string port = 14 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.port is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=283
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=286
* @return The port.
*/
@java.lang.Deprecated
@@ -3399,7 +3421,7 @@ public java.lang.String getPort() {
* string port = 14 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.port is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=283
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=286
* @return The bytes for port.
*/
@java.lang.Deprecated
@@ -3425,7 +3447,7 @@ public com.google.protobuf.ByteString getPortBytes() {
* string port = 14 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.port is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=283
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=286
* @param value The port to set.
* @return This builder for chaining.
*/
@@ -3450,7 +3472,7 @@ public Builder setPort(java.lang.String value) {
* string port = 14 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.port is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=283
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=286
* @return This builder for chaining.
*/
@java.lang.Deprecated
@@ -3471,7 +3493,7 @@ public Builder clearPort() {
* string port = 14 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.port is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=283
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=286
* @param value The bytes for port to set.
* @return This builder for chaining.
*/
diff --git a/java-tpu/proto-google-cloud-tpu-v1/src/main/java/com/google/cloud/tpu/v1/NodeOrBuilder.java b/java-tpu/proto-google-cloud-tpu-v1/src/main/java/com/google/cloud/tpu/v1/NodeOrBuilder.java
index 7af52dcea6ba..bd307502f252 100644
--- a/java-tpu/proto-google-cloud-tpu-v1/src/main/java/com/google/cloud/tpu/v1/NodeOrBuilder.java
+++ b/java-tpu/proto-google-cloud-tpu-v1/src/main/java/com/google/cloud/tpu/v1/NodeOrBuilder.java
@@ -115,7 +115,7 @@ public interface NodeOrBuilder
* string ip_address = 8 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.ip_address is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=279
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=282
* @return The ipAddress.
*/
@java.lang.Deprecated
@@ -132,7 +132,7 @@ public interface NodeOrBuilder
* string ip_address = 8 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.ip_address is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=279
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=282
* @return The bytes for ipAddress.
*/
@java.lang.Deprecated
@@ -149,7 +149,7 @@ public interface NodeOrBuilder
* string port = 14 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.port is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=283
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=286
* @return The port.
*/
@java.lang.Deprecated
@@ -165,7 +165,7 @@ public interface NodeOrBuilder
* string port = 14 [deprecated = true];
*
* @deprecated google.cloud.tpu.v1.Node.port is deprecated. See
- * google/cloud/tpu/v1/cloud_tpu.proto;l=283
+ * google/cloud/tpu/v1/cloud_tpu.proto;l=286
* @return The bytes for port.
*/
@java.lang.Deprecated
diff --git a/java-tpu/proto-google-cloud-tpu-v1/src/main/proto/google/cloud/tpu/v1/cloud_tpu.proto b/java-tpu/proto-google-cloud-tpu-v1/src/main/proto/google/cloud/tpu/v1/cloud_tpu.proto
index 3ad0bb109b37..c1d6cc630460 100644
--- a/java-tpu/proto-google-cloud-tpu-v1/src/main/proto/google/cloud/tpu/v1/cloud_tpu.proto
+++ b/java-tpu/proto-google-cloud-tpu-v1/src/main/proto/google/cloud/tpu/v1/cloud_tpu.proto
@@ -222,6 +222,9 @@ message Node {
// TPU node is currently unhiding.
UNHIDING = 15;
+
+ // TPU node has unknown state after a failed repair.
+ UNKNOWN = 16;
}
// Health defines the status of a TPU node as reported by