diff --git a/Makefile b/Makefile index 4657d10b914..432b04146fb 100644 --- a/Makefile +++ b/Makefile @@ -230,7 +230,7 @@ gendependabot: $(eval SHELL:=/bin/bash) OPENTELEMETRY_PROTO_SRC_DIR=model/internal/opentelemetry-proto # The SHA matching the current version of the proto to use -OPENTELEMETRY_PROTO_VERSION=v0.15.0 +OPENTELEMETRY_PROTO_VERSION=v0.16.0 # Find all .proto files. OPENTELEMETRY_PROTO_FILES := $(subst $(OPENTELEMETRY_PROTO_SRC_DIR)/,,$(wildcard $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/*/v1/*.proto $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/collector/*/v1/*.proto)) diff --git a/internal/otlptext/logs.go b/internal/otlptext/logs.go index f68e3c90a05..fccb6313ba0 100644 --- a/internal/otlptext/logs.go +++ b/internal/otlptext/logs.go @@ -47,7 +47,6 @@ func (textLogsMarshaler) MarshalLogs(ld pdata.Logs) ([]byte, error) { lr := logs.At(k) buf.logEntry("Timestamp: %s", lr.Timestamp()) buf.logEntry("Severity: %s", lr.SeverityText()) - buf.logEntry("ShortName: %s", lr.Name()) buf.logEntry("Body: %s", attributeValueToString(lr.Body())) buf.logAttributes("Attributes", lr.Attributes()) buf.logEntry("Trace ID: %s", lr.TraceID().HexString()) diff --git a/model/internal/cmd/pdatagen/internal/log_structs.go b/model/internal/cmd/pdatagen/internal/log_structs.go index d743cbcaa59..69b324de1c3 100644 --- a/model/internal/cmd/pdatagen/internal/log_structs.go +++ b/model/internal/cmd/pdatagen/internal/log_structs.go @@ -121,14 +121,6 @@ var logRecord = &messageValueStruct{ defaultVal: `SeverityNumberUNDEFINED`, testVal: `SeverityNumberINFO`, }, - &primitiveField{ - extraComment: "Deprecated: [v0.48.0] it was removed from the data model.", - fieldName: "Name", - originFieldName: "Name", - returnType: "string", - defaultVal: `""`, - testVal: `"test_name"`, - }, bodyField, attributes, droppedAttributesCount, diff --git a/model/internal/data/protogen/logs/v1/logs.pb.go b/model/internal/data/protogen/logs/v1/logs.pb.go index 955fd9f6a66..204e8aee7bf 100644 --- a/model/internal/data/protogen/logs/v1/logs.pb.go +++ b/model/internal/data/protogen/logs/v1/logs.pb.go @@ -478,12 +478,6 @@ type LogRecord struct { // The severity text (also known as log level). The original string representation as // it is known at the source. [Optional]. SeverityText string `protobuf:"bytes,3,opt,name=severity_text,json=severityText,proto3" json:"severity_text,omitempty"` - // Short event identifier that does not contain varying parts. Name describes - // what happened (e.g. "ProcessStarted"). Recommended to be no longer than 50 - // characters. Not guaranteed to be unique in any way. [Optional]. - // This deprecated field is planned to be removed March 15, 2022. Receivers can - // ignore this field. - Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"` // Deprecated: Do not use. // A value containing the body of the log record. Can be for example a human-readable // string message (including multi-line) describing the event in a free form or it can // be a structured data composed of arrays and maps of other values. [Optional]. @@ -572,14 +566,6 @@ func (m *LogRecord) GetSeverityText() string { return "" } -// Deprecated: Do not use. -func (m *LogRecord) GetName() string { - if m != nil { - return m.Name - } - return "" -} - func (m *LogRecord) GetBody() v11.AnyValue { if m != nil { return m.Body @@ -623,69 +609,68 @@ func init() { } var fileDescriptor_d1c030a3ec7e961e = []byte{ - // 980 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x96, 0x41, 0x6f, 0x22, 0x37, - 0x14, 0xc7, 0x33, 0x6c, 0x08, 0xc1, 0x21, 0xac, 0xeb, 0x66, 0x93, 0x29, 0x69, 0x09, 0x4a, 0xdb, - 0x2d, 0x4d, 0x25, 0xd0, 0x02, 0xab, 0x6e, 0x7b, 0xea, 0x10, 0x86, 0x08, 0x85, 0x40, 0x64, 0x60, - 0xdb, 0x5d, 0x55, 0x1a, 0x0d, 0x8c, 0x4b, 0x47, 0x1a, 0xc6, 0xc8, 0x63, 0xa2, 0x70, 0xe9, 0xbd, - 0xb7, 0x9e, 0xfa, 0x7d, 0xaa, 0xf6, 0xb0, 0xc7, 0x3d, 0x56, 0x3d, 0xac, 0xaa, 0xe4, 0xd2, 0x4f, - 0xd1, 0x56, 0xf6, 0x0c, 0x14, 0xe8, 0x0c, 0x69, 0x2e, 0x3d, 0x61, 0xbf, 0xdf, 0x7b, 0x7f, 0xff, - 0x9f, 0xed, 0xb1, 0x00, 0x8f, 0xe9, 0x98, 0xb8, 0x9c, 0x38, 0x64, 0x44, 0x38, 0x9b, 0x16, 0xc7, - 0x8c, 0x72, 0x5a, 0x74, 0xe8, 0xd0, 0x2b, 0x5e, 0x3d, 0x91, 0xbf, 0x05, 0x19, 0x42, 0x87, 0x4b, - 0x79, 0x7e, 0xb0, 0x20, 0xf9, 0xd5, 0x93, 0xcc, 0xde, 0x90, 0x0e, 0xa9, 0x5f, 0x2a, 0x46, 0x3e, - 0xcd, 0x9c, 0x84, 0x49, 0x0f, 0xe8, 0x68, 0x44, 0x5d, 0x21, 0xee, 0x8f, 0x82, 0xdc, 0x42, 0x58, - 0x2e, 0x23, 0x1e, 0x9d, 0xb0, 0x01, 0x11, 0xd9, 0xb3, 0xb1, 0x9f, 0x7f, 0xfc, 0x12, 0x6c, 0x37, - 0xe9, 0xd0, 0xab, 0x99, 0xdc, 0x44, 0x2d, 0xb0, 0x3b, 0xa3, 0x86, 0x70, 0xa4, 0x2a, 0xb9, 0x07, - 0xf9, 0x9d, 0xd2, 0xc7, 0x85, 0x35, 0x96, 0x0b, 0x38, 0xa8, 0x10, 0x2a, 0x38, 0xc5, 0x16, 0x66, - 0xc7, 0x3f, 0xc5, 0x40, 0x6a, 0x11, 0xa3, 0x73, 0xb0, 0x3d, 0x4b, 0x50, 0x95, 0x9c, 0x12, 0xa9, - 0x3d, 0xf7, 0xb8, 0xa0, 0x5f, 0xdd, 0x7c, 0xf5, 0xe6, 0x68, 0x03, 0xcf, 0x05, 0x90, 0x0e, 0x80, - 0x37, 0xa0, 0xe3, 0xc0, 0x6a, 0x4c, 0x5a, 0x7d, 0xbc, 0xd6, 0x6a, 0x47, 0xa4, 0x4b, 0x9f, 0x49, - 0x6f, 0x36, 0x44, 0xdf, 0x81, 0x77, 0x6d, 0xd7, 0xe3, 0x6c, 0x32, 0x22, 0x2e, 0x37, 0xb9, 0x4d, - 0x5d, 0xc3, 0xb1, 0xfb, 0xcc, 0x64, 0x53, 0x5f, 0xf8, 0x8f, 0x84, 0x54, 0xfe, 0x74, 0xad, 0x72, - 0x63, 0x59, 0xa1, 0xe9, 0x0b, 0x08, 0xfd, 0x6a, 0x4c, 0x55, 0x70, 0xc6, 0x8e, 0xe4, 0xe8, 0x3d, - 0xd1, 0xc6, 0xb7, 0x64, 0x64, 0x1a, 0x13, 0xe6, 0xa8, 0x0f, 0x72, 0x4a, 0x3e, 0x29, 0xec, 0x89, - 0x48, 0x8f, 0x39, 0xc7, 0xbf, 0x28, 0x20, 0x39, 0xf7, 0x8d, 0xda, 0x20, 0x2e, 0x9d, 0x07, 0xbb, - 0x57, 0x0e, 0x35, 0x15, 0xdc, 0x87, 0x7f, 0xdb, 0x92, 0x3a, 0xc1, 0x3e, 0xfa, 0x3a, 0xe8, 0x0c, - 0xec, 0x38, 0x74, 0x68, 0x30, 0x32, 0xa0, 0xcc, 0xfa, 0x6f, 0xbb, 0xd8, 0xa4, 0x43, 0x2c, 0xd3, - 0x31, 0x70, 0x66, 0xc3, 0x3b, 0xdb, 0xf8, 0x53, 0x01, 0x99, 0xe8, 0x4d, 0x42, 0x1c, 0x1c, 0x44, - 0x1c, 0x42, 0xd0, 0xe9, 0xd3, 0xfb, 0x75, 0x1a, 0x68, 0x07, 0xbd, 0xee, 0x87, 0x6f, 0xff, 0xff, - 0xd5, 0xfc, 0xe7, 0x31, 0x55, 0x39, 0xfe, 0x31, 0x0e, 0x92, 0xf3, 0x62, 0xf4, 0x01, 0x48, 0x73, - 0x7b, 0x44, 0x8c, 0x89, 0x6b, 0x5f, 0x1b, 0xae, 0xe9, 0x52, 0xd9, 0xe6, 0x16, 0x4e, 0x89, 0x68, - 0xcf, 0xb5, 0xaf, 0x5b, 0xa6, 0x4b, 0xd1, 0x53, 0x70, 0x40, 0xfb, 0x1e, 0x61, 0x57, 0xc4, 0x32, - 0x56, 0xd2, 0x77, 0x64, 0xfa, 0xde, 0x0c, 0x77, 0x17, 0xcb, 0xba, 0xe0, 0xa1, 0x47, 0xae, 0x08, - 0xb3, 0xf9, 0xd4, 0x70, 0x27, 0xa3, 0x3e, 0x61, 0x6a, 0x2c, 0xa7, 0xe4, 0xd3, 0xa5, 0x4f, 0xd6, - 0x7f, 0x1d, 0x41, 0x4d, 0x4b, 0x96, 0xe0, 0xb4, 0xb7, 0x34, 0x47, 0xef, 0x83, 0xdd, 0xb9, 0x2a, - 0x27, 0xd7, 0x3c, 0x68, 0x33, 0x35, 0x0b, 0x76, 0xc9, 0x35, 0x47, 0xfb, 0x60, 0xd3, 0x35, 0x47, - 0x44, 0xdd, 0x14, 0x4c, 0x5e, 0x7d, 0x39, 0x47, 0x1a, 0xd8, 0xec, 0x53, 0x6b, 0xaa, 0xc6, 0xe5, - 0x61, 0x7e, 0x74, 0xc7, 0x61, 0x6a, 0xee, 0xf4, 0xb9, 0xe9, 0x4c, 0x66, 0x57, 0x55, 0x96, 0xa2, - 0x0b, 0x00, 0x4c, 0xce, 0x99, 0xdd, 0x9f, 0x70, 0xe2, 0xa9, 0x5b, 0xf2, 0xac, 0xee, 0x12, 0x3a, - 0x27, 0x4b, 0x42, 0x0b, 0x02, 0xe8, 0x19, 0x50, 0x2d, 0x46, 0xc7, 0x63, 0x62, 0x19, 0xff, 0x44, - 0x8d, 0x01, 0x9d, 0xb8, 0x5c, 0x4d, 0xe4, 0x94, 0xfc, 0x2e, 0xde, 0x0f, 0xb8, 0x36, 0xc7, 0xa7, - 0x82, 0xa2, 0x3d, 0x10, 0xff, 0xc6, 0x31, 0x87, 0x9e, 0xba, 0x9d, 0x53, 0xf2, 0x09, 0xec, 0x4f, - 0xd0, 0xd7, 0x60, 0x9b, 0x33, 0x73, 0x40, 0x0c, 0xdb, 0x52, 0x93, 0x39, 0x25, 0x9f, 0xaa, 0x6a, - 0x62, 0xcd, 0xdf, 0xde, 0x1c, 0x7d, 0x36, 0xa4, 0x2b, 0x36, 0x6d, 0xf1, 0x7a, 0x3b, 0x0e, 0x19, - 0x70, 0xca, 0x8a, 0x23, 0x6a, 0x11, 0xa7, 0x68, 0xbb, 0x9c, 0x30, 0xd7, 0x74, 0x8a, 0x96, 0xc9, - 0xcd, 0x42, 0x57, 0x28, 0x35, 0x6a, 0x38, 0x21, 0x25, 0x1b, 0x16, 0x7a, 0x01, 0x12, 0xde, 0xd8, - 0x74, 0x85, 0x38, 0x90, 0xe2, 0x5f, 0x04, 0xe2, 0xcf, 0xee, 0x2f, 0xde, 0x19, 0x9b, 0x6e, 0xa3, - 0x86, 0xb7, 0x84, 0x60, 0xc3, 0x3a, 0xf9, 0x39, 0x0e, 0xd2, 0xcb, 0x47, 0x8f, 0x8e, 0xc0, 0x61, - 0x47, 0x7f, 0xae, 0xe3, 0x46, 0xf7, 0x85, 0xd1, 0xea, 0x5d, 0x54, 0x75, 0x6c, 0xf4, 0x5a, 0x9d, - 0x4b, 0xfd, 0xb4, 0x51, 0x6f, 0xe8, 0x35, 0xb8, 0x81, 0xde, 0x01, 0x8f, 0x56, 0x13, 0xba, 0x58, - 0x3b, 0xd5, 0xa1, 0x82, 0x32, 0x60, 0x3f, 0x14, 0x95, 0x60, 0x2c, 0x92, 0x95, 0xe1, 0x83, 0x48, - 0x56, 0x81, 0x9b, 0x61, 0xcb, 0xd5, 0xf4, 0x6a, 0xef, 0x0c, 0xc6, 0xc3, 0xca, 0x24, 0x2a, 0xc1, - 0xad, 0x48, 0x56, 0x86, 0x89, 0x48, 0x56, 0x81, 0xdb, 0x48, 0x05, 0x7b, 0xab, 0xac, 0xd1, 0xaa, - 0xb7, 0x61, 0x32, 0xcc, 0x88, 0x20, 0x25, 0x08, 0xa2, 0x50, 0x19, 0xee, 0x44, 0xa1, 0x0a, 0x4c, - 0x85, 0x2d, 0xf5, 0xa5, 0x86, 0x5b, 0x70, 0x37, 0xac, 0x48, 0x90, 0x12, 0x4c, 0x47, 0xa1, 0x32, - 0x7c, 0x18, 0x85, 0x2a, 0x10, 0x86, 0x21, 0x1d, 0xe3, 0x36, 0x86, 0x6f, 0x85, 0x6d, 0x86, 0x44, - 0x25, 0x88, 0x22, 0x59, 0x19, 0xbe, 0x1d, 0xc9, 0x2a, 0x70, 0x2f, 0x6c, 0xb9, 0xba, 0xd6, 0xd5, - 0x9a, 0xf0, 0x51, 0x58, 0x99, 0x44, 0x25, 0xb8, 0x1f, 0xc9, 0xca, 0xf0, 0x20, 0x92, 0x55, 0xa0, - 0x7a, 0xf2, 0x15, 0x48, 0xcf, 0x5f, 0xd7, 0xba, 0xfc, 0x20, 0x8f, 0xc0, 0x61, 0xb3, 0x7d, 0x66, - 0x60, 0xfd, 0xb4, 0x8d, 0x6b, 0x46, 0xbd, 0xa9, 0x9d, 0xad, 0x5c, 0xe2, 0x0f, 0x41, 0x6e, 0x35, - 0x41, 0xde, 0x38, 0x39, 0xec, 0x18, 0x17, 0x5a, 0xe7, 0x1c, 0xfe, 0xa5, 0x54, 0xbf, 0x57, 0x5e, - 0xdd, 0x64, 0x95, 0xd7, 0x37, 0x59, 0xe5, 0xf7, 0x9b, 0xac, 0xf2, 0xc3, 0x6d, 0x76, 0xe3, 0xf5, - 0x6d, 0x76, 0xe3, 0xd7, 0xdb, 0xec, 0x06, 0xc8, 0xda, 0x74, 0xdd, 0x8b, 0x5a, 0x15, 0x0f, 0xbe, - 0x77, 0x29, 0x42, 0x97, 0xca, 0xcb, 0xea, 0xbd, 0xbf, 0x54, 0xff, 0xcf, 0xdb, 0x90, 0xb8, 0xb3, - 0xbf, 0x91, 0xfd, 0x2d, 0x19, 0x29, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xdd, 0x19, 0xd4, 0xb0, - 0x6c, 0x0a, 0x00, 0x00, + // 973 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x96, 0xcf, 0x73, 0x22, 0x45, + 0x14, 0xc7, 0x33, 0x24, 0x04, 0xe8, 0x10, 0xb6, 0x6d, 0xb3, 0xc9, 0x98, 0x28, 0xa1, 0xa2, 0xae, + 0x18, 0xab, 0xa0, 0x16, 0xd8, 0x72, 0xf5, 0xe4, 0x10, 0x26, 0x29, 0x0c, 0x81, 0x54, 0x03, 0xab, + 0xbb, 0x65, 0xd5, 0xd4, 0xc0, 0xb4, 0x38, 0x55, 0xc3, 0x34, 0xd5, 0xd3, 0xa4, 0xc2, 0xc5, 0x93, + 0x17, 0x6f, 0xfe, 0x4b, 0x96, 0x1e, 0xf6, 0xb8, 0x47, 0xcb, 0xc3, 0x96, 0x95, 0x5c, 0xfc, 0x2b, + 0xd4, 0xea, 0x9e, 0x01, 0x01, 0x67, 0x88, 0xb9, 0xec, 0x89, 0x9e, 0xf7, 0x79, 0xef, 0xdb, 0xdf, + 0xd7, 0xbf, 0x0a, 0xf0, 0x88, 0x8e, 0x88, 0xcb, 0x89, 0x43, 0x86, 0x84, 0xb3, 0x49, 0x71, 0xc4, + 0x28, 0xa7, 0x45, 0x87, 0x0e, 0xbc, 0xe2, 0xd5, 0x63, 0xf9, 0x5b, 0x90, 0x21, 0x74, 0xb0, 0x90, + 0xe7, 0x07, 0x0b, 0x92, 0x5f, 0x3d, 0xde, 0xdf, 0x19, 0xd0, 0x01, 0xf5, 0x4b, 0xc5, 0xc8, 0xa7, + 0xfb, 0xc7, 0x61, 0xd2, 0x7d, 0x3a, 0x1c, 0x52, 0x57, 0x88, 0xfb, 0xa3, 0x20, 0xb7, 0x10, 0x96, + 0xcb, 0x88, 0x47, 0xc7, 0xac, 0x4f, 0x44, 0xf6, 0x74, 0xec, 0xe7, 0x1f, 0xbd, 0x00, 0xc9, 0x06, + 0x1d, 0x78, 0x35, 0x93, 0x9b, 0xa8, 0x09, 0xb6, 0xa7, 0xd4, 0x10, 0x8e, 0x54, 0x25, 0xb7, 0x9e, + 0xdf, 0x2a, 0x7d, 0x5c, 0x58, 0x61, 0xb9, 0x80, 0x83, 0x0a, 0xa1, 0x82, 0xd3, 0x6c, 0xee, 0xeb, + 0xe8, 0xe7, 0x18, 0x48, 0xcf, 0x63, 0x74, 0x0e, 0x92, 0xd3, 0x04, 0x55, 0xc9, 0x29, 0x91, 0xda, + 0x33, 0x8f, 0x73, 0xfa, 0xd5, 0x8d, 0x97, 0xaf, 0x0f, 0xd7, 0xf0, 0x4c, 0x00, 0xe9, 0x00, 0x78, + 0x7d, 0x3a, 0x0a, 0xac, 0xc6, 0xa4, 0xd5, 0x47, 0x2b, 0xad, 0xb6, 0x45, 0xba, 0xf4, 0x99, 0xf2, + 0xa6, 0x43, 0xf4, 0x3d, 0x78, 0xd7, 0x76, 0x3d, 0xce, 0xc6, 0x43, 0xe2, 0x72, 0x93, 0xdb, 0xd4, + 0x35, 0x1c, 0xbb, 0xc7, 0x4c, 0x36, 0xf1, 0x85, 0xff, 0x4c, 0x48, 0xe5, 0x4f, 0x57, 0x2a, 0xd7, + 0x17, 0x15, 0x1a, 0xbe, 0x80, 0xd0, 0xaf, 0xc6, 0x54, 0x05, 0xef, 0xdb, 0x91, 0x1c, 0xbd, 0x27, + 0xda, 0xf8, 0x8e, 0x0c, 0x4d, 0x63, 0xcc, 0x1c, 0x75, 0x3d, 0xa7, 0xe4, 0x53, 0xc2, 0x9e, 0x88, + 0x74, 0x99, 0x73, 0xf4, 0xab, 0x02, 0x52, 0x33, 0xdf, 0xa8, 0x05, 0xe2, 0xd2, 0x79, 0xb0, 0x7a, + 0xe5, 0x50, 0x53, 0xc1, 0x79, 0xf8, 0xaf, 0x2d, 0xa9, 0x13, 0xac, 0xa3, 0xaf, 0x83, 0xce, 0xc0, + 0x96, 0x43, 0x07, 0x06, 0x23, 0x7d, 0xca, 0xac, 0xff, 0xb7, 0x8a, 0x0d, 0x3a, 0xc0, 0x32, 0x1d, + 0x03, 0x67, 0x3a, 0xbc, 0xb3, 0x8d, 0xbf, 0x14, 0xb0, 0x1f, 0xbd, 0x48, 0x88, 0x83, 0xbd, 0x88, + 0x4d, 0x08, 0x3a, 0x7d, 0x72, 0xbf, 0x4e, 0x03, 0xed, 0xa0, 0xd7, 0xdd, 0xf0, 0xe5, 0x7f, 0x53, + 0xcd, 0x7f, 0x1e, 0x53, 0x95, 0xa3, 0x1f, 0xe2, 0x20, 0x35, 0x2b, 0x46, 0x1f, 0x80, 0x0c, 0xb7, + 0x87, 0xc4, 0x18, 0xbb, 0xf6, 0xb5, 0xe1, 0x9a, 0x2e, 0x95, 0x6d, 0x6e, 0xe2, 0xb4, 0x88, 0x76, + 0x5d, 0xfb, 0xba, 0x69, 0xba, 0x14, 0x3d, 0x01, 0x7b, 0xb4, 0xe7, 0x11, 0x76, 0x45, 0x2c, 0x63, + 0x29, 0x7d, 0x4b, 0xa6, 0xef, 0x4c, 0x71, 0x67, 0xbe, 0xac, 0x03, 0x1e, 0x78, 0xe4, 0x8a, 0x30, + 0x9b, 0x4f, 0x0c, 0x77, 0x3c, 0xec, 0x11, 0xa6, 0xc6, 0x72, 0x4a, 0x3e, 0x53, 0xfa, 0x64, 0xf5, + 0xed, 0x08, 0x6a, 0x9a, 0xb2, 0x04, 0x67, 0xbc, 0x85, 0x6f, 0xf4, 0x3e, 0xd8, 0x9e, 0xa9, 0x72, + 0x72, 0xcd, 0x83, 0x36, 0xd3, 0xd3, 0x60, 0x87, 0x5c, 0x73, 0xa4, 0x81, 0x8d, 0x1e, 0xb5, 0x26, + 0x6a, 0x5c, 0x6e, 0xda, 0x47, 0x77, 0x6c, 0x9a, 0xe6, 0x4e, 0x9e, 0x99, 0xce, 0x78, 0x7a, 0x24, + 0x65, 0x29, 0xba, 0x00, 0xc0, 0xe4, 0x9c, 0xd9, 0xbd, 0x31, 0x27, 0x9e, 0xba, 0x29, 0xf7, 0xe4, + 0x2e, 0xa1, 0x73, 0xb2, 0x20, 0x34, 0x27, 0x80, 0x9e, 0x02, 0xd5, 0x62, 0x74, 0x34, 0x22, 0x96, + 0xf1, 0x6f, 0xd4, 0xe8, 0xd3, 0xb1, 0xcb, 0xd5, 0x44, 0x4e, 0xc9, 0x6f, 0xe3, 0xdd, 0x80, 0x6b, + 0x33, 0x7c, 0x22, 0x28, 0xda, 0x01, 0xf1, 0x6f, 0x1d, 0x73, 0xe0, 0xa9, 0xc9, 0x9c, 0x92, 0x4f, + 0x60, 0xff, 0x03, 0x7d, 0x03, 0x92, 0x9c, 0x99, 0x7d, 0x62, 0xd8, 0x96, 0x9a, 0xca, 0x29, 0xf9, + 0x74, 0x55, 0x13, 0x73, 0xfe, 0xfe, 0xfa, 0xf0, 0xb3, 0x01, 0x5d, 0xb2, 0x69, 0x8b, 0x57, 0xda, + 0x71, 0x48, 0x9f, 0x53, 0x56, 0x1c, 0x52, 0x8b, 0x38, 0x45, 0xdb, 0xe5, 0x84, 0xb9, 0xa6, 0x53, + 0xb4, 0x4c, 0x6e, 0x16, 0x3a, 0x42, 0xa9, 0x5e, 0xc3, 0x09, 0x29, 0x59, 0xb7, 0xd0, 0x73, 0x90, + 0xf0, 0x46, 0xa6, 0x2b, 0xc4, 0x81, 0x14, 0xff, 0x22, 0x10, 0x7f, 0x7a, 0x7f, 0xf1, 0xf6, 0xc8, + 0x74, 0xeb, 0x35, 0xbc, 0x29, 0x04, 0xeb, 0xd6, 0x97, 0x1b, 0xc9, 0x0d, 0x18, 0x3f, 0xfe, 0x25, + 0x0e, 0x32, 0x8b, 0x1b, 0x8d, 0x0e, 0xc1, 0x41, 0x5b, 0x7f, 0xa6, 0xe3, 0x7a, 0xe7, 0xb9, 0xd1, + 0xec, 0x5e, 0x54, 0x75, 0x6c, 0x74, 0x9b, 0xed, 0x4b, 0xfd, 0xa4, 0x7e, 0x5a, 0xd7, 0x6b, 0x70, + 0x0d, 0xbd, 0x03, 0x1e, 0x2e, 0x27, 0x74, 0xb0, 0x76, 0xa2, 0x43, 0x05, 0xed, 0x83, 0xdd, 0x50, + 0x54, 0x82, 0xb1, 0x48, 0x56, 0x86, 0xeb, 0x91, 0xac, 0x02, 0x37, 0xc2, 0xa6, 0xab, 0xe9, 0xd5, + 0xee, 0x19, 0x8c, 0x87, 0x95, 0x49, 0x54, 0x82, 0x9b, 0x91, 0xac, 0x0c, 0x13, 0x91, 0xac, 0x02, + 0x93, 0x48, 0x05, 0x3b, 0xcb, 0xac, 0xde, 0x3c, 0x6d, 0xc1, 0x54, 0x98, 0x11, 0x41, 0x4a, 0x10, + 0x44, 0xa1, 0x32, 0xdc, 0x8a, 0x42, 0x15, 0x98, 0x0e, 0x9b, 0xea, 0x2b, 0x0d, 0x37, 0xe1, 0x76, + 0x58, 0x91, 0x20, 0x25, 0x98, 0x89, 0x42, 0x65, 0xf8, 0x20, 0x0a, 0x55, 0x20, 0x0c, 0x43, 0x3a, + 0xc6, 0x2d, 0x0c, 0xdf, 0x0a, 0x5b, 0x0c, 0x89, 0x4a, 0x10, 0x45, 0xb2, 0x32, 0x7c, 0x3b, 0x92, + 0x55, 0xe0, 0x4e, 0xd8, 0x74, 0xa7, 0x5a, 0x47, 0x6b, 0xc0, 0x87, 0x61, 0x65, 0x12, 0x95, 0xe0, + 0x6e, 0x24, 0x2b, 0xc3, 0xbd, 0x48, 0x56, 0x81, 0xea, 0xf1, 0xd7, 0x20, 0x33, 0x7b, 0x4b, 0x4f, + 0xe5, 0xb5, 0x3c, 0x04, 0x07, 0x8d, 0xd6, 0x99, 0x81, 0xf5, 0x93, 0x16, 0xae, 0x19, 0xa7, 0x0d, + 0xed, 0x6c, 0xe9, 0x10, 0x7f, 0x08, 0x72, 0xcb, 0x09, 0xf2, 0xc4, 0xc9, 0x61, 0xdb, 0xb8, 0xd0, + 0xda, 0xe7, 0xf0, 0x6f, 0xa5, 0xfa, 0xa3, 0xf2, 0xf2, 0x26, 0xab, 0xbc, 0xba, 0xc9, 0x2a, 0x7f, + 0xdc, 0x64, 0x95, 0x9f, 0x6e, 0xb3, 0x6b, 0xaf, 0x6e, 0xb3, 0x6b, 0xbf, 0xdd, 0x66, 0xd7, 0x40, + 0xd6, 0xa6, 0xab, 0xde, 0xcf, 0xaa, 0x78, 0xde, 0xbd, 0x4b, 0x11, 0xba, 0x54, 0x5e, 0x54, 0xef, + 0x7d, 0x5f, 0xfd, 0xbf, 0x6a, 0x03, 0xe2, 0x4e, 0xff, 0x34, 0xf6, 0x36, 0x65, 0xa4, 0xfc, 0x4f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x3b, 0x08, 0x15, 0xc0, 0x5a, 0x0a, 0x00, 0x00, } func (m *LogsData) Marshal() (dAtA []byte, err error) { @@ -984,13 +969,6 @@ func (m *LogRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x2a - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintLogs(dAtA, i, uint64(len(m.Name))) - i-- - dAtA[i] = 0x22 - } if len(m.SeverityText) > 0 { i -= len(m.SeverityText) copy(dAtA[i:], m.SeverityText) @@ -1123,10 +1101,6 @@ func (m *LogRecord) Size() (n int) { if l > 0 { n += 1 + l + sovLogs(uint64(l)) } - l = len(m.Name) - if l > 0 { - n += 1 + l + sovLogs(uint64(l)) - } l = m.Body.Size() n += 1 + l + sovLogs(uint64(l)) if len(m.Attributes) > 0 { @@ -1812,38 +1786,6 @@ func (m *LogRecord) Unmarshal(dAtA []byte) error { } m.SeverityText = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowLogs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthLogs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthLogs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Body", wireType) diff --git a/model/internal/pdata/generated_log.go b/model/internal/pdata/generated_log.go index 1dc55017e63..0ad8ab9c59e 100644 --- a/model/internal/pdata/generated_log.go +++ b/model/internal/pdata/generated_log.go @@ -639,18 +639,6 @@ func (ms LogRecord) SetSeverityNumber(v SeverityNumber) { (*ms.orig).SeverityNumber = otlplogs.SeverityNumber(v) } -// Name returns the name associated with this LogRecord. -// -// Deprecated: [v0.48.0] it was removed from the data model. -func (ms LogRecord) Name() string { - return (*ms.orig).Name -} - -// SetName replaces the name associated with this LogRecord. -func (ms LogRecord) SetName(v string) { - (*ms.orig).Name = v -} - // Body returns the body associated with this LogRecord. func (ms LogRecord) Body() Value { return newValue(&(*ms.orig).Body) @@ -679,7 +667,6 @@ func (ms LogRecord) CopyTo(dest LogRecord) { dest.SetFlags(ms.Flags()) dest.SetSeverityText(ms.SeverityText()) dest.SetSeverityNumber(ms.SeverityNumber()) - dest.SetName(ms.Name()) ms.Body().CopyTo(dest.Body()) ms.Attributes().CopyTo(dest.Attributes()) dest.SetDroppedAttributesCount(ms.DroppedAttributesCount()) diff --git a/model/internal/pdata/generated_log_test.go b/model/internal/pdata/generated_log_test.go index b93907c4de1..ac90eca3212 100644 --- a/model/internal/pdata/generated_log_test.go +++ b/model/internal/pdata/generated_log_test.go @@ -489,14 +489,6 @@ func TestLogRecord_SeverityNumber(t *testing.T) { assert.EqualValues(t, testValSeverityNumber, ms.SeverityNumber()) } -func TestLogRecord_Name(t *testing.T) { - ms := NewLogRecord() - assert.EqualValues(t, "", ms.Name()) - testValName := "test_name" - ms.SetName(testValName) - assert.EqualValues(t, testValName, ms.Name()) -} - func TestLogRecord_Body(t *testing.T) { ms := NewLogRecord() fillTestValue(ms.Body()) @@ -598,7 +590,6 @@ func fillTestLogRecord(tv LogRecord) { tv.SetFlags(uint32(0x01)) tv.SetSeverityText("INFO") tv.SetSeverityNumber(SeverityNumberINFO) - tv.SetName("test_name") fillTestValue(tv.Body()) fillTestMap(tv.Attributes()) tv.SetDroppedAttributesCount(uint32(17))