overrides timestamps coming from frontend agents, fixes elastic#723

jalvz · Apr 3, 2018 · c0ba7ba · c0ba7ba
1 parent edb22ae
commit c0ba7ba
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 3 deletions.
diff --git a/beater/handlers.go b/beater/handlers.go
@@ -126,6 +126,7 @@ func frontendHandler(pf ProcessorFactory, beaterConfig *Config, report reporter)
 		SmapMapper:          smapper,
 		LibraryPattern:      regexp.MustCompile(beaterConfig.Frontend.LibraryPattern),
 		ExcludeFromGrouping: regexp.MustCompile(beaterConfig.Frontend.ExcludeFromGrouping),
+		IsFrontend:          true,
 	}
 	return logHandler(
 		killSwitchHandler(beaterConfig.Frontend.isEnabled(),

diff --git a/config/config.go b/config/config.go
@@ -10,4 +10,5 @@ type Config struct {
 	LibraryPattern      *regexp.Regexp
 	ExcludeFromGrouping *regexp.Regexp
 	SmapMapper          sourcemap.Mapper
+	IsFrontend          bool
 }
diff --git a/processor/error/payload.go b/processor/error/payload.go
@@ -1,6 +1,8 @@
 package error
 
 import (
+	"time"
+
 	"github.com/elastic/apm-server/config"
 	m "github.com/elastic/apm-server/model"
 	"github.com/elastic/apm-server/utility"
@@ -62,14 +64,22 @@ func (pa *payload) transform(config config.Config) []beat.Event {
 
 	var events []beat.Event
 	for _, event := range pa.Events {
+
+		var timestamp time.Time
+		if config.IsFrontend {
+			timestamp = time.Now()
+		} else {
+			timestamp = event.Timestamp
+		}
+
 		context := context.Transform(event.Context)
 		ev := beat.Event{
 			Fields: common.MapStr{
 				"processor":  processorEntry,
 				errorDocType: event.Transform(config, pa.Service),
 				"context":    context,
 			},
-			Timestamp: event.Timestamp,
+			Timestamp: timestamp,
 		}
 		if event.Transaction != nil {
 			ev.Fields["transaction"] = common.MapStr{"id": event.Transaction.Id}

diff --git a/processor/error/payload_test.go b/processor/error/payload_test.go
@@ -175,3 +175,17 @@ func TestPayloadTransform(t *testing.T) {
 		}
 	}
 }
+
+func TestOverrideFrontendTimestamp(t *testing.T) {
+	timestamp := time.Now().AddDate(0, 0, -1)
+
+	p := payload{
+		Service: m.Service{Name: "myservice"},
+		Events:  []Event{{Timestamp: timestamp}},
+	}
+
+	frontendEvents := p.transform(config.Config{IsFrontend: true})
+	for _, event := range frontendEvents {
+		assert.InDelta(t, time.Now().Unix(), event.Timestamp.Unix(), time.Millisecond.Seconds()*10)
+	}
+}
diff --git a/processor/transaction/payload.go b/processor/transaction/payload.go
@@ -1,6 +1,8 @@
 package transaction
 
 import (
+	"time"
+
 	"github.com/elastic/apm-server/config"
 	m "github.com/elastic/apm-server/model"
 	"github.com/elastic/apm-server/utility"
@@ -65,13 +67,21 @@ func (pa *payload) transform(config config.Config) []beat.Event {
 
 	var events []beat.Event
 	for _, event := range pa.Events {
+
+		var timestamp time.Time
+		if config.IsFrontend {
+			timestamp = time.Now()
+		} else {
+			timestamp = event.Timestamp
+		}
+
 		ev := beat.Event{
 			Fields: common.MapStr{
 				"processor":        processorTransEntry,
 				transactionDocType: event.Transform(),
 				"context":          context.Transform(event.Context),
 			},
-			Timestamp: event.Timestamp,
+			Timestamp: timestamp,
 		}
 		events = append(events, ev)
 
@@ -85,7 +95,7 @@ func (pa *payload) transform(config config.Config) []beat.Event {
 					"transaction": trId,
 					"context":     spanContext.Transform(sp.Context),
 				},
-				Timestamp: event.Timestamp,
+				Timestamp: timestamp,
 			}
 			events = append(events, ev)
 		}

diff --git a/processor/transaction/payload_test.go b/processor/transaction/payload_test.go
@@ -239,3 +239,17 @@ func TestPayloadTransform(t *testing.T) {
 		}
 	}
 }
+
+func TestOverrideFrontendTimestamp(t *testing.T) {
+	timestamp := time.Now().AddDate(0, 0, -1)
+
+	p := payload{
+		Service: m.Service{Name: "myservice"},
+		Events:  []Event{{Timestamp: timestamp, Spans: []*Span{{}}}},
+	}
+
+	frontendEvents := p.transform(config.Config{IsFrontend: true})
+	for _, event := range frontendEvents {
+		assert.InDelta(t, time.Now().Unix(), event.Timestamp.Unix(), time.Millisecond.Seconds()*10)
+	}
+}