adds Recorder.Finish() method

in order to reduce the number of `InfluxDBStore.Collect()` calls

httptrace/client.go

@@ -158,6 +158,7 @@ func (t *Transport) RoundTrip(original *http.Request) (*http.Response, error) {
 		e.Response.StatusCode = -1
 	}
 	child.Event(e)
+	child.Finish()
 	return resp, err
 }
 

httptrace/server.go

@@ -103,6 +103,7 @@ func Middleware(c appdash.Collector, conf *MiddlewareConfig) func(rw http.Respon
 			rec.Name(r.URL.Host + r.URL.Path)
 		}
 		rec.Event(e)
+		rec.Finish()
 	}
 }
 

recorder.go

@@ -9,7 +9,8 @@ import (
 // A Recorder is associated with a span and records annotations on the
 // span by sending them to a collector.
 type Recorder struct {
-	SpanID // the span ID that annotations are about
+	SpanID                   // the span ID that annotations are about
+	annotations []Annotation // SpanID's annotations to be collected
 
 	collector Collector // the collector to send to
 
@@ -65,7 +66,11 @@ func (r *Recorder) Event(e Event) {
 		r.error("Event", err)
 		return
 	}
-	r.Annotation(as...)
+	r.annotations = append(r.annotations, as...)
+}
+
+func (r *Recorder) Finish() {
+	r.Annotation(r.annotations...)
 }
 
 // Annotation records raw annotations on the span.

recorder_test.go

@@ -26,16 +26,18 @@ func TestRecorder(t *testing.T) {
 	r := NewRecorder(id, c)
 
 	r.Msg("msg")
-	if calledCollect != 1 {
-		t.Errorf("got calledCollect %d, want 1", calledCollect)
+	if calledCollect != 0 {
+		t.Errorf("got calledCollect %d, want 0", calledCollect)
 	}
+	r.Finish()
 	if diff := diffAnnotationsFromEvent(anns, Msg("msg")); len(diff) > 0 {
 		t.Errorf("got diff annotations for Msg event:\n%s", strings.Join(diff, "\n"))
 	}
 
 	r.Name("name")
+	r.Finish()
 	if calledCollect != 2 {
-		t.Errorf("got calledCollect %d, want 1", calledCollect)
+		t.Errorf("got calledCollect %d, want 2", calledCollect)
 	}
 	if diff := diffAnnotationsFromEvent(anns, spanName{"name"}); len(diff) > 0 {
 		t.Errorf("got diff annotations for spanName event:\n%s", strings.Join(diff, "\n"))
@@ -53,9 +55,10 @@ func TestRecorder_Errors(t *testing.T) {
 	r := NewRecorder(SpanID{}, c)
 
 	r.Msg("msg")
-	if calledCollect != 2 {
-		t.Errorf("got calledCollect %d, want 1", calledCollect)
+	if calledCollect != 0 {
+		t.Errorf("got calledCollect %d, want 0", calledCollect)
 	}
+	r.Finish()
 	errs := r.Errors()
 	if want := []error{collectErr}; !reflect.DeepEqual(errs, want) {
 		t.Errorf("got errors %v, want %v", errs, want)