Merge pull request #116 from chris-ramon/d3timeline-improvements

Adds emptiness time checking.

traceapp/app.go

@@ -16,8 +16,10 @@ import (
 	"errors"
 	htmpl "html/template"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"net/url"
+	"os"
 	"path"
 	"sort"
 	"strings"
@@ -39,6 +41,8 @@ type App struct {
 
 	tmplLock sync.Mutex
 	tmpls    map[string]*htmpl.Template
+
+	Log *log.Logger
 }
 
 // New creates a new application handler. If r is nil, a new router is
@@ -48,7 +52,7 @@ func New(r *Router) *App {
 		r = NewRouter(nil)
 	}
 
-	app := &App{Router: r}
+	app := &App{Router: r, Log: log.New(os.Stderr, "appdash: ", log.LstdFlags)}
 
 	r.r.Get(RootRoute).Handler(handlerFunc(app.serveRoot))
 	r.r.Get(TraceRoute).Handler(handlerFunc(app.serveTrace))

traceapp/vis.go

@@ -92,6 +92,15 @@ func (a *App) d3timelineInner(t *appdash.Trace, depth int) ([]timelineItem, erro
 	}
 	for _, e := range events {
 		if e, ok := e.(appdash.TimespanEvent); ok {
+			// Continue to next iteration
+			// if e.Start() or e.End() are empty time values.
+			if e.Start() == (time.Time{}) || e.End() == (time.Time{}) {
+				if a.Log != nil {
+					a.Log.Printf("Found a TimespanEvent: %+v with invalid/zero times.", e)
+				}
+				// Continuing so frontend does not break due to current event missing start/end time values.
+				continue
+			}
 			start := e.Start().UnixNano() / int64(time.Millisecond)
 			end := e.End().UnixNano() / int64(time.Millisecond)
 			ts := timelineItemTimespan{