Implement resource serialization for stdoutlog (#5213)

open-telemetry · Apr 22, 2024 · 9370c5a · 9370c5a
1 parent 6e92163
commit 9370c5a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/exporters/stdout/stdoutlog/exporter_test.go b/exporters/stdout/stdoutlog/exporter_test.go
@@ -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 {
@@ -219,7 +219,7 @@ func getPrettyJSON(now time.Time) string {
 	"TraceID": "0102030405060708090a0b0c0d0e0f10",
 	"SpanID": "0102030405060708",
 	"TraceFlags": "01",
-	"Resource": {},
+	"Resource": null,
 	"Scope": {
 		"Name": "",
 		"Version": "",

diff --git a/exporters/stdout/stdoutlog/record.go b/exporters/stdout/stdoutlog/record.go
@@ -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(),
@@ -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(),
 	}