Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement resource serialization for stdoutlog #5213

Merged
merged 12 commits into from
Apr 22, 2024
Merged

Implement resource serialization for stdoutlog #5213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5e414f0
Implement resource serialization for stdoutlog
XSAM Apr 15, 2024
28a4840
Fix test
XSAM Apr 16, 2024
dc7e75d
Merge branch 'main' into fix-resource-serialization
XSAM Apr 17, 2024
c77f8f4
Fix format
XSAM Apr 17, 2024
8fbdaf4
Merge branch 'main' into fix-resource-serialization
XSAM Apr 17, 2024
193cb2c
Merge branch 'main' into fix-resource-serialization
XSAM Apr 18, 2024
211758d
Merge branch 'main' into fix-resource-serialization
XSAM Apr 18, 2024
a96691c
Merge branch 'main' into fix-resource-serialization
XSAM Apr 19, 2024
b6e27ac
Merge branch 'main' into fix-resource-serialization
XSAM Apr 19, 2024
70d16e1
Merge branch 'main' into fix-resource-serialization
XSAM Apr 20, 2024
9f082a0
Merge branch 'main' into fix-resource-serialization
dmathieu Apr 22, 2024
4a7013e
Merge branch 'main' into fix-resource-serialization
pellared Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions exporters/stdout/stdoutlog/exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ func TestExporterExport(t *testing.T) {
func getJSON(now time.Time) string {
serializedNow, _ := json.Marshal(now)

return "{\"Timestamp\":" + string(serializedNow) + ",\"ObservedTimestamp\":" + string(serializedNow) + ",\"Severity\":9,\"SeverityText\":\"INFO\",\"Body\":{},\"Attributes\":[{\"Key\":\"key\",\"Value\":{}},{\"Key\":\"key2\",\"Value\":{}},{\"Key\":\"key3\",\"Value\":{}},{\"Key\":\"key4\",\"Value\":{}},{\"Key\":\"key5\",\"Value\":{}},{\"Key\":\"bool\",\"Value\":{}}],\"TraceID\":\"0102030405060708090a0b0c0d0e0f10\",\"SpanID\":\"0102030405060708\",\"TraceFlags\":\"01\",\"Resource\":{},\"Scope\":{\"Name\":\"\",\"Version\":\"\",\"SchemaURL\":\"\"},\"AttributeValueLengthLimit\":0,\"AttributeCountLimit\":0}\n"
return "{\"Timestamp\":" + string(serializedNow) + ",\"ObservedTimestamp\":" + string(serializedNow) + ",\"Severity\":9,\"SeverityText\":\"INFO\",\"Body\":{},\"Attributes\":[{\"Key\":\"key\",\"Value\":{}},{\"Key\":\"key2\",\"Value\":{}},{\"Key\":\"key3\",\"Value\":{}},{\"Key\":\"key4\",\"Value\":{}},{\"Key\":\"key5\",\"Value\":{}},{\"Key\":\"bool\",\"Value\":{}}],\"TraceID\":\"0102030405060708090a0b0c0d0e0f10\",\"SpanID\":\"0102030405060708\",\"TraceFlags\":\"01\",\"Resource\":null,\"Scope\":{\"Name\":\"\",\"Version\":\"\",\"SchemaURL\":\"\"},\"AttributeValueLengthLimit\":0,\"AttributeCountLimit\":0}\n"
}

func getJSONs(now time.Time) string {
Expand Down Expand Up @@ -219,7 +219,7 @@ func getPrettyJSON(now time.Time) string {
"TraceID": "0102030405060708090a0b0c0d0e0f10",
"SpanID": "0102030405060708",
"TraceFlags": "01",
"Resource": {},
"Resource": null,
MrAlias marked this conversation as resolved.
Show resolved Hide resolved
"Scope": {
"Name": "",
"Version": "",
Expand Down
5 changes: 3 additions & 2 deletions exporters/stdout/stdoutlog/record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ type recordJSON struct {
TraceID trace.TraceID
SpanID trace.SpanID
TraceFlags trace.TraceFlags
Resource resource.Resource
Resource *resource.Resource
Scope instrumentation.Scope
AttributeValueLengthLimit int
AttributeCountLimit int
}

func (e *Exporter) newRecordJSON(r sdklog.Record) recordJSON {
res := r.Resource()
newRecord := recordJSON{
Severity: r.Severity(),
SeverityText: r.SeverityText(),
Expand All @@ -42,7 +43,7 @@ func (e *Exporter) newRecordJSON(r sdklog.Record) recordJSON {

Attributes: make([]log.KeyValue, 0, r.AttributesLen()),

Resource: r.Resource(),
Resource: &res,
Scope: r.InstrumentationScope(),
}

Expand Down