Update OTLP to 0.16.0

Removed LogRecord.Name field (was deprecated earlier)
open-telemetry · Apr 1, 2022 · ad27942 · ad27942
1 parent d2e5601
commit ad27942
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 152 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/model/internal/pdata/generated_log.go b/model/internal/pdata/generated_log.go
diff --git a/model/internal/pdata/generated_log_test.go b/model/internal/pdata/generated_log_test.go