Skip to content

Commit fb33552

Browse files
author
Tigran Najaryan
committed
Make logs SeverityNumber publicly available
It was previously available in internal package only. Now we have the public alias for it. This is consistent with how we treat other enums, e.g. SpanKind.
1 parent 51395f9 commit fb33552

File tree

6 files changed

+44
-13
lines changed

6 files changed

+44
-13
lines changed

cmd/pdatagen/internal/base_structs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ func Test${structName}_Append(t *testing.T) {
251251
es.Append(&emptyVal)
252252
assert.EqualValues(t, *(es.At(7)).orig, *emptyVal.orig)
253253
254-
emptyVal2:= New${elementName}()
254+
emptyVal2 := New${elementName}()
255255
emptyVal2.InitEmpty()
256256
257257
es.Append(&emptyVal2)

cmd/pdatagen/internal/log_structs.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ var logRecord = &messageStruct{
112112
&primitiveTypedField{
113113
fieldMame: "SeverityNumber",
114114
originFieldName: "SeverityNumber",
115-
returnType: "otlplogs.SeverityNumber",
115+
returnType: "SeverityNumber",
116116
rawType: "otlplogs.SeverityNumber",
117-
defaultVal: `otlplogs.SeverityNumber_UNDEFINED_SEVERITY_NUMBER`,
118-
testVal: `otlplogs.SeverityNumber_INFO`,
117+
defaultVal: `SeverityNumberUNDEFINED`,
118+
testVal: `SeverityNumberINFO`,
119119
},
120120
&primitiveField{
121121
fieldMame: "Name",

consumer/pdata/generated_log.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

consumer/pdata/generated_log_test.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

consumer/pdata/log.go

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,34 @@ func (ld Logs) LogRecordCount() int {
8484
func (ld Logs) ResourceLogs() ResourceLogsSlice {
8585
return ResourceLogsSlice(ld)
8686
}
87+
88+
// SeverityNumber is the public alias of otlplogs.SeverityNumber from internal package.
89+
type SeverityNumber otlplogs.SeverityNumber
90+
91+
const (
92+
SeverityNumberUNDEFINED = SeverityNumber(otlplogs.SeverityNumber_UNDEFINED_SEVERITY_NUMBER)
93+
SeverityNumberTRACE = SeverityNumber(otlplogs.SeverityNumber_TRACE)
94+
SeverityNumberTRACE2 = SeverityNumber(otlplogs.SeverityNumber_TRACE2)
95+
SeverityNumberTRACE3 = SeverityNumber(otlplogs.SeverityNumber_TRACE3)
96+
SeverityNumberTRACE4 = SeverityNumber(otlplogs.SeverityNumber_TRACE4)
97+
SeverityNumberDEBUG = SeverityNumber(otlplogs.SeverityNumber_DEBUG)
98+
SeverityNumberDEBUG2 = SeverityNumber(otlplogs.SeverityNumber_DEBUG2)
99+
SeverityNumberDEBUG3 = SeverityNumber(otlplogs.SeverityNumber_DEBUG3)
100+
SeverityNumberDEBUG4 = SeverityNumber(otlplogs.SeverityNumber_DEBUG4)
101+
SeverityNumberINFO = SeverityNumber(otlplogs.SeverityNumber_INFO)
102+
SeverityNumberINFO2 = SeverityNumber(otlplogs.SeverityNumber_INFO2)
103+
SeverityNumberINFO3 = SeverityNumber(otlplogs.SeverityNumber_INFO3)
104+
SeverityNumberINFO4 = SeverityNumber(otlplogs.SeverityNumber_INFO4)
105+
SeverityNumberWARN = SeverityNumber(otlplogs.SeverityNumber_WARN)
106+
SeverityNumberWARN2 = SeverityNumber(otlplogs.SeverityNumber_WARN2)
107+
SeverityNumberWARN3 = SeverityNumber(otlplogs.SeverityNumber_WARN3)
108+
SeverityNumberWARN4 = SeverityNumber(otlplogs.SeverityNumber_WARN4)
109+
SeverityNumberERROR = SeverityNumber(otlplogs.SeverityNumber_ERROR)
110+
SeverityNumberERROR2 = SeverityNumber(otlplogs.SeverityNumber_ERROR2)
111+
SeverityNumberERROR3 = SeverityNumber(otlplogs.SeverityNumber_ERROR3)
112+
SeverityNumberERROR4 = SeverityNumber(otlplogs.SeverityNumber_ERROR4)
113+
SeverityNumberFATAL = SeverityNumber(otlplogs.SeverityNumber_FATAL)
114+
SeverityNumberFATAL2 = SeverityNumber(otlplogs.SeverityNumber_FATAL2)
115+
SeverityNumberFATAL3 = SeverityNumber(otlplogs.SeverityNumber_FATAL3)
116+
SeverityNumberFATAL4 = SeverityNumber(otlplogs.SeverityNumber_FATAL4)
117+
)

internal/data/testdata/log.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ func fillLogOne(log pdata.LogRecord) {
266266
log.SetName("logA")
267267
log.SetTimestamp(TestLogTimestamp)
268268
log.SetDroppedAttributesCount(1)
269-
log.SetSeverityNumber(otlplogs.SeverityNumber_INFO)
269+
log.SetSeverityNumber(pdata.SeverityNumberINFO)
270270
log.SetSeverityText("Info")
271271
log.SetSpanID([]byte{0x01, 0x02, 0x04, 0x08})
272272
log.SetTraceID([]byte{0x08, 0x04, 0x02, 0x01})
@@ -305,7 +305,7 @@ func fillLogTwo(log pdata.LogRecord) {
305305
log.SetName("logB")
306306
log.SetTimestamp(TestLogTimestamp)
307307
log.SetDroppedAttributesCount(1)
308-
log.SetSeverityNumber(otlplogs.SeverityNumber_INFO)
308+
log.SetSeverityNumber(pdata.SeverityNumberINFO)
309309
log.SetSeverityText("Info")
310310

311311
attrs := log.Attributes()
@@ -340,7 +340,7 @@ func fillLogThree(log pdata.LogRecord) {
340340
log.SetName("logC")
341341
log.SetTimestamp(TestLogTimestamp)
342342
log.SetDroppedAttributesCount(1)
343-
log.SetSeverityNumber(otlplogs.SeverityNumber_WARN)
343+
log.SetSeverityNumber(pdata.SeverityNumberWARN)
344344
log.SetSeverityText("Warning")
345345

346346
log.Body().SetStringVal("something else happened")

0 commit comments

Comments
 (0)