updated opentelemetry-proto to v1.5.0

Author: bryce-b

Sources/Exporters/OpenTelemetryProtocolCommon/proto/common.pb.swift

@@ -1,5 +1,6 @@
 // DO NOT EDIT.
 // swift-format-ignore-file
+// swiftlint:disable all
 //
 // Generated by the Swift generator plugin for the protocol buffer compiler.
 // Source: opentelemetry/proto/common/v1/common.proto
@@ -37,7 +38,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 /// AnyValue is used to represent any type of attribute value. AnyValue may contain a
 /// primitive value such as a string or integer or it may contain an arbitrary nested
 /// object containing arrays, key-value lists and primitives.
-public struct Opentelemetry_Proto_Common_V1_AnyValue {
+public struct Opentelemetry_Proto_Common_V1_AnyValue: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -106,7 +107,7 @@ public struct Opentelemetry_Proto_Common_V1_AnyValue {
 
   /// The value is one of the listed fields. It is valid for all values to be unspecified
   /// in which case this AnyValue is considered to be "empty".
-  public enum OneOf_Value: Equatable {
+  public enum OneOf_Value: Equatable, @unchecked Sendable {
     case stringValue(String)
     case boolValue(Bool)
     case intValue(Int64)
@@ -115,52 +116,14 @@ public struct Opentelemetry_Proto_Common_V1_AnyValue {
     case kvlistValue(Opentelemetry_Proto_Common_V1_KeyValueList)
     case bytesValue(Data)
 
-  #if !swift(>=4.1)
-    public static func ==(lhs: Opentelemetry_Proto_Common_V1_AnyValue.OneOf_Value, rhs: Opentelemetry_Proto_Common_V1_AnyValue.OneOf_Value) -> Bool {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
-      switch (lhs, rhs) {
-      case (.stringValue, .stringValue): return {
-        guard case .stringValue(let l) = lhs, case .stringValue(let r) = rhs else { preconditionFailure() }
-        return l == r
-      }()
-      case (.boolValue, .boolValue): return {
-        guard case .boolValue(let l) = lhs, case .boolValue(let r) = rhs else { preconditionFailure() }
-        return l == r
-      }()
-      case (.intValue, .intValue): return {
-        guard case .intValue(let l) = lhs, case .intValue(let r) = rhs else { preconditionFailure() }
-        return l == r
-      }()
-      case (.doubleValue, .doubleValue): return {
-        guard case .doubleValue(let l) = lhs, case .doubleValue(let r) = rhs else { preconditionFailure() }
-        return l == r
-      }()
-      case (.arrayValue, .arrayValue): return {
-        guard case .arrayValue(let l) = lhs, case .arrayValue(let r) = rhs else { preconditionFailure() }
-        return l == r
-      }()
-      case (.kvlistValue, .kvlistValue): return {
-        guard case .kvlistValue(let l) = lhs, case .kvlistValue(let r) = rhs else { preconditionFailure() }
-        return l == r
-      }()
-      case (.bytesValue, .bytesValue): return {
-        guard case .bytesValue(let l) = lhs, case .bytesValue(let r) = rhs else { preconditionFailure() }
-        return l == r
-      }()
-      default: return false
-      }
-    }
-  #endif
   }
 
   public init() {}
 }
 
 /// ArrayValue is a list of AnyValue messages. We need ArrayValue as a message
 /// since oneof in AnyValue does not allow repeated fields.
-public struct Opentelemetry_Proto_Common_V1_ArrayValue {
+public struct Opentelemetry_Proto_Common_V1_ArrayValue: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -178,7 +141,7 @@ public struct Opentelemetry_Proto_Common_V1_ArrayValue {
 /// a list of KeyValue messages (e.g. in Span) we use `repeated KeyValue` directly to
 /// avoid unnecessary extra wrapping (which slows down the protocol). The 2 approaches
 /// are semantically equivalent.
-public struct Opentelemetry_Proto_Common_V1_KeyValueList {
+public struct Opentelemetry_Proto_Common_V1_KeyValueList: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -196,7 +159,7 @@ public struct Opentelemetry_Proto_Common_V1_KeyValueList {
 
 /// KeyValue is a key-value pair that is used to store Span attributes, Link
 /// attributes, etc.
-public struct Opentelemetry_Proto_Common_V1_KeyValue {
+public struct Opentelemetry_Proto_Common_V1_KeyValue: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -221,7 +184,7 @@ public struct Opentelemetry_Proto_Common_V1_KeyValue {
 
 /// InstrumentationScope is a message representing the instrumentation scope information
 /// such as the fully qualified name and version. 
-public struct Opentelemetry_Proto_Common_V1_InstrumentationScope {
+public struct Opentelemetry_Proto_Common_V1_InstrumentationScope: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -243,15 +206,6 @@ public struct Opentelemetry_Proto_Common_V1_InstrumentationScope {
   public init() {}
 }
 
-#if swift(>=5.5) && canImport(_Concurrency)
-extension Opentelemetry_Proto_Common_V1_AnyValue: @unchecked Sendable {}
-extension Opentelemetry_Proto_Common_V1_AnyValue.OneOf_Value: @unchecked Sendable {}
-extension Opentelemetry_Proto_Common_V1_ArrayValue: @unchecked Sendable {}
-extension Opentelemetry_Proto_Common_V1_KeyValueList: @unchecked Sendable {}
-extension Opentelemetry_Proto_Common_V1_KeyValue: @unchecked Sendable {}
-extension Opentelemetry_Proto_Common_V1_InstrumentationScope: @unchecked Sendable {}
-#endif  // swift(>=5.5) && canImport(_Concurrency)
-
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
 fileprivate let _protobuf_package = "opentelemetry.proto.common.v1"

Sources/Exporters/OpenTelemetryProtocolCommon/proto/logs.pb.swift

@@ -1,5 +1,6 @@
 // DO NOT EDIT.
 // swift-format-ignore-file
+// swiftlint:disable all
 //
 // Generated by the Swift generator plugin for the protocol buffer compiler.
 // Source: opentelemetry/proto/logs/v1/logs.proto
@@ -35,7 +36,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 }
 
 /// Possible values for LogRecord.SeverityNumber.
-public enum Opentelemetry_Proto_Logs_V1_SeverityNumber: SwiftProtobuf.Enum {
+public enum Opentelemetry_Proto_Logs_V1_SeverityNumber: SwiftProtobuf.Enum, Swift.CaseIterable {
   public typealias RawValue = Int
 
   /// UNSPECIFIED is the default SeverityNumber, it MUST NOT be used.
@@ -132,13 +133,8 @@ public enum Opentelemetry_Proto_Logs_V1_SeverityNumber: SwiftProtobuf.Enum {
     }
   }
 
-}
-
-#if swift(>=4.2)
-
-extension Opentelemetry_Proto_Logs_V1_SeverityNumber: CaseIterable {
   // The compiler won't synthesize support with the UNRECOGNIZED case.
-  public static var allCases: [Opentelemetry_Proto_Logs_V1_SeverityNumber] = [
+  public static let allCases: [Opentelemetry_Proto_Logs_V1_SeverityNumber] = [
     .unspecified,
     .trace,
     .trace2,
@@ -165,16 +161,17 @@ extension Opentelemetry_Proto_Logs_V1_SeverityNumber: CaseIterable {
     .fatal3,
     .fatal4,
   ]
-}
 
-#endif  // swift(>=4.2)
+}
 
-/// LogRecordFlags is defined as a protobuf 'uint32' type and is to be used as
-/// bit-fields. Each non-zero value defined in this enum is a bit-mask.
-/// To extract the bit-field, for example, use an expression like:
+/// LogRecordFlags represents constants used to interpret the
+/// LogRecord.flags field, which is protobuf 'fixed32' type and is to
+/// be used as bit-fields. Each non-zero value defined in this enum is
+/// a bit-mask.  To extract the bit-field, for example, use an
+/// expression like:
 ///
 ///   (logRecord.flags & LOG_RECORD_FLAGS_TRACE_FLAGS_MASK)
-public enum Opentelemetry_Proto_Logs_V1_LogRecordFlags: SwiftProtobuf.Enum {
+public enum Opentelemetry_Proto_Logs_V1_LogRecordFlags: SwiftProtobuf.Enum, Swift.CaseIterable {
   public typealias RawValue = Int
 
   /// The zero value for the enum. Should not be used for comparisons.
@@ -205,19 +202,13 @@ public enum Opentelemetry_Proto_Logs_V1_LogRecordFlags: SwiftProtobuf.Enum {
     }
   }
 
-}
-
-#if swift(>=4.2)
-
-extension Opentelemetry_Proto_Logs_V1_LogRecordFlags: CaseIterable {
   // The compiler won't synthesize support with the UNRECOGNIZED case.
-  public static var allCases: [Opentelemetry_Proto_Logs_V1_LogRecordFlags] = [
+  public static let allCases: [Opentelemetry_Proto_Logs_V1_LogRecordFlags] = [
     .doNotUse,
     .traceFlagsMask,
   ]
-}
 
-#endif  // swift(>=4.2)
+}
 
 /// LogsData represents the logs data that can be stored in a persistent storage,
 /// OR can be embedded by other protocols that transfer OTLP logs data but do not
@@ -229,7 +220,7 @@ extension Opentelemetry_Proto_Logs_V1_LogRecordFlags: CaseIterable {
 ///
 /// When new fields are added into this message, the OTLP request MUST be updated
 /// as well.
-public struct Opentelemetry_Proto_Logs_V1_LogsData {
+public struct Opentelemetry_Proto_Logs_V1_LogsData: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -247,7 +238,7 @@ public struct Opentelemetry_Proto_Logs_V1_LogsData {
 }
 
 /// A collection of ScopeLogs from a Resource.
-public struct Opentelemetry_Proto_Logs_V1_ResourceLogs {
+public struct Opentelemetry_Proto_Logs_V1_ResourceLogs: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -266,6 +257,10 @@ public struct Opentelemetry_Proto_Logs_V1_ResourceLogs {
   /// A list of ScopeLogs that originate from a resource.
   public var scopeLogs: [Opentelemetry_Proto_Logs_V1_ScopeLogs] = []
 
+  /// The Schema URL, if known. This is the identifier of the Schema that the resource data
+  /// is recorded in. Notably, the last part of the URL path is the version number of the
+  /// schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
+  /// https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
   /// This schema_url applies to the data in the "resource" field. It does not apply
   /// to the data in the "scope_logs" field which have their own schema_url field.
   public var schemaURL: String = String()
@@ -278,7 +273,7 @@ public struct Opentelemetry_Proto_Logs_V1_ResourceLogs {
 }
 
 /// A collection of Logs produced by a Scope.
-public struct Opentelemetry_Proto_Logs_V1_ScopeLogs {
+public struct Opentelemetry_Proto_Logs_V1_ScopeLogs: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -298,6 +293,10 @@ public struct Opentelemetry_Proto_Logs_V1_ScopeLogs {
   /// A list of log records.
   public var logRecords: [Opentelemetry_Proto_Logs_V1_LogRecord] = []
 
+  /// The Schema URL, if known. This is the identifier of the Schema that the log data
+  /// is recorded in. Notably, the last part of the URL path is the version number of the
+  /// schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
+  /// https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
   /// This schema_url applies to all logs in the "logs" field.
   public var schemaURL: String = String()
 
@@ -310,7 +309,7 @@ public struct Opentelemetry_Proto_Logs_V1_ScopeLogs {
 
 /// A log record according to OpenTelemetry Log Data Model:
 /// https://github.com/open-telemetry/oteps/blob/main/text/logs/0097-log-data-model.md
-public struct Opentelemetry_Proto_Logs_V1_LogRecord {
+public struct Opentelemetry_Proto_Logs_V1_LogRecord: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -398,22 +397,27 @@ public struct Opentelemetry_Proto_Logs_V1_LogRecord {
   ///   - the field contains an invalid value.
   public var spanID: Data = Data()
 
+  /// A unique identifier of event category/type.
+  /// All events with the same event_name are expected to conform to the same
+  /// schema for both their attributes and their body.
+  ///
+  /// Recommended to be fully qualified and short (no longer than 256 characters).
+  ///
+  /// Presence of event_name on the log record identifies this record
+  /// as an event.
+  ///
+  /// [Optional].
+  ///
+  /// Status: [Development]
+  public var eventName: String = String()
+
   public var unknownFields = SwiftProtobuf.UnknownStorage()
 
   public init() {}
 
   fileprivate var _body: Opentelemetry_Proto_Common_V1_AnyValue? = nil
 }
 
-#if swift(>=5.5) && canImport(_Concurrency)
-extension Opentelemetry_Proto_Logs_V1_SeverityNumber: @unchecked Sendable {}
-extension Opentelemetry_Proto_Logs_V1_LogRecordFlags: @unchecked Sendable {}
-extension Opentelemetry_Proto_Logs_V1_LogsData: @unchecked Sendable {}
-extension Opentelemetry_Proto_Logs_V1_ResourceLogs: @unchecked Sendable {}
-extension Opentelemetry_Proto_Logs_V1_ScopeLogs: @unchecked Sendable {}
-extension Opentelemetry_Proto_Logs_V1_LogRecord: @unchecked Sendable {}
-#endif  // swift(>=5.5) && canImport(_Concurrency)
-
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
 fileprivate let _protobuf_package = "opentelemetry.proto.logs.v1"
@@ -596,6 +600,7 @@ extension Opentelemetry_Proto_Logs_V1_LogRecord: SwiftProtobuf.Message, SwiftPro
     8: .same(proto: "flags"),
     9: .standard(proto: "trace_id"),
     10: .standard(proto: "span_id"),
+    12: .standard(proto: "event_name"),
   ]
 
   public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -614,6 +619,7 @@ extension Opentelemetry_Proto_Logs_V1_LogRecord: SwiftProtobuf.Message, SwiftPro
       case 9: try { try decoder.decodeSingularBytesField(value: &self.traceID) }()
       case 10: try { try decoder.decodeSingularBytesField(value: &self.spanID) }()
       case 11: try { try decoder.decodeSingularFixed64Field(value: &self.observedTimeUnixNano) }()
+      case 12: try { try decoder.decodeSingularStringField(value: &self.eventName) }()
       default: break
       }
     }
@@ -654,6 +660,9 @@ extension Opentelemetry_Proto_Logs_V1_LogRecord: SwiftProtobuf.Message, SwiftPro
     if self.observedTimeUnixNano != 0 {
       try visitor.visitSingularFixed64Field(value: self.observedTimeUnixNano, fieldNumber: 11)
     }
+    if !self.eventName.isEmpty {
+      try visitor.visitSingularStringField(value: self.eventName, fieldNumber: 12)
+    }
     try unknownFields.traverse(visitor: &visitor)
   }
 
@@ -668,6 +677,7 @@ extension Opentelemetry_Proto_Logs_V1_LogRecord: SwiftProtobuf.Message, SwiftPro
     if lhs.flags != rhs.flags {return false}
     if lhs.traceID != rhs.traceID {return false}
     if lhs.spanID != rhs.spanID {return false}
+    if lhs.eventName != rhs.eventName {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }

Sources/Exporters/OpenTelemetryProtocolCommon/proto/logs_service.pb.swift

@@ -1,5 +1,6 @@
 // DO NOT EDIT.
 // swift-format-ignore-file
+// swiftlint:disable all
 //
 // Generated by the Swift generator plugin for the protocol buffer compiler.
 // Source: opentelemetry/proto/collector/logs/v1/logs_service.proto
@@ -21,7 +22,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
 import SwiftProtobuf
 
 // If the compiler emits an error on this type, it is because this file
@@ -34,7 +34,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-public struct Opentelemetry_Proto_Collector_Logs_V1_ExportLogsServiceRequest {
+public struct Opentelemetry_Proto_Collector_Logs_V1_ExportLogsServiceRequest: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -51,7 +51,7 @@ public struct Opentelemetry_Proto_Collector_Logs_V1_ExportLogsServiceRequest {
   public init() {}
 }
 
-public struct Opentelemetry_Proto_Collector_Logs_V1_ExportLogsServiceResponse {
+public struct Opentelemetry_Proto_Collector_Logs_V1_ExportLogsServiceResponse: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -87,7 +87,7 @@ public struct Opentelemetry_Proto_Collector_Logs_V1_ExportLogsServiceResponse {
   fileprivate var _partialSuccess: Opentelemetry_Proto_Collector_Logs_V1_ExportLogsPartialSuccess? = nil
 }
 
-public struct Opentelemetry_Proto_Collector_Logs_V1_ExportLogsPartialSuccess {
+public struct Opentelemetry_Proto_Collector_Logs_V1_ExportLogsPartialSuccess: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -112,12 +112,6 @@ public struct Opentelemetry_Proto_Collector_Logs_V1_ExportLogsPartialSuccess {
   public init() {}
 }
 
-#if swift(>=5.5) && canImport(_Concurrency)
-extension Opentelemetry_Proto_Collector_Logs_V1_ExportLogsServiceRequest: @unchecked Sendable {}
-extension Opentelemetry_Proto_Collector_Logs_V1_ExportLogsServiceResponse: @unchecked Sendable {}
-extension Opentelemetry_Proto_Collector_Logs_V1_ExportLogsPartialSuccess: @unchecked Sendable {}
-#endif  // swift(>=5.5) && canImport(_Concurrency)
-
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
 fileprivate let _protobuf_package = "opentelemetry.proto.collector.logs.v1"