- * Service for configuring sinks used to export log entries outside of - * Stackdriver Logging. + * Service for configuring sinks used to export log entries out of + * Logging. **/ @javax.annotation.Generated( @@ -427,8 +427,8 @@ public static ConfigServiceV2FutureStub newFutureStub( /** *
- * Service for configuring sinks used to export log entries outside of
- * Stackdriver Logging.
+ * Service for configuring sinks used to export log entries out of
+ * Logging.
*
*/
public static abstract class ConfigServiceV2ImplBase implements io.grpc.BindableService {
@@ -620,8 +620,8 @@ public void deleteExclusion(com.google.logging.v2.DeleteExclusionRequest request
/**
*
- * Service for configuring sinks used to export log entries outside of
- * Stackdriver Logging.
+ * Service for configuring sinks used to export log entries out of
+ * Logging.
*
*/
public static final class ConfigServiceV2Stub extends io.grpc.stub.AbstractStub
- * Service for configuring sinks used to export log entries outside of
- * Stackdriver Logging.
+ * Service for configuring sinks used to export log entries out of
+ * Logging.
*
*/
public static final class ConfigServiceV2BlockingStub extends io.grpc.stub.AbstractStub
- * Service for configuring sinks used to export log entries outside of
- * Stackdriver Logging.
+ * Service for configuring sinks used to export log entries out of
+ * Logging.
*
*/
public static final class ConfigServiceV2FutureStub extends io.grpc.stub.AbstractStub
- * Writes log entries to Stackdriver Logging. This API method is the
- * only way to send log entries to Stackdriver Logging. This method
- * is used, directly or indirectly, by the Stackdriver Logging agent
- * (fluentd) and all logging libraries configured to use Stackdriver
- * Logging.
+ * Writes log entries to Logging. This API method is the
+ * only way to send log entries to Logging. This method
+ * is used, directly or indirectly, by the Logging agent
+ * (fluentd) and all logging libraries configured to use Logging.
* A single request may contain log entries for a maximum of 1000
* different resources (projects, organizations, billing accounts or
* folders)
@@ -279,7 +278,7 @@ public void writeLogEntries(com.google.logging.v2.WriteLogEntriesRequest request
/**
*
* Lists log entries. Use this method to retrieve log entries from
- * Stackdriver Logging. For ways to export log entries, see
+ * Logging. For ways to export log entries, see
* [Exporting Logs](/logging/docs/export).
*
*/
@@ -290,8 +289,7 @@ public void listLogEntries(com.google.logging.v2.ListLogEntriesRequest request,
/**
*
- * Lists the descriptors for monitored resource types used by Stackdriver
- * Logging.
+ * Lists the descriptors for monitored resource types used by Logging.
*
*/
public void listMonitoredResourceDescriptors(com.google.logging.v2.ListMonitoredResourceDescriptorsRequest request,
@@ -388,11 +386,10 @@ public void deleteLog(com.google.logging.v2.DeleteLogRequest request,
/**
*
- * Writes log entries to Stackdriver Logging. This API method is the
- * only way to send log entries to Stackdriver Logging. This method
- * is used, directly or indirectly, by the Stackdriver Logging agent
- * (fluentd) and all logging libraries configured to use Stackdriver
- * Logging.
+ * Writes log entries to Logging. This API method is the
+ * only way to send log entries to Logging. This method
+ * is used, directly or indirectly, by the Logging agent
+ * (fluentd) and all logging libraries configured to use Logging.
* A single request may contain log entries for a maximum of 1000
* different resources (projects, organizations, billing accounts or
* folders)
@@ -407,7 +404,7 @@ public void writeLogEntries(com.google.logging.v2.WriteLogEntriesRequest request
/**
*
* Lists log entries. Use this method to retrieve log entries from
- * Stackdriver Logging. For ways to export log entries, see
+ * Logging. For ways to export log entries, see
* [Exporting Logs](/logging/docs/export).
*
*/
@@ -419,8 +416,7 @@ public void listLogEntries(com.google.logging.v2.ListLogEntriesRequest request,
/**
*
- * Lists the descriptors for monitored resource types used by Stackdriver
- * Logging.
+ * Lists the descriptors for monitored resource types used by Logging.
*
*/
public void listMonitoredResourceDescriptors(com.google.logging.v2.ListMonitoredResourceDescriptorsRequest request,
@@ -478,11 +474,10 @@ public com.google.protobuf.Empty deleteLog(com.google.logging.v2.DeleteLogReques
/**
*
- * Writes log entries to Stackdriver Logging. This API method is the
- * only way to send log entries to Stackdriver Logging. This method
- * is used, directly or indirectly, by the Stackdriver Logging agent
- * (fluentd) and all logging libraries configured to use Stackdriver
- * Logging.
+ * Writes log entries to Logging. This API method is the
+ * only way to send log entries to Logging. This method
+ * is used, directly or indirectly, by the Logging agent
+ * (fluentd) and all logging libraries configured to use Logging.
* A single request may contain log entries for a maximum of 1000
* different resources (projects, organizations, billing accounts or
* folders)
@@ -496,7 +491,7 @@ public com.google.logging.v2.WriteLogEntriesResponse writeLogEntries(com.google.
/**
*
* Lists log entries. Use this method to retrieve log entries from
- * Stackdriver Logging. For ways to export log entries, see
+ * Logging. For ways to export log entries, see
* [Exporting Logs](/logging/docs/export).
*
*/
@@ -507,8 +502,7 @@ public com.google.logging.v2.ListLogEntriesResponse listLogEntries(com.google.lo
/**
*
- * Lists the descriptors for monitored resource types used by Stackdriver
- * Logging.
+ * Lists the descriptors for monitored resource types used by Logging.
*
*/
public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse listMonitoredResourceDescriptors(com.google.logging.v2.ListMonitoredResourceDescriptorsRequest request) {
@@ -565,11 +559,10 @@ public com.google.common.util.concurrent.ListenableFuture
- * Writes log entries to Stackdriver Logging. This API method is the
- * only way to send log entries to Stackdriver Logging. This method
- * is used, directly or indirectly, by the Stackdriver Logging agent
- * (fluentd) and all logging libraries configured to use Stackdriver
- * Logging.
+ * Writes log entries to Logging. This API method is the
+ * only way to send log entries to Logging. This method
+ * is used, directly or indirectly, by the Logging agent
+ * (fluentd) and all logging libraries configured to use Logging.
* A single request may contain log entries for a maximum of 1000
* different resources (projects, organizations, billing accounts or
* folders)
@@ -584,7 +577,7 @@ public com.google.common.util.concurrent.ListenableFuture
* Lists log entries. Use this method to retrieve log entries from
- * Stackdriver Logging. For ways to export log entries, see
+ * Logging. For ways to export log entries, see
* [Exporting Logs](/logging/docs/export).
*
*/
@@ -596,8 +589,7 @@ public com.google.common.util.concurrent.ListenableFuture
- * Lists the descriptors for monitored resource types used by Stackdriver
- * Logging.
+ * Lists the descriptors for monitored resource types used by Logging.
*
*/
public com.google.common.util.concurrent.ListenableFuture listMonitoredResourceDescriptors(
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java
index 9dd5482aaf26..48959d733c3f 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java
@@ -199,7 +199,7 @@ public com.google.logging.v2.LogSinkOrBuilder getSinkOrBuilder() {
* Optional. Determines the kind of IAM identity returned as `writer_identity`
* in the new sink. If this value is omitted or set to false, and if the
* sink's parent is a project, then the value returned as `writer_identity` is
- * the same group or service account used by Stackdriver Logging before the
+ * the same group or service account used by Logging before the
* addition of writer identities to this API. The sink's destination must be
* in the same project as the sink itself.
* If this field is set to true, or if the sink is owned by a non-project
@@ -851,7 +851,7 @@ public com.google.logging.v2.LogSinkOrBuilder getSinkOrBuilder() {
* Optional. Determines the kind of IAM identity returned as `writer_identity`
* in the new sink. If this value is omitted or set to false, and if the
* sink's parent is a project, then the value returned as `writer_identity` is
- * the same group or service account used by Stackdriver Logging before the
+ * the same group or service account used by Logging before the
* addition of writer identities to this API. The sink's destination must be
* in the same project as the sink itself.
* If this field is set to true, or if the sink is owned by a non-project
@@ -870,7 +870,7 @@ public boolean getUniqueWriterIdentity() {
* Optional. Determines the kind of IAM identity returned as `writer_identity`
* in the new sink. If this value is omitted or set to false, and if the
* sink's parent is a project, then the value returned as `writer_identity` is
- * the same group or service account used by Stackdriver Logging before the
+ * the same group or service account used by Logging before the
* addition of writer identities to this API. The sink's destination must be
* in the same project as the sink itself.
* If this field is set to true, or if the sink is owned by a non-project
@@ -892,7 +892,7 @@ public Builder setUniqueWriterIdentity(boolean value) {
* Optional. Determines the kind of IAM identity returned as `writer_identity`
* in the new sink. If this value is omitted or set to false, and if the
* sink's parent is a project, then the value returned as `writer_identity` is
- * the same group or service account used by Stackdriver Logging before the
+ * the same group or service account used by Logging before the
* addition of writer identities to this API. The sink's destination must be
* in the same project as the sink itself.
* If this field is set to true, or if the sink is owned by a non-project
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequestOrBuilder.java
index 03a4ff28917e..302f41b6569d 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequestOrBuilder.java
@@ -68,7 +68,7 @@ public interface CreateSinkRequestOrBuilder extends
* Optional. Determines the kind of IAM identity returned as `writer_identity`
* in the new sink. If this value is omitted or set to false, and if the
* sink's parent is a project, then the value returned as `writer_identity` is
- * the same group or service account used by Stackdriver Logging before the
+ * the same group or service account used by Logging before the
* addition of writer identities to this API. The sink's destination must be
* in the same project as the sink itself.
* If this field is set to true, or if the sink is owned by a non-project
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java
index 374ad8a5b193..8b0932e6014e 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java
@@ -25,6 +25,7 @@ private LogEntry() {
insertId_ = "";
trace_ = "";
spanId_ = "";
+ traceSampled_ = false;
}
@java.lang.Override
@@ -219,6 +220,11 @@ private LogEntry(
spanId_ = s;
break;
}
+ case 240: {
+
+ traceSampled_ = input.readBool();
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -565,7 +571,7 @@ public com.google.protobuf.StructOrBuilder getJsonPayloadOrBuilder() {
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -586,7 +592,7 @@ public boolean hasTimestamp() {
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -607,7 +613,7 @@ public com.google.protobuf.Timestamp getTimestamp() {
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -628,7 +634,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() {
private com.google.protobuf.Timestamp receiveTimestamp_;
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -638,7 +644,7 @@ public boolean hasReceiveTimestamp() {
}
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -648,7 +654,7 @@ public com.google.protobuf.Timestamp getReceiveTimestamp() {
}
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -689,9 +695,9 @@ public com.google.logging.type.LogSeverity getSeverity() {
/**
*
* Optional. A unique identifier for the log entry. If you provide a value,
- * then Stackdriver Logging considers other log entries in the same project,
+ * then Logging considers other log entries in the same project,
* with the same `timestamp`, and with the same `insert_id` to be duplicates
- * which can be removed. If omitted in new log entries, then Stackdriver
+ * which can be removed. If omitted in new log entries, then
* Logging assigns its own unique identifier. The `insert_id` is also used
* to order log entries that have the same `timestamp` value.
*
@@ -713,9 +719,9 @@ public java.lang.String getInsertId() {
/**
*
* Optional. A unique identifier for the log entry. If you provide a value,
- * then Stackdriver Logging considers other log entries in the same project,
+ * then Logging considers other log entries in the same project,
* with the same `timestamp`, and with the same `insert_id` to be duplicates
- * which can be removed. If omitted in new log entries, then Stackdriver
+ * which can be removed. If omitted in new log entries, then
* Logging assigns its own unique identifier. The `insert_id` is also used
* to order log entries that have the same `timestamp` value.
*
@@ -995,8 +1001,8 @@ public java.lang.String getTrace() {
private volatile java.lang.Object spanId_;
/**
*
- * Optional. The span ID within the trace associated with the log entry. For
- * Stackdriver Trace spans, this is the same format that the Stackdriver Trace
+ * Optional. The span ID within the trace associated with the log entry.
+ * For Trace spans, this is the same format that the Trace
* API v2 uses: a 16-character hexadecimal encoding of an 8-byte array, such
* as <code>"000000000000004a"</code>.
*
@@ -1017,8 +1023,8 @@ public java.lang.String getSpanId() {
}
/**
*
- * Optional. The span ID within the trace associated with the log entry. For
- * Stackdriver Trace spans, this is the same format that the Stackdriver Trace
+ * Optional. The span ID within the trace associated with the log entry.
+ * For Trace spans, this is the same format that the Trace
* API v2 uses: a 16-character hexadecimal encoding of an 8-byte array, such
* as <code>"000000000000004a"</code>.
*
@@ -1039,6 +1045,24 @@ public java.lang.String getSpanId() {
}
}
+ public static final int TRACE_SAMPLED_FIELD_NUMBER = 30;
+ private boolean traceSampled_;
+ /**
+ *
+ * Optional. The sampling decision of the trace associated with the log entry.
+ * True means that the trace resource name in the `trace` field was sampled
+ * for storage in a trace backend. False means that the trace was not sampled
+ * for storage when this log entry was written, or the sampling decision was
+ * unknown at the time. A non-sampled `trace` value is still useful as a
+ * request correlation identifier. The default is False.
+ *
+ *
+ * bool trace_sampled = 30;
+ */
+ public boolean getTraceSampled() {
+ return traceSampled_;
+ }
+
public static final int SOURCE_LOCATION_FIELD_NUMBER = 23;
private com.google.logging.v2.LogEntrySourceLocation sourceLocation_;
/**
@@ -1140,6 +1164,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getSpanIdBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 27, spanId_);
}
+ if (traceSampled_ != false) {
+ output.writeBool(30, traceSampled_);
+ }
unknownFields.writeTo(output);
}
@@ -1214,6 +1241,10 @@ public int getSerializedSize() {
if (!getSpanIdBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(27, spanId_);
}
+ if (traceSampled_ != false) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(30, traceSampled_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -1271,6 +1302,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getTrace());
result = result && getSpanId()
.equals(other.getSpanId());
+ result = result && (getTraceSampled()
+ == other.getTraceSampled());
result = result && (hasSourceLocation() == other.hasSourceLocation());
if (hasSourceLocation()) {
result = result && getSourceLocation()
@@ -1344,6 +1377,9 @@ public int hashCode() {
hash = (53 * hash) + getTrace().hashCode();
hash = (37 * hash) + SPAN_ID_FIELD_NUMBER;
hash = (53 * hash) + getSpanId().hashCode();
+ hash = (37 * hash) + TRACE_SAMPLED_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+ getTraceSampled());
if (hasSourceLocation()) {
hash = (37 * hash) + SOURCE_LOCATION_FIELD_NUMBER;
hash = (53 * hash) + getSourceLocation().hashCode();
@@ -1570,6 +1606,8 @@ public Builder clear() {
spanId_ = "";
+ traceSampled_ = false;
+
if (sourceLocationBuilder_ == null) {
sourceLocation_ = null;
} else {
@@ -1660,6 +1698,7 @@ public com.google.logging.v2.LogEntry buildPartial() {
}
result.trace_ = trace_;
result.spanId_ = spanId_;
+ result.traceSampled_ = traceSampled_;
if (sourceLocationBuilder_ == null) {
result.sourceLocation_ = sourceLocation_;
} else {
@@ -1754,6 +1793,9 @@ public Builder mergeFrom(com.google.logging.v2.LogEntry other) {
spanId_ = other.spanId_;
onChanged();
}
+ if (other.getTraceSampled() != false) {
+ setTraceSampled(other.getTraceSampled());
+ }
if (other.hasSourceLocation()) {
mergeSourceLocation(other.getSourceLocation());
}
@@ -2654,7 +2696,7 @@ public com.google.protobuf.StructOrBuilder getJsonPayloadOrBuilder() {
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -2675,7 +2717,7 @@ public boolean hasTimestamp() {
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -2700,7 +2742,7 @@ public com.google.protobuf.Timestamp getTimestamp() {
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -2731,7 +2773,7 @@ public Builder setTimestamp(com.google.protobuf.Timestamp value) {
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -2760,7 +2802,7 @@ public Builder setTimestamp(
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -2793,7 +2835,7 @@ public Builder mergeTimestamp(com.google.protobuf.Timestamp value) {
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -2822,7 +2864,7 @@ public Builder clearTimestamp() {
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -2845,7 +2887,7 @@ public com.google.protobuf.Timestamp.Builder getTimestampBuilder() {
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -2871,7 +2913,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() {
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -2903,7 +2945,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() {
com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> receiveTimestampBuilder_;
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -2913,7 +2955,7 @@ public boolean hasReceiveTimestamp() {
}
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -2927,7 +2969,7 @@ public com.google.protobuf.Timestamp getReceiveTimestamp() {
}
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -2947,7 +2989,7 @@ public Builder setReceiveTimestamp(com.google.protobuf.Timestamp value) {
}
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -2965,7 +3007,7 @@ public Builder setReceiveTimestamp(
}
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -2987,7 +3029,7 @@ public Builder mergeReceiveTimestamp(com.google.protobuf.Timestamp value) {
}
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -3005,7 +3047,7 @@ public Builder clearReceiveTimestamp() {
}
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -3017,7 +3059,7 @@ public com.google.protobuf.Timestamp.Builder getReceiveTimestampBuilder() {
}
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -3032,7 +3074,7 @@ public com.google.protobuf.TimestampOrBuilder getReceiveTimestampOrBuilder() {
}
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -3125,9 +3167,9 @@ public Builder clearSeverity() {
/**
*
* Optional. A unique identifier for the log entry. If you provide a value,
- * then Stackdriver Logging considers other log entries in the same project,
+ * then Logging considers other log entries in the same project,
* with the same `timestamp`, and with the same `insert_id` to be duplicates
- * which can be removed. If omitted in new log entries, then Stackdriver
+ * which can be removed. If omitted in new log entries, then
* Logging assigns its own unique identifier. The `insert_id` is also used
* to order log entries that have the same `timestamp` value.
*
@@ -3149,9 +3191,9 @@ public java.lang.String getInsertId() {
/**
*
* Optional. A unique identifier for the log entry. If you provide a value,
- * then Stackdriver Logging considers other log entries in the same project,
+ * then Logging considers other log entries in the same project,
* with the same `timestamp`, and with the same `insert_id` to be duplicates
- * which can be removed. If omitted in new log entries, then Stackdriver
+ * which can be removed. If omitted in new log entries, then
* Logging assigns its own unique identifier. The `insert_id` is also used
* to order log entries that have the same `timestamp` value.
*
@@ -3174,9 +3216,9 @@ public java.lang.String getInsertId() {
/**
*
* Optional. A unique identifier for the log entry. If you provide a value,
- * then Stackdriver Logging considers other log entries in the same project,
+ * then Logging considers other log entries in the same project,
* with the same `timestamp`, and with the same `insert_id` to be duplicates
- * which can be removed. If omitted in new log entries, then Stackdriver
+ * which can be removed. If omitted in new log entries, then
* Logging assigns its own unique identifier. The `insert_id` is also used
* to order log entries that have the same `timestamp` value.
*
@@ -3196,9 +3238,9 @@ public Builder setInsertId(
/**
*
* Optional. A unique identifier for the log entry. If you provide a value,
- * then Stackdriver Logging considers other log entries in the same project,
+ * then Logging considers other log entries in the same project,
* with the same `timestamp`, and with the same `insert_id` to be duplicates
- * which can be removed. If omitted in new log entries, then Stackdriver
+ * which can be removed. If omitted in new log entries, then
* Logging assigns its own unique identifier. The `insert_id` is also used
* to order log entries that have the same `timestamp` value.
*
@@ -3214,9 +3256,9 @@ public Builder clearInsertId() {
/**
*
* Optional. A unique identifier for the log entry. If you provide a value,
- * then Stackdriver Logging considers other log entries in the same project,
+ * then Logging considers other log entries in the same project,
* with the same `timestamp`, and with the same `insert_id` to be duplicates
- * which can be removed. If omitted in new log entries, then Stackdriver
+ * which can be removed. If omitted in new log entries, then
* Logging assigns its own unique identifier. The `insert_id` is also used
* to order log entries that have the same `timestamp` value.
*
@@ -3995,8 +4037,8 @@ public Builder setTraceBytes(
private java.lang.Object spanId_ = "";
/**
*
- * Optional. The span ID within the trace associated with the log entry. For
- * Stackdriver Trace spans, this is the same format that the Stackdriver Trace
+ * Optional. The span ID within the trace associated with the log entry.
+ * For Trace spans, this is the same format that the Trace
* API v2 uses: a 16-character hexadecimal encoding of an 8-byte array, such
* as <code>"000000000000004a"</code>.
*
@@ -4017,8 +4059,8 @@ public java.lang.String getSpanId() {
}
/**
*
- * Optional. The span ID within the trace associated with the log entry. For
- * Stackdriver Trace spans, this is the same format that the Stackdriver Trace
+ * Optional. The span ID within the trace associated with the log entry.
+ * For Trace spans, this is the same format that the Trace
* API v2 uses: a 16-character hexadecimal encoding of an 8-byte array, such
* as <code>"000000000000004a"</code>.
*
@@ -4040,8 +4082,8 @@ public java.lang.String getSpanId() {
}
/**
*
- * Optional. The span ID within the trace associated with the log entry. For
- * Stackdriver Trace spans, this is the same format that the Stackdriver Trace
+ * Optional. The span ID within the trace associated with the log entry.
+ * For Trace spans, this is the same format that the Trace
* API v2 uses: a 16-character hexadecimal encoding of an 8-byte array, such
* as <code>"000000000000004a"</code>.
*
@@ -4060,8 +4102,8 @@ public Builder setSpanId(
}
/**
*
- * Optional. The span ID within the trace associated with the log entry. For
- * Stackdriver Trace spans, this is the same format that the Stackdriver Trace
+ * Optional. The span ID within the trace associated with the log entry.
+ * For Trace spans, this is the same format that the Trace
* API v2 uses: a 16-character hexadecimal encoding of an 8-byte array, such
* as <code>"000000000000004a"</code>.
*
@@ -4076,8 +4118,8 @@ public Builder clearSpanId() {
}
/**
*
- * Optional. The span ID within the trace associated with the log entry. For
- * Stackdriver Trace spans, this is the same format that the Stackdriver Trace
+ * Optional. The span ID within the trace associated with the log entry.
+ * For Trace spans, this is the same format that the Trace
* API v2 uses: a 16-character hexadecimal encoding of an 8-byte array, such
* as <code>"000000000000004a"</code>.
*
@@ -4096,6 +4138,59 @@ public Builder setSpanIdBytes(
return this;
}
+ private boolean traceSampled_ ;
+ /**
+ *
+ * Optional. The sampling decision of the trace associated with the log entry.
+ * True means that the trace resource name in the `trace` field was sampled
+ * for storage in a trace backend. False means that the trace was not sampled
+ * for storage when this log entry was written, or the sampling decision was
+ * unknown at the time. A non-sampled `trace` value is still useful as a
+ * request correlation identifier. The default is False.
+ *
+ *
+ * bool trace_sampled = 30;
+ */
+ public boolean getTraceSampled() {
+ return traceSampled_;
+ }
+ /**
+ *
+ * Optional. The sampling decision of the trace associated with the log entry.
+ * True means that the trace resource name in the `trace` field was sampled
+ * for storage in a trace backend. False means that the trace was not sampled
+ * for storage when this log entry was written, or the sampling decision was
+ * unknown at the time. A non-sampled `trace` value is still useful as a
+ * request correlation identifier. The default is False.
+ *
+ *
+ * bool trace_sampled = 30;
+ */
+ public Builder setTraceSampled(boolean value) {
+
+ traceSampled_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * Optional. The sampling decision of the trace associated with the log entry.
+ * True means that the trace resource name in the `trace` field was sampled
+ * for storage in a trace backend. False means that the trace was not sampled
+ * for storage when this log entry was written, or the sampling decision was
+ * unknown at the time. A non-sampled `trace` value is still useful as a
+ * request correlation identifier. The default is False.
+ *
+ *
+ * bool trace_sampled = 30;
+ */
+ public Builder clearTraceSampled() {
+
+ traceSampled_ = false;
+ onChanged();
+ return this;
+ }
+
private com.google.logging.v2.LogEntrySourceLocation sourceLocation_ = null;
private com.google.protobuf.SingleFieldBuilderV3<
com.google.logging.v2.LogEntrySourceLocation, com.google.logging.v2.LogEntrySourceLocation.Builder, com.google.logging.v2.LogEntrySourceLocationOrBuilder> sourceLocationBuilder_;
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOrBuilder.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOrBuilder.java
index f06d9b933da1..9ed5c39ddf6a 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOrBuilder.java
@@ -175,7 +175,7 @@ public interface LogEntryOrBuilder extends
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -194,7 +194,7 @@ public interface LogEntryOrBuilder extends
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -213,7 +213,7 @@ public interface LogEntryOrBuilder extends
* Optional. The time the event described by the log entry occurred.
* This time is used to compute the log entry's age and to enforce
* the logs retention period. If this field is omitted in a new log
- * entry, then Stackdriver Logging assigns it the current time.
+ * entry, then Logging assigns it the current time.
* Timestamps have nanosecond accuracy, but trailing zeros in the fractional
* seconds might be omitted when the timestamp is displayed.
* Incoming log entries should have timestamps that are no more than
@@ -230,7 +230,7 @@ public interface LogEntryOrBuilder extends
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -238,7 +238,7 @@ public interface LogEntryOrBuilder extends
boolean hasReceiveTimestamp();
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -246,7 +246,7 @@ public interface LogEntryOrBuilder extends
com.google.protobuf.Timestamp getReceiveTimestamp();
/**
*
- * Output only. The time the log entry was received by Stackdriver Logging.
+ * Output only. The time the log entry was received by Logging.
*
*
* .google.protobuf.Timestamp receive_timestamp = 24;
@@ -275,9 +275,9 @@ public interface LogEntryOrBuilder extends
/**
*
* Optional. A unique identifier for the log entry. If you provide a value,
- * then Stackdriver Logging considers other log entries in the same project,
+ * then Logging considers other log entries in the same project,
* with the same `timestamp`, and with the same `insert_id` to be duplicates
- * which can be removed. If omitted in new log entries, then Stackdriver
+ * which can be removed. If omitted in new log entries, then
* Logging assigns its own unique identifier. The `insert_id` is also used
* to order log entries that have the same `timestamp` value.
*
@@ -288,9 +288,9 @@ public interface LogEntryOrBuilder extends
/**
*
* Optional. A unique identifier for the log entry. If you provide a value,
- * then Stackdriver Logging considers other log entries in the same project,
+ * then Logging considers other log entries in the same project,
* with the same `timestamp`, and with the same `insert_id` to be duplicates
- * which can be removed. If omitted in new log entries, then Stackdriver
+ * which can be removed. If omitted in new log entries, then
* Logging assigns its own unique identifier. The `insert_id` is also used
* to order log entries that have the same `timestamp` value.
*
@@ -472,8 +472,8 @@ java.lang.String getLabelsOrThrow(
/**
*
- * Optional. The span ID within the trace associated with the log entry. For
- * Stackdriver Trace spans, this is the same format that the Stackdriver Trace
+ * Optional. The span ID within the trace associated with the log entry.
+ * For Trace spans, this is the same format that the Trace
* API v2 uses: a 16-character hexadecimal encoding of an 8-byte array, such
* as <code>"000000000000004a"</code>.
*
@@ -483,8 +483,8 @@ java.lang.String getLabelsOrThrow(
java.lang.String getSpanId();
/**
*
- * Optional. The span ID within the trace associated with the log entry. For
- * Stackdriver Trace spans, this is the same format that the Stackdriver Trace
+ * Optional. The span ID within the trace associated with the log entry.
+ * For Trace spans, this is the same format that the Trace
* API v2 uses: a 16-character hexadecimal encoding of an 8-byte array, such
* as <code>"000000000000004a"</code>.
*
@@ -494,6 +494,20 @@ java.lang.String getLabelsOrThrow(
com.google.protobuf.ByteString
getSpanIdBytes();
+ /**
+ *
+ * Optional. The sampling decision of the trace associated with the log entry.
+ * True means that the trace resource name in the `trace` field was sampled
+ * for storage in a trace backend. False means that the trace was not sampled
+ * for storage when this log entry was written, or the sampling decision was
+ * unknown at the time. A non-sampled `trace` value is still useful as a
+ * request correlation identifier. The default is False.
+ *
+ *
+ * bool trace_sampled = 30;
+ */
+ boolean getTraceSampled();
+
/**
*
* Optional. Source code location information associated with the log entry,
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryProto.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryProto.java
index b9379914d819..408197f16843 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryProto.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryProto.java
@@ -50,7 +50,7 @@ public static void registerAllExtensions(
"o\032&google/logging/type/log_severity.prot" +
"o\032\031google/protobuf/any.proto\032\034google/pro" +
"tobuf/struct.proto\032\037google/protobuf/time" +
- "stamp.proto\"\363\005\n\010LogEntry\022\020\n\010log_name\030\014 \001" +
+ "stamp.proto\"\212\006\n\010LogEntry\022\020\n\010log_name\030\014 \001" +
"(\t\022/\n\010resource\030\010 \001(\0132\035.google.api.Monito" +
"redResource\022-\n\rproto_payload\030\002 \001(\0132\024.goo" +
"gle.protobuf.AnyH\000\022\026\n\014text_payload\030\003 \001(\t" +
@@ -66,18 +66,18 @@ public static void registerAllExtensions(
"ogle.api.MonitoredResourceMetadata\0227\n\top" +
"eration\030\017 \001(\0132$.google.logging.v2.LogEnt" +
"ryOperation\022\r\n\005trace\030\026 \001(\t\022\017\n\007span_id\030\033 " +
- "\001(\t\022B\n\017source_location\030\027 \001(\0132).google.lo" +
- "gging.v2.LogEntrySourceLocation\032-\n\013Label" +
- "sEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\t" +
- "\n\007payload\"N\n\021LogEntryOperation\022\n\n\002id\030\001 \001" +
- "(\t\022\020\n\010producer\030\002 \001(\t\022\r\n\005first\030\003 \001(\010\022\014\n\004l" +
- "ast\030\004 \001(\010\"F\n\026LogEntrySourceLocation\022\014\n\004f" +
- "ile\030\001 \001(\t\022\014\n\004line\030\002 \001(\003\022\020\n\010function\030\003 \001(" +
- "\tB\231\001\n\025com.google.logging.v2B\rLogEntryPro" +
- "toP\001Z8google.golang.org/genproto/googlea" +
- "pis/logging/v2;logging\370\001\001\252\002\027Google.Cloud" +
- ".Logging.V2\312\002\027Google\\Cloud\\Logging\\V2b\006p" +
- "roto3"
+ "\001(\t\022\025\n\rtrace_sampled\030\036 \001(\010\022B\n\017source_loc" +
+ "ation\030\027 \001(\0132).google.logging.v2.LogEntry" +
+ "SourceLocation\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001" +
+ "(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\t\n\007payload\"N\n\021LogE" +
+ "ntryOperation\022\n\n\002id\030\001 \001(\t\022\020\n\010producer\030\002 " +
+ "\001(\t\022\r\n\005first\030\003 \001(\010\022\014\n\004last\030\004 \001(\010\"F\n\026LogE" +
+ "ntrySourceLocation\022\014\n\004file\030\001 \001(\t\022\014\n\004line" +
+ "\030\002 \001(\003\022\020\n\010function\030\003 \001(\tB\231\001\n\025com.google." +
+ "logging.v2B\rLogEntryProtoP\001Z8google.gola" +
+ "ng.org/genproto/googleapis/logging/v2;lo" +
+ "gging\370\001\001\252\002\027Google.Cloud.Logging.V2\312\002\027Goo" +
+ "gle\\Cloud\\Logging\\V2b\006proto3"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
@@ -103,7 +103,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
internal_static_google_logging_v2_LogEntry_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_logging_v2_LogEntry_descriptor,
- new java.lang.String[] { "LogName", "Resource", "ProtoPayload", "TextPayload", "JsonPayload", "Timestamp", "ReceiveTimestamp", "Severity", "InsertId", "HttpRequest", "Labels", "Metadata", "Operation", "Trace", "SpanId", "SourceLocation", "Payload", });
+ new java.lang.String[] { "LogName", "Resource", "ProtoPayload", "TextPayload", "JsonPayload", "Timestamp", "ReceiveTimestamp", "Severity", "InsertId", "HttpRequest", "Labels", "Metadata", "Operation", "Trace", "SpanId", "TraceSampled", "SourceLocation", "Payload", });
internal_static_google_logging_v2_LogEntry_LabelsEntry_descriptor =
internal_static_google_logging_v2_LogEntry_descriptor.getNestedTypes().get(0);
internal_static_google_logging_v2_LogEntry_LabelsEntry_fieldAccessorTable = new
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java
index 72a08e50dcf4..07da2072b583 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java
@@ -5,7 +5,7 @@
/**
*
- * Specifies a set of log entries that are not to be stored in Stackdriver
+ * Specifies a set of log entries that are not to be stored in
* Logging. If your project receives a large volume of logs, you might be able
* to use exclusions to reduce your chargeable logs. Exclusions are processed
* after log sinks, so you can export log entries before they are excluded.
@@ -459,7 +459,7 @@ protected Builder newBuilderForType(
}
/**
*
- * Specifies a set of log entries that are not to be stored in Stackdriver
+ * Specifies a set of log entries that are not to be stored in
* Logging. If your project receives a large volume of logs, you might be able
* to use exclusions to reduce your chargeable logs. Exclusions are processed
* after log sinks, so you can export log entries before they are excluded.
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java
index 800a86b07ce4..8ae169c32d6f 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java
@@ -171,7 +171,7 @@ protected com.google.protobuf.MapField internalGetMapField(
/**
*
- * Stackdriver Logging API version.
+ * Logging API version.
*
*
* Protobuf enum {@code google.logging.v2.LogMetric.ApiVersion}
@@ -180,7 +180,7 @@ public enum ApiVersion
implements com.google.protobuf.ProtocolMessageEnum {
/**
*
- * Stackdriver Logging API v2.
+ * Logging API v2.
*
*
* V2 = 0;
@@ -188,7 +188,7 @@ public enum ApiVersion
V2(0),
/**
*
- * Stackdriver Logging API v1.
+ * Logging API v1.
*
*
* V1 = 1;
@@ -199,7 +199,7 @@ public enum ApiVersion
/**
*
- * Stackdriver Logging API v2.
+ * Logging API v2.
*
*
* V2 = 0;
@@ -207,7 +207,7 @@ public enum ApiVersion
public static final int V2_VALUE = 0;
/**
*
- * Stackdriver Logging API v1.
+ * Logging API v1.
*
*
* V1 = 1;
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java
index 1df7360f6fa0..f6d89335d348 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java
@@ -151,7 +151,7 @@ private LogSink(
/**
*
- * Available log entry formats. Log entries can be written to Stackdriver
+ * Available log entry formats. Log entries can be written to
* Logging in either format and can be exported in either format.
* Version 2 is the preferred format.
*
@@ -474,7 +474,7 @@ public java.lang.String getFilter() {
/**
*
* Output only. An IAM identity—a service account or group—under
- * which Stackdriver Logging writes the exported log entries to the sink's
+ * which Logging writes the exported log entries to the sink's
* destination. This field is set by
* [sinks.create](/logging/docs/api/reference/rest/v2/projects.sinks/create)
* and
@@ -505,7 +505,7 @@ public java.lang.String getWriterIdentity() {
/**
*
* Output only. An IAM identity—a service account or group—under
- * which Stackdriver Logging writes the exported log entries to the sink's
+ * which Logging writes the exported log entries to the sink's
* destination. This field is set by
* [sinks.create](/logging/docs/api/reference/rest/v2/projects.sinks/create)
* and
@@ -1497,7 +1497,7 @@ public Builder setFilterBytes(
/**
*
* Output only. An IAM identity—a service account or group—under
- * which Stackdriver Logging writes the exported log entries to the sink's
+ * which Logging writes the exported log entries to the sink's
* destination. This field is set by
* [sinks.create](/logging/docs/api/reference/rest/v2/projects.sinks/create)
* and
@@ -1528,7 +1528,7 @@ public java.lang.String getWriterIdentity() {
/**
*
* Output only. An IAM identity—a service account or group—under
- * which Stackdriver Logging writes the exported log entries to the sink's
+ * which Logging writes the exported log entries to the sink's
* destination. This field is set by
* [sinks.create](/logging/docs/api/reference/rest/v2/projects.sinks/create)
* and
@@ -1560,7 +1560,7 @@ public java.lang.String getWriterIdentity() {
/**
*
* Output only. An IAM identity—a service account or group—under
- * which Stackdriver Logging writes the exported log entries to the sink's
+ * which Logging writes the exported log entries to the sink's
* destination. This field is set by
* [sinks.create](/logging/docs/api/reference/rest/v2/projects.sinks/create)
* and
@@ -1589,7 +1589,7 @@ public Builder setWriterIdentity(
/**
*
* Output only. An IAM identity—a service account or group—under
- * which Stackdriver Logging writes the exported log entries to the sink's
+ * which Logging writes the exported log entries to the sink's
* destination. This field is set by
* [sinks.create](/logging/docs/api/reference/rest/v2/projects.sinks/create)
* and
@@ -1614,7 +1614,7 @@ public Builder clearWriterIdentity() {
/**
*
* Output only. An IAM identity—a service account or group—under
- * which Stackdriver Logging writes the exported log entries to the sink's
+ * which Logging writes the exported log entries to the sink's
* destination. This field is set by
* [sinks.create](/logging/docs/api/reference/rest/v2/projects.sinks/create)
* and
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkOrBuilder.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkOrBuilder.java
index 5bb5eda9e781..4b5c9cbd6c93 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkOrBuilder.java
@@ -113,7 +113,7 @@ public interface LogSinkOrBuilder extends
/**
*
* Output only. An IAM identity—a service account or group—under
- * which Stackdriver Logging writes the exported log entries to the sink's
+ * which Logging writes the exported log entries to the sink's
* destination. This field is set by
* [sinks.create](/logging/docs/api/reference/rest/v2/projects.sinks/create)
* and
@@ -133,7 +133,7 @@ public interface LogSinkOrBuilder extends
/**
*
* Output only. An IAM identity—a service account or group—under
- * which Stackdriver Logging writes the exported log entries to the sink's
+ * which Logging writes the exported log entries to the sink's
* destination. This field is set by
* [sinks.create](/logging/docs/api/reference/rest/v2/projects.sinks/create)
* and
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java
index 1ce3e1b01320..a1614c8517c5 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java
@@ -68,51 +68,52 @@ public static void registerAllExtensions(
"ions.proto\032\035google/api/distribution.prot" +
"o\032\027google/api/metric.proto\032\033google/proto" +
"buf/empty.proto\032 google/protobuf/field_m" +
- "ask.proto\"\261\003\n\tLogMetric\022\014\n\004name\030\001 \001(\t\022\023\n" +
- "\013description\030\002 \001(\t\022\016\n\006filter\030\003 \001(\t\0227\n\021me" +
- "tric_descriptor\030\005 \001(\0132\034.google.api.Metri" +
- "cDescriptor\022\027\n\017value_extractor\030\006 \001(\t\022K\n\020" +
- "label_extractors\030\007 \003(\01321.google.logging." +
- "v2.LogMetric.LabelExtractorsEntry\022>\n\016buc" +
- "ket_options\030\010 \001(\0132&.google.api.Distribut" +
- "ion.BucketOptions\022<\n\007version\030\004 \001(\0162\'.goo" +
- "gle.logging.v2.LogMetric.ApiVersionB\002\030\001\032" +
- "6\n\024LabelExtractorsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" +
- "value\030\002 \001(\t:\0028\001\"\034\n\nApiVersion\022\006\n\002V2\020\000\022\006\n" +
- "\002V1\020\001\"N\n\025ListLogMetricsRequest\022\016\n\006parent" +
- "\030\001 \001(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n\tpage_size\030" +
- "\003 \001(\005\"`\n\026ListLogMetricsResponse\022-\n\007metri" +
- "cs\030\001 \003(\0132\034.google.logging.v2.LogMetric\022\027" +
- "\n\017next_page_token\030\002 \001(\t\"*\n\023GetLogMetricR" +
- "equest\022\023\n\013metric_name\030\001 \001(\t\"V\n\026CreateLog" +
- "MetricRequest\022\016\n\006parent\030\001 \001(\t\022,\n\006metric\030" +
- "\002 \001(\0132\034.google.logging.v2.LogMetric\"[\n\026U" +
- "pdateLogMetricRequest\022\023\n\013metric_name\030\001 \001" +
- "(\t\022,\n\006metric\030\002 \001(\0132\034.google.logging.v2.L" +
- "ogMetric\"-\n\026DeleteLogMetricRequest\022\023\n\013me" +
- "tric_name\030\001 \001(\t2\324\005\n\020MetricsServiceV2\022\216\001\n" +
- "\016ListLogMetrics\022(.google.logging.v2.List" +
- "LogMetricsRequest\032).google.logging.v2.Li" +
- "stLogMetricsResponse\"\'\202\323\344\223\002!\022\037/v2/{paren" +
- "t=projects/*}/metrics\022\204\001\n\014GetLogMetric\022&" +
- ".google.logging.v2.GetLogMetricRequest\032\034" +
- ".google.logging.v2.LogMetric\".\202\323\344\223\002(\022&/v" +
- "2/{metric_name=projects/*/metrics/*}\022\213\001\n" +
- "\017CreateLogMetric\022).google.logging.v2.Cre" +
- "ateLogMetricRequest\032\034.google.logging.v2." +
- "LogMetric\"/\202\323\344\223\002)\"\037/v2/{parent=projects/" +
- "*}/metrics:\006metric\022\222\001\n\017UpdateLogMetric\022)" +
- ".google.logging.v2.UpdateLogMetricReques" +
- "t\032\034.google.logging.v2.LogMetric\"6\202\323\344\223\0020\032" +
- "&/v2/{metric_name=projects/*/metrics/*}:" +
- "\006metric\022\204\001\n\017DeleteLogMetric\022).google.log" +
- "ging.v2.DeleteLogMetricRequest\032\026.google." +
- "protobuf.Empty\".\202\323\344\223\002(*&/v2/{metric_name" +
- "=projects/*/metrics/*}B\237\001\n\025com.google.lo" +
- "gging.v2B\023LoggingMetricsProtoP\001Z8google." +
- "golang.org/genproto/googleapis/logging/v" +
- "2;logging\370\001\001\252\002\027Google.Cloud.Logging.V2\312\002" +
- "\027Google\\Cloud\\Logging\\V2b\006proto3"
+ "ask.proto\032\037google/protobuf/timestamp.pro" +
+ "to\"\261\003\n\tLogMetric\022\014\n\004name\030\001 \001(\t\022\023\n\013descri" +
+ "ption\030\002 \001(\t\022\016\n\006filter\030\003 \001(\t\0227\n\021metric_de" +
+ "scriptor\030\005 \001(\0132\034.google.api.MetricDescri" +
+ "ptor\022\027\n\017value_extractor\030\006 \001(\t\022K\n\020label_e" +
+ "xtractors\030\007 \003(\01321.google.logging.v2.LogM" +
+ "etric.LabelExtractorsEntry\022>\n\016bucket_opt" +
+ "ions\030\010 \001(\0132&.google.api.Distribution.Buc" +
+ "ketOptions\022<\n\007version\030\004 \001(\0162\'.google.log" +
+ "ging.v2.LogMetric.ApiVersionB\002\030\001\0326\n\024Labe" +
+ "lExtractorsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002" +
+ " \001(\t:\0028\001\"\034\n\nApiVersion\022\006\n\002V2\020\000\022\006\n\002V1\020\001\"N" +
+ "\n\025ListLogMetricsRequest\022\016\n\006parent\030\001 \001(\t\022" +
+ "\022\n\npage_token\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\"`" +
+ "\n\026ListLogMetricsResponse\022-\n\007metrics\030\001 \003(" +
+ "\0132\034.google.logging.v2.LogMetric\022\027\n\017next_" +
+ "page_token\030\002 \001(\t\"*\n\023GetLogMetricRequest\022" +
+ "\023\n\013metric_name\030\001 \001(\t\"V\n\026CreateLogMetricR" +
+ "equest\022\016\n\006parent\030\001 \001(\t\022,\n\006metric\030\002 \001(\0132\034" +
+ ".google.logging.v2.LogMetric\"[\n\026UpdateLo" +
+ "gMetricRequest\022\023\n\013metric_name\030\001 \001(\t\022,\n\006m" +
+ "etric\030\002 \001(\0132\034.google.logging.v2.LogMetri" +
+ "c\"-\n\026DeleteLogMetricRequest\022\023\n\013metric_na" +
+ "me\030\001 \001(\t2\324\005\n\020MetricsServiceV2\022\216\001\n\016ListLo" +
+ "gMetrics\022(.google.logging.v2.ListLogMetr" +
+ "icsRequest\032).google.logging.v2.ListLogMe" +
+ "tricsResponse\"\'\202\323\344\223\002!\022\037/v2/{parent=proje" +
+ "cts/*}/metrics\022\204\001\n\014GetLogMetric\022&.google" +
+ ".logging.v2.GetLogMetricRequest\032\034.google" +
+ ".logging.v2.LogMetric\".\202\323\344\223\002(\022&/v2/{metr" +
+ "ic_name=projects/*/metrics/*}\022\213\001\n\017Create" +
+ "LogMetric\022).google.logging.v2.CreateLogM" +
+ "etricRequest\032\034.google.logging.v2.LogMetr" +
+ "ic\"/\202\323\344\223\002)\"\037/v2/{parent=projects/*}/metr" +
+ "ics:\006metric\022\222\001\n\017UpdateLogMetric\022).google" +
+ ".logging.v2.UpdateLogMetricRequest\032\034.goo" +
+ "gle.logging.v2.LogMetric\"6\202\323\344\223\0020\032&/v2/{m" +
+ "etric_name=projects/*/metrics/*}:\006metric" +
+ "\022\204\001\n\017DeleteLogMetric\022).google.logging.v2" +
+ ".DeleteLogMetricRequest\032\026.google.protobu" +
+ "f.Empty\".\202\323\344\223\002(*&/v2/{metric_name=projec" +
+ "ts/*/metrics/*}B\237\001\n\025com.google.logging.v" +
+ "2B\023LoggingMetricsProtoP\001Z8google.golang." +
+ "org/genproto/googleapis/logging/v2;loggi" +
+ "ng\370\001\001\252\002\027Google.Cloud.Logging.V2\312\002\027Google" +
+ "\\Cloud\\Logging\\V2b\006proto3"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
@@ -130,6 +131,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
com.google.api.MetricProto.getDescriptor(),
com.google.protobuf.EmptyProto.getDescriptor(),
com.google.protobuf.FieldMaskProto.getDescriptor(),
+ com.google.protobuf.TimestampProto.getDescriptor(),
}, assigner);
internal_static_google_logging_v2_LogMetric_descriptor =
getDescriptor().getMessageTypes().get(0);
@@ -189,6 +191,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
com.google.api.MetricProto.getDescriptor();
com.google.protobuf.EmptyProto.getDescriptor();
com.google.protobuf.FieldMaskProto.getDescriptor();
+ com.google.protobuf.TimestampProto.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java
index 89c1f152ebaf..6a7ec7708b3d 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java
@@ -243,7 +243,7 @@ public boolean getUniqueWriterIdentity() {
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
@@ -263,7 +263,7 @@ public boolean hasUpdateMask() {
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
@@ -283,7 +283,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
@@ -1041,7 +1041,7 @@ public Builder clearUniqueWriterIdentity() {
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
@@ -1061,7 +1061,7 @@ public boolean hasUpdateMask() {
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
@@ -1085,7 +1085,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
@@ -1115,7 +1115,7 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
@@ -1143,7 +1143,7 @@ public Builder setUpdateMask(
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
@@ -1175,7 +1175,7 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
@@ -1203,7 +1203,7 @@ public Builder clearUpdateMask() {
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
@@ -1225,7 +1225,7 @@ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
@@ -1250,7 +1250,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequestOrBuilder.java
index 2af06fb06739..153839b767c6 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequestOrBuilder.java
@@ -95,7 +95,7 @@ public interface UpdateSinkRequestOrBuilder extends
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
@@ -113,7 +113,7 @@ public interface UpdateSinkRequestOrBuilder extends
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
@@ -131,7 +131,7 @@ public interface UpdateSinkRequestOrBuilder extends
* At some point in the future, behavior will be removed and specifying an
* empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
* Example: `updateMask=filter`.
*
*
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java
index 8dfbbed515a4..fbd994186ee0 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java
@@ -159,11 +159,13 @@ protected com.google.protobuf.MapField internalGetMapField(
* "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
* "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
* "folders/[FOLDER_ID]/logs/[LOG_ID]"
- * `[LOG_ID]` must be URL-encoded. For example,
- * `"projects/my-project-id/logs/syslog"` or
- * `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
- * For more information about log names, see
- * [LogEntry][google.logging.v2.LogEntry].
+ * `[LOG_ID]` must be URL-encoded. For example:
+ * "projects/my-project-id/logs/syslog"
+ * "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
+ * The permission <code>logging.logEntries.create</code> is needed on each
+ * project, organization, billing account, or folder that is receiving
+ * new log entries, whether the resource is specified in
+ * <code>logName</code> or in an individual log entry.
*
*
* string log_name = 1;
@@ -188,11 +190,13 @@ public java.lang.String getLogName() {
* "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
* "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
* "folders/[FOLDER_ID]/logs/[LOG_ID]"
- * `[LOG_ID]` must be URL-encoded. For example,
- * `"projects/my-project-id/logs/syslog"` or
- * `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
- * For more information about log names, see
- * [LogEntry][google.logging.v2.LogEntry].
+ * `[LOG_ID]` must be URL-encoded. For example:
+ * "projects/my-project-id/logs/syslog"
+ * "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
+ * The permission <code>logging.logEntries.create</code> is needed on each
+ * project, organization, billing account, or folder that is receiving
+ * new log entries, whether the resource is specified in
+ * <code>logName</code> or in an individual log entry.
*
*
* string log_name = 1;
@@ -367,7 +371,7 @@ public java.lang.String getLabelsOrThrow(
private java.util.List
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -396,7 +400,7 @@ public java.util.List getEntriesList() {
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -426,7 +430,7 @@ public java.util.List getEntriesList() {
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -455,7 +459,7 @@ public int getEntriesCount() {
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -484,7 +488,7 @@ public com.google.logging.v2.LogEntry getEntries(int index) {
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -1035,11 +1039,13 @@ public Builder mergeFrom(
* "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
* "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
* "folders/[FOLDER_ID]/logs/[LOG_ID]"
- * `[LOG_ID]` must be URL-encoded. For example,
- * `"projects/my-project-id/logs/syslog"` or
- * `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
- * For more information about log names, see
- * [LogEntry][google.logging.v2.LogEntry].
+ * `[LOG_ID]` must be URL-encoded. For example:
+ * "projects/my-project-id/logs/syslog"
+ * "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
+ * The permission <code>logging.logEntries.create</code> is needed on each
+ * project, organization, billing account, or folder that is receiving
+ * new log entries, whether the resource is specified in
+ * <code>logName</code> or in an individual log entry.
*
*
* string log_name = 1;
@@ -1064,11 +1070,13 @@ public java.lang.String getLogName() {
* "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
* "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
* "folders/[FOLDER_ID]/logs/[LOG_ID]"
- * `[LOG_ID]` must be URL-encoded. For example,
- * `"projects/my-project-id/logs/syslog"` or
- * `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
- * For more information about log names, see
- * [LogEntry][google.logging.v2.LogEntry].
+ * `[LOG_ID]` must be URL-encoded. For example:
+ * "projects/my-project-id/logs/syslog"
+ * "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
+ * The permission <code>logging.logEntries.create</code> is needed on each
+ * project, organization, billing account, or folder that is receiving
+ * new log entries, whether the resource is specified in
+ * <code>logName</code> or in an individual log entry.
*
*
* string log_name = 1;
@@ -1094,11 +1102,13 @@ public java.lang.String getLogName() {
* "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
* "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
* "folders/[FOLDER_ID]/logs/[LOG_ID]"
- * `[LOG_ID]` must be URL-encoded. For example,
- * `"projects/my-project-id/logs/syslog"` or
- * `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
- * For more information about log names, see
- * [LogEntry][google.logging.v2.LogEntry].
+ * `[LOG_ID]` must be URL-encoded. For example:
+ * "projects/my-project-id/logs/syslog"
+ * "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
+ * The permission <code>logging.logEntries.create</code> is needed on each
+ * project, organization, billing account, or folder that is receiving
+ * new log entries, whether the resource is specified in
+ * <code>logName</code> or in an individual log entry.
*
*
* string log_name = 1;
@@ -1121,11 +1131,13 @@ public Builder setLogName(
* "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
* "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
* "folders/[FOLDER_ID]/logs/[LOG_ID]"
- * `[LOG_ID]` must be URL-encoded. For example,
- * `"projects/my-project-id/logs/syslog"` or
- * `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
- * For more information about log names, see
- * [LogEntry][google.logging.v2.LogEntry].
+ * `[LOG_ID]` must be URL-encoded. For example:
+ * "projects/my-project-id/logs/syslog"
+ * "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
+ * The permission <code>logging.logEntries.create</code> is needed on each
+ * project, organization, billing account, or folder that is receiving
+ * new log entries, whether the resource is specified in
+ * <code>logName</code> or in an individual log entry.
*
*
* string log_name = 1;
@@ -1144,11 +1156,13 @@ public Builder clearLogName() {
* "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
* "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
* "folders/[FOLDER_ID]/logs/[LOG_ID]"
- * `[LOG_ID]` must be URL-encoded. For example,
- * `"projects/my-project-id/logs/syslog"` or
- * `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
- * For more information about log names, see
- * [LogEntry][google.logging.v2.LogEntry].
+ * `[LOG_ID]` must be URL-encoded. For example:
+ * "projects/my-project-id/logs/syslog"
+ * "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
+ * The permission <code>logging.logEntries.create</code> is needed on each
+ * project, organization, billing account, or folder that is receiving
+ * new log entries, whether the resource is specified in
+ * <code>logName</code> or in an individual log entry.
*
*
* string log_name = 1;
@@ -1549,7 +1563,7 @@ private void ensureEntriesIsMutable() {
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -1582,7 +1596,7 @@ public java.util.List getEntriesList() {
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -1615,7 +1629,7 @@ public int getEntriesCount() {
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -1648,7 +1662,7 @@ public com.google.logging.v2.LogEntry getEntries(int index) {
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -1688,7 +1702,7 @@ public Builder setEntries(
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -1725,7 +1739,7 @@ public Builder setEntries(
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -1764,7 +1778,7 @@ public Builder addEntries(com.google.logging.v2.LogEntry value) {
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -1804,7 +1818,7 @@ public Builder addEntries(
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -1841,7 +1855,7 @@ public Builder addEntries(
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -1878,7 +1892,7 @@ public Builder addEntries(
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -1916,7 +1930,7 @@ public Builder addAllEntries(
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -1952,7 +1966,7 @@ public Builder clearEntries() {
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -1988,7 +2002,7 @@ public Builder removeEntries(int index) {
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -2018,7 +2032,7 @@ public com.google.logging.v2.LogEntry.Builder getEntriesBuilder(
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -2051,7 +2065,7 @@ public com.google.logging.v2.LogEntryOrBuilder getEntriesOrBuilder(
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -2085,7 +2099,7 @@ public com.google.logging.v2.LogEntryOrBuilder getEntriesOrBuilder(
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -2115,7 +2129,7 @@ public com.google.logging.v2.LogEntry.Builder addEntriesBuilder() {
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -2146,7 +2160,7 @@ public com.google.logging.v2.LogEntry.Builder addEntriesBuilder(
}
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequestOrBuilder.java
index bbe6279bb267..e55c45a481a2 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequestOrBuilder.java
@@ -15,11 +15,13 @@ public interface WriteLogEntriesRequestOrBuilder extends
* "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
* "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
* "folders/[FOLDER_ID]/logs/[LOG_ID]"
- * `[LOG_ID]` must be URL-encoded. For example,
- * `"projects/my-project-id/logs/syslog"` or
- * `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
- * For more information about log names, see
- * [LogEntry][google.logging.v2.LogEntry].
+ * `[LOG_ID]` must be URL-encoded. For example:
+ * "projects/my-project-id/logs/syslog"
+ * "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
+ * The permission <code>logging.logEntries.create</code> is needed on each
+ * project, organization, billing account, or folder that is receiving
+ * new log entries, whether the resource is specified in
+ * <code>logName</code> or in an individual log entry.
*
*
* string log_name = 1;
@@ -33,11 +35,13 @@ public interface WriteLogEntriesRequestOrBuilder extends
* "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
* "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
* "folders/[FOLDER_ID]/logs/[LOG_ID]"
- * `[LOG_ID]` must be URL-encoded. For example,
- * `"projects/my-project-id/logs/syslog"` or
- * `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
- * For more information about log names, see
- * [LogEntry][google.logging.v2.LogEntry].
+ * `[LOG_ID]` must be URL-encoded. For example:
+ * "projects/my-project-id/logs/syslog"
+ * "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
+ * The permission <code>logging.logEntries.create</code> is needed on each
+ * project, organization, billing account, or folder that is receiving
+ * new log entries, whether the resource is specified in
+ * <code>logName</code> or in an individual log entry.
*
*
* string log_name = 1;
@@ -156,7 +160,7 @@ java.lang.String getLabelsOrThrow(
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -184,7 +188,7 @@ java.lang.String getLabelsOrThrow(
getEntriesList();
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -211,7 +215,7 @@ java.lang.String getLabelsOrThrow(
com.google.logging.v2.LogEntry getEntries(int index);
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -238,7 +242,7 @@ java.lang.String getLabelsOrThrow(
int getEntriesCount();
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
@@ -266,7 +270,7 @@ java.lang.String getLabelsOrThrow(
getEntriesOrBuilderList();
/**
*
- * Required. The log entries to send to Stackdriver Logging. The order of log
+ * Required. The log entries to send to Logging. The order of log
* entries in this list does not matter. Values supplied in this method's
* `log_name`, `resource`, and `labels` fields are copied into those log
* entries in this list that do not include values for their corresponding
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/log_entry.proto b/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/log_entry.proto
index 0e5308c21fa8..2f1530e23f69 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/log_entry.proto
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/log_entry.proto
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc.
+// Copyright 2018 Google LLC.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+//
syntax = "proto3";
@@ -83,7 +84,7 @@ message LogEntry {
// Optional. The time the event described by the log entry occurred.
// This time is used to compute the log entry's age and to enforce
// the logs retention period. If this field is omitted in a new log
- // entry, then Stackdriver Logging assigns it the current time.
+ // entry, then Logging assigns it the current time.
// Timestamps have nanosecond accuracy, but trailing zeros in the fractional
// seconds might be omitted when the timestamp is displayed.
//
@@ -95,7 +96,7 @@ message LogEntry {
// [LogSinks](/logging/docs/api/tasks/exporting-logs).
google.protobuf.Timestamp timestamp = 9;
- // Output only. The time the log entry was received by Stackdriver Logging.
+ // Output only. The time the log entry was received by Logging.
google.protobuf.Timestamp receive_timestamp = 24;
// Optional. The severity of the log entry. The default value is
@@ -103,9 +104,9 @@ message LogEntry {
google.logging.type.LogSeverity severity = 10;
// Optional. A unique identifier for the log entry. If you provide a value,
- // then Stackdriver Logging considers other log entries in the same project,
+ // then Logging considers other log entries in the same project,
// with the same `timestamp`, and with the same `insert_id` to be duplicates
- // which can be removed. If omitted in new log entries, then Stackdriver
+ // which can be removed. If omitted in new log entries, then
// Logging assigns its own unique identifier. The `insert_id` is also used
// to order log entries that have the same `timestamp` value.
string insert_id = 4;
@@ -133,12 +134,20 @@ message LogEntry {
// `projects/my-projectid/traces/06796866738c859f2f19b7cfb3214824`
string trace = 22;
- // Optional. The span ID within the trace associated with the log entry. For
- // Stackdriver Trace spans, this is the same format that the Stackdriver Trace
+ // Optional. The span ID within the trace associated with the log entry.
+ // For Trace spans, this is the same format that the Trace
// API v2 uses: a 16-character hexadecimal encoding of an 8-byte array, such
// as "000000000000004a".
string span_id = 27;
+ // Optional. The sampling decision of the trace associated with the log entry.
+ // True means that the trace resource name in the `trace` field was sampled
+ // for storage in a trace backend. False means that the trace was not sampled
+ // for storage when this log entry was written, or the sampling decision was
+ // unknown at the time. A non-sampled `trace` value is still useful as a
+ // request correlation identifier. The default is False.
+ bool trace_sampled = 30;
+
// Optional. Source code location information associated with the log entry,
// if any.
LogEntrySourceLocation source_location = 23;
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging.proto b/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging.proto
index ef8b6b56b5df..b1812e6f82d2 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging.proto
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging.proto
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc.
+// Copyright 2018 Google LLC.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+//
syntax = "proto3";
@@ -54,11 +55,10 @@ service LoggingServiceV2 {
};
}
- // Writes log entries to Stackdriver Logging. This API method is the
- // only way to send log entries to Stackdriver Logging. This method
- // is used, directly or indirectly, by the Stackdriver Logging agent
- // (fluentd) and all logging libraries configured to use Stackdriver
- // Logging.
+ // Writes log entries to Logging. This API method is the
+ // only way to send log entries to Logging. This method
+ // is used, directly or indirectly, by the Logging agent
+ // (fluentd) and all logging libraries configured to use Logging.
// A single request may contain log entries for a maximum of 1000
// different resources (projects, organizations, billing accounts or
// folders)
@@ -70,7 +70,7 @@ service LoggingServiceV2 {
}
// Lists log entries. Use this method to retrieve log entries from
- // Stackdriver Logging. For ways to export log entries, see
+ // Logging. For ways to export log entries, see
// [Exporting Logs](/logging/docs/export).
rpc ListLogEntries(ListLogEntriesRequest) returns (ListLogEntriesResponse) {
option (google.api.http) = {
@@ -79,8 +79,7 @@ service LoggingServiceV2 {
};
}
- // Lists the descriptors for monitored resource types used by Stackdriver
- // Logging.
+ // Lists the descriptors for monitored resource types used by Logging.
rpc ListMonitoredResourceDescriptors(ListMonitoredResourceDescriptorsRequest) returns (ListMonitoredResourceDescriptorsResponse) {
option (google.api.http) = {
get: "/v2/monitoredResourceDescriptors"
@@ -135,11 +134,15 @@ message WriteLogEntriesRequest {
// "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
// "folders/[FOLDER_ID]/logs/[LOG_ID]"
//
- // `[LOG_ID]` must be URL-encoded. For example,
- // `"projects/my-project-id/logs/syslog"` or
- // `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
- // For more information about log names, see
- // [LogEntry][google.logging.v2.LogEntry].
+ // `[LOG_ID]` must be URL-encoded. For example:
+ //
+ // "projects/my-project-id/logs/syslog"
+ // "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
+ //
+ // The permission logging.logEntries.create is needed on each
+ // project, organization, billing account, or folder that is receiving
+ // new log entries, whether the resource is specified in
+ // logName or in an individual log entry.
string log_name = 1;
// Optional. A default monitored resource object that is assigned to all log
@@ -158,7 +161,7 @@ message WriteLogEntriesRequest {
// See [LogEntry][google.logging.v2.LogEntry].
map labels = 3;
- // Required. The log entries to send to Stackdriver Logging. The order of log
+ // Required. The log entries to send to Logging. The order of log
// entries in this list does not matter. Values supplied in this method's
// `log_name`, `resource`, and `labels` fields are copied into those log
// entries in this list that do not include values for their corresponding
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging_config.proto b/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging_config.proto
index dc2783e0e535..8803ace8180e 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging_config.proto
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging_config.proto
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc.
+// Copyright 2018 Google LLC.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+//
syntax = "proto3";
@@ -30,8 +31,8 @@ option java_package = "com.google.logging.v2";
option php_namespace = "Google\\Cloud\\Logging\\V2";
-// Service for configuring sinks used to export log entries outside of
-// Stackdriver Logging.
+// Service for configuring sinks used to export log entries out of
+// Logging.
service ConfigServiceV2 {
// Lists sinks.
rpc ListSinks(ListSinksRequest) returns (ListSinksResponse) {
@@ -275,7 +276,7 @@ service ConfigServiceV2 {
// exported. The sink must be created within a project, organization, billing
// account, or folder.
message LogSink {
- // Available log entry formats. Log entries can be written to Stackdriver
+ // Available log entry formats. Log entries can be written to
// Logging in either format and can be exported in either format.
// Version 2 is the preferred format.
enum VersionFormat {
@@ -321,7 +322,7 @@ message LogSink {
VersionFormat output_version_format = 6 [deprecated = true];
// Output only. An IAM identity—a service account or group—under
- // which Stackdriver Logging writes the exported log entries to the sink's
+ // which Logging writes the exported log entries to the sink's
// destination. This field is set by
// [sinks.create](/logging/docs/api/reference/rest/v2/projects.sinks/create)
// and
@@ -423,7 +424,7 @@ message CreateSinkRequest {
// Optional. Determines the kind of IAM identity returned as `writer_identity`
// in the new sink. If this value is omitted or set to false, and if the
// sink's parent is a project, then the value returned as `writer_identity` is
- // the same group or service account used by Stackdriver Logging before the
+ // the same group or service account used by Logging before the
// addition of writer identities to this API. The sink's destination must be
// in the same project as the sink itself.
//
@@ -476,7 +477,7 @@ message UpdateSinkRequest {
// empty updateMask will be an error.
//
// For a detailed `FieldMask` definition, see
- // https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ // https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
//
// Example: `updateMask=filter`.
google.protobuf.FieldMask update_mask = 4;
@@ -496,7 +497,7 @@ message DeleteSinkRequest {
string sink_name = 1;
}
-// Specifies a set of log entries that are not to be stored in Stackdriver
+// Specifies a set of log entries that are not to be stored in
// Logging. If your project receives a large volume of logs, you might be able
// to use exclusions to reduce your chargeable logs. Exclusions are processed
// after log sinks, so you can export log entries before they are excluded.
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging_metrics.proto b/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging_metrics.proto
index a8f3fe06f217..229fb7ca5ccf 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging_metrics.proto
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging_metrics.proto
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc.
+// Copyright 2018 Google LLC.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+//
syntax = "proto3";
@@ -21,6 +22,7 @@ import "google/api/distribution.proto";
import "google/api/metric.proto";
import "google/protobuf/empty.proto";
import "google/protobuf/field_mask.proto";
+import "google/protobuf/timestamp.proto";
option cc_enable_arenas = true;
option csharp_namespace = "Google.Cloud.Logging.V2";
@@ -79,12 +81,12 @@ service MetricsServiceV2 {
// extracted values along with an optional histogram of the values as specified
// by the bucket options.
message LogMetric {
- // Stackdriver Logging API version.
+ // Logging API version.
enum ApiVersion {
- // Stackdriver Logging API v2.
+ // Logging API v2.
V2 = 0;
- // Stackdriver Logging API v1.
+ // Logging API v1.
V1 = 1;
}
diff --git a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java
index 9bf9398fe23f..ba7c645c7c2d 100644
--- a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java
+++ b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java
@@ -53,8 +53,7 @@
// AUTO-GENERATED DOCUMENTATION AND SERVICE
/**
- * Service Description: Service for configuring sinks used to export log entries outside of
- * Stackdriver Logging.
+ * Service Description: Service for configuring sinks used to export log entries out of Logging.
*
* This class provides the ability to make remote calls to the backing service through method
* calls that map to API methods. Sample code to get started:
@@ -558,7 +557,7 @@ public final UnaryCallable createSinkCallable() {
* compatibility purposes: destination,filter,includeChildren At some point in the future,
* behavior will be removed and specifying an empty updateMask will be an error.
* For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
*
Example: `updateMask=filter`.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
@@ -606,7 +605,7 @@ public final LogSink updateSink(SinkName sinkName, LogSink sink, FieldMask updat
* compatibility purposes: destination,filter,includeChildren At some point in the future,
* behavior will be removed and specifying an empty updateMask will be an error.
*
For a detailed `FieldMask` definition, see
- * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+ * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.FieldMask
*
Example: `updateMask=filter`.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
diff --git a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingClient.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingClient.java
index aad9aa0d80f3..49fbb3a0c7c2 100644
--- a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingClient.java
+++ b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingClient.java
@@ -274,11 +274,10 @@ public final UnaryCallable deleteLogCallable() {
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Writes log entries to Stackdriver Logging. This API method is the only way to send log entries
- * to Stackdriver Logging. This method is used, directly or indirectly, by the Stackdriver Logging
- * agent (fluentd) and all logging libraries configured to use Stackdriver Logging. A single
- * request may contain log entries for a maximum of 1000 different resources (projects,
- * organizations, billing accounts or folders)
+ * Writes log entries to Logging. This API method is the only way to send log entries to Logging.
+ * This method is used, directly or indirectly, by the Logging agent (fluentd) and all logging
+ * libraries configured to use Logging. A single request may contain log entries for a maximum of
+ * 1000 different resources (projects, organizations, billing accounts or folders)
*
* Sample code:
*
@@ -296,9 +295,13 @@ public final UnaryCallable deleteLogCallable() {
* `entries` that do not specify a value for `log_name`:
* "projects/[PROJECT_ID]/logs/[LOG_ID]" "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
* "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]" "folders/[FOLDER_ID]/logs/[LOG_ID]"
- *
`[LOG_ID]` must be URL-encoded. For example, `"projects/my-project-id/logs/syslog"` or
- * `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`. For more
- * information about log names, see [LogEntry][google.logging.v2.LogEntry].
+ *
`[LOG_ID]` must be URL-encoded. For example:
+ *
"projects/my-project-id/logs/syslog"
+ * "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
+ *
The permission <code>logging.logEntries.create</code> is needed on each
+ * project, organization, billing account, or folder that is receiving new log entries,
+ * whether the resource is specified in <code>logName</code> or in an individual
+ * log entry.
* @param resource Optional. A default monitored resource object that is assigned to all log
* entries in `entries` that do not specify a value for `resource`. Example:
*
{ "type": "gce_instance", "labels": { "zone": "us-central1-a", "instance_id":
@@ -308,11 +311,11 @@ public final UnaryCallable deleteLogCallable() {
* in `entries`. If a log entry already has a label with the same key as a label in this
* parameter, then the log entry's label is not changed. See
* [LogEntry][google.logging.v2.LogEntry].
- * @param entries Required. The log entries to send to Stackdriver Logging. The order of log
- * entries in this list does not matter. Values supplied in this method's `log_name`,
- * `resource`, and `labels` fields are copied into those log entries in this list that do not
- * include values for their corresponding fields. For more information, see the
- * [LogEntry][google.logging.v2.LogEntry] type.
+ * @param entries Required. The log entries to send to Logging. The order of log entries in this
+ * list does not matter. Values supplied in this method's `log_name`, `resource`, and `labels`
+ * fields are copied into those log entries in this list that do not include values for their
+ * corresponding fields. For more information, see the [LogEntry][google.logging.v2.LogEntry]
+ * type.
* If the `timestamp` or `insert_id` fields are missing in log entries, then this method
* supplies the current time or a unique identifier, respectively. The supplied values are
* chosen so that, among the log entries that did not supply their own values, the entries
@@ -345,11 +348,10 @@ public final WriteLogEntriesResponse writeLogEntries(
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Writes log entries to Stackdriver Logging. This API method is the only way to send log entries
- * to Stackdriver Logging. This method is used, directly or indirectly, by the Stackdriver Logging
- * agent (fluentd) and all logging libraries configured to use Stackdriver Logging. A single
- * request may contain log entries for a maximum of 1000 different resources (projects,
- * organizations, billing accounts or folders)
+ * Writes log entries to Logging. This API method is the only way to send log entries to Logging.
+ * This method is used, directly or indirectly, by the Logging agent (fluentd) and all logging
+ * libraries configured to use Logging. A single request may contain log entries for a maximum of
+ * 1000 different resources (projects, organizations, billing accounts or folders)
*
*
Sample code:
*
@@ -367,9 +369,13 @@ public final WriteLogEntriesResponse writeLogEntries(
* `entries` that do not specify a value for `log_name`:
*
"projects/[PROJECT_ID]/logs/[LOG_ID]" "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
* "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]" "folders/[FOLDER_ID]/logs/[LOG_ID]"
- *
`[LOG_ID]` must be URL-encoded. For example, `"projects/my-project-id/logs/syslog"` or
- * `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`. For more
- * information about log names, see [LogEntry][google.logging.v2.LogEntry].
+ *
`[LOG_ID]` must be URL-encoded. For example:
+ *
"projects/my-project-id/logs/syslog"
+ * "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
+ *
The permission <code>logging.logEntries.create</code> is needed on each
+ * project, organization, billing account, or folder that is receiving new log entries,
+ * whether the resource is specified in <code>logName</code> or in an individual
+ * log entry.
* @param resource Optional. A default monitored resource object that is assigned to all log
* entries in `entries` that do not specify a value for `resource`. Example:
*
{ "type": "gce_instance", "labels": { "zone": "us-central1-a", "instance_id":
@@ -379,11 +385,11 @@ public final WriteLogEntriesResponse writeLogEntries(
* in `entries`. If a log entry already has a label with the same key as a label in this
* parameter, then the log entry's label is not changed. See
* [LogEntry][google.logging.v2.LogEntry].
- * @param entries Required. The log entries to send to Stackdriver Logging. The order of log
- * entries in this list does not matter. Values supplied in this method's `log_name`,
- * `resource`, and `labels` fields are copied into those log entries in this list that do not
- * include values for their corresponding fields. For more information, see the
- * [LogEntry][google.logging.v2.LogEntry] type.
+ * @param entries Required. The log entries to send to Logging. The order of log entries in this
+ * list does not matter. Values supplied in this method's `log_name`, `resource`, and `labels`
+ * fields are copied into those log entries in this list that do not include values for their
+ * corresponding fields. For more information, see the [LogEntry][google.logging.v2.LogEntry]
+ * type.
*
If the `timestamp` or `insert_id` fields are missing in log entries, then this method
* supplies the current time or a unique identifier, respectively. The supplied values are
* chosen so that, among the log entries that did not supply their own values, the entries
@@ -416,11 +422,10 @@ public final WriteLogEntriesResponse writeLogEntries(
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Writes log entries to Stackdriver Logging. This API method is the only way to send log entries
- * to Stackdriver Logging. This method is used, directly or indirectly, by the Stackdriver Logging
- * agent (fluentd) and all logging libraries configured to use Stackdriver Logging. A single
- * request may contain log entries for a maximum of 1000 different resources (projects,
- * organizations, billing accounts or folders)
+ * Writes log entries to Logging. This API method is the only way to send log entries to Logging.
+ * This method is used, directly or indirectly, by the Logging agent (fluentd) and all logging
+ * libraries configured to use Logging. A single request may contain log entries for a maximum of
+ * 1000 different resources (projects, organizations, billing accounts or folders)
*
*
Sample code:
*
@@ -443,11 +448,10 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Writes log entries to Stackdriver Logging. This API method is the only way to send log entries
- * to Stackdriver Logging. This method is used, directly or indirectly, by the Stackdriver Logging
- * agent (fluentd) and all logging libraries configured to use Stackdriver Logging. A single
- * request may contain log entries for a maximum of 1000 different resources (projects,
- * organizations, billing accounts or folders)
+ * Writes log entries to Logging. This API method is the only way to send log entries to Logging.
+ * This method is used, directly or indirectly, by the Logging agent (fluentd) and all logging
+ * libraries configured to use Logging. A single request may contain log entries for a maximum of
+ * 1000 different resources (projects, organizations, billing accounts or folders)
*
*
Sample code:
*
@@ -470,8 +474,8 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Lists log entries. Use this method to retrieve log entries from Stackdriver Logging. For ways
- * to export log entries, see [Exporting Logs](/logging/docs/export).
+ * Lists log entries. Use this method to retrieve log entries from Logging. For ways to export log
+ * entries, see [Exporting Logs](/logging/docs/export).
*
*
Sample code:
*
@@ -517,8 +521,8 @@ public final ListLogEntriesPagedResponse listLogEntries(
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Lists log entries. Use this method to retrieve log entries from Stackdriver Logging. For ways
- * to export log entries, see [Exporting Logs](/logging/docs/export).
+ * Lists log entries. Use this method to retrieve log entries from Logging. For ways to export log
+ * entries, see [Exporting Logs](/logging/docs/export).
*
*
Sample code:
*
@@ -543,8 +547,8 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Lists log entries. Use this method to retrieve log entries from Stackdriver Logging. For ways
- * to export log entries, see [Exporting Logs](/logging/docs/export).
+ * Lists log entries. Use this method to retrieve log entries from Logging. For ways to export log
+ * entries, see [Exporting Logs](/logging/docs/export).
*
*
Sample code:
*
@@ -569,8 +573,8 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Lists log entries. Use this method to retrieve log entries from Stackdriver Logging. For ways
- * to export log entries, see [Exporting Logs](/logging/docs/export).
+ * Lists log entries. Use this method to retrieve log entries from Logging. For ways to export log
+ * entries, see [Exporting Logs](/logging/docs/export).
*
*
Sample code:
*
@@ -602,7 +606,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Lists the descriptors for monitored resource types used by Stackdriver Logging.
+ * Lists the descriptors for monitored resource types used by Logging.
*
*
Sample code:
*
@@ -625,7 +629,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Lists the descriptors for monitored resource types used by Stackdriver Logging.
+ * Lists the descriptors for monitored resource types used by Logging.
*
*
Sample code:
*
@@ -648,7 +652,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Lists the descriptors for monitored resource types used by Stackdriver Logging.
+ * Lists the descriptors for monitored resource types used by Logging.
*
*
Sample code:
*
diff --git a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/package-info.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/package-info.java
index 5c6a38f46765..61061f0cfde5 100644
--- a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/package-info.java
+++ b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/package-info.java
@@ -36,8 +36,7 @@
*
* ============ ConfigClient ============
*
- *
Service Description: Service for configuring sinks used to export log entries outside of
- * Stackdriver Logging.
+ *
Service Description: Service for configuring sinks used to export log entries out of Logging.
*
*
Sample for ConfigClient:
*