Fix "add event" event handling (open-telemetry#97)

atlassian-forks · Aug 16, 2019 · 6dab220 · 6dab220
1 parent 56e1a9d
commit 6dab220
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/experimental/streaming/exporter/reader/format/format.go b/experimental/streaming/exporter/reader/format/format.go
@@ -73,11 +73,12 @@ func AppendEvent(buf *strings.Builder, data reader.Event) {
 
 	case reader.ADD_EVENT:
 		buf.WriteString("event: ")
-		buf.WriteString(data.Event.Message())
+		buf.WriteString(data.Message)
 		buf.WriteString(" (")
-		for _, kv := range data.Event.Attributes() {
+		data.Attributes.Foreach(func(kv core.KeyValue) bool {
 			buf.WriteString(" " + kv.Key.Variable.Name + "=" + kv.Value.Emit())
-		}
+			return true
+		})
 		buf.WriteString(")")
 
 	case reader.MODIFY_ATTR:

diff --git a/experimental/streaming/exporter/reader/reader.go b/experimental/streaming/exporter/reader/reader.go
@@ -22,7 +22,6 @@ import (
 	"google.golang.org/grpc/codes"
 
 	"go.opentelemetry.io/api/core"
-	"go.opentelemetry.io/api/event"
 	"go.opentelemetry.io/api/stats"
 	"go.opentelemetry.io/api/tag"
 	"go.opentelemetry.io/experimental/streaming/exporter/observer"
@@ -41,7 +40,6 @@ type Event struct {
 	SpanContext core.SpanContext
 	Tags        tag.Map
 	Attributes  tag.Map
-	Event       event.Event
 	Stats       []Measurement
 
 	Parent           core.SpanContext