Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[chore] remove unnecessary duplicate code with AsRaw (#17894)
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
bogdandrutu authored Jan 23, 2023
1 parent 8a658d3 commit 7c8f3e2
Showing 1 changed file with 3 additions and 39 deletions.
42 changes: 3 additions & 39 deletions pkg/stanza/adapter/frompdataconverter.go
Original file line number Diff line number Diff line change
@@ -166,7 +166,7 @@ func convertFromLogs(workerItem fromConverterWorkerItem) []*entry.Entry {
entry := entry.Entry{}

entry.ScopeName = workerItem.Scope.Scope().Name()
entry.Resource = valueToMap(workerItem.Resource.Attributes())
entry.Resource = workerItem.Resource.Attributes().AsRaw()
convertFrom(record, &entry)
result = append(result, &entry)
}
@@ -207,8 +207,8 @@ func convertFrom(src plog.LogRecord, ent *entry.Entry) {
ent.Severity = fromPdataSevMap[src.SeverityNumber()]
ent.SeverityText = src.SeverityText()

ent.Attributes = valueToMap(src.Attributes())
ent.Body = valueToInterface(src.Body())
ent.Attributes = src.Attributes().AsRaw()
ent.Body = src.Body().AsRaw()

if !src.TraceID().IsEmpty() {
buffer := src.TraceID()
@@ -225,42 +225,6 @@ func convertFrom(src plog.LogRecord, ent *entry.Entry) {
}
}

func valueToMap(value pcommon.Map) map[string]interface{} {
rawMap := map[string]interface{}{}
value.Range(func(k string, v pcommon.Value) bool {
rawMap[k] = valueToInterface(v)
return true
})
return rawMap
}

func valueToInterface(value pcommon.Value) interface{} {
switch value.Type() {
case pcommon.ValueTypeEmpty:
return nil
case pcommon.ValueTypeStr:
return value.Str()
case pcommon.ValueTypeBool:
return value.Bool()
case pcommon.ValueTypeDouble:
return value.Double()
case pcommon.ValueTypeInt:
return value.Int()
case pcommon.ValueTypeBytes:
return value.Bytes().AsRaw()
case pcommon.ValueTypeMap:
return value.Map().AsRaw()
case pcommon.ValueTypeSlice:
arr := make([]interface{}, 0, value.Slice().Len())
for i := 0; i < value.Slice().Len(); i++ {
arr = append(arr, valueToInterface(value.Slice().At(i)))
}
return arr
default:
return value.AsString()
}
}

var fromPdataSevMap = map[plog.SeverityNumber]entry.Severity{
plog.SeverityNumberUnspecified: entry.Default,
plog.SeverityNumberTrace: entry.Trace,

0 comments on commit 7c8f3e2

Please sign in to comment.