Add JSON input support to zipkin plugin (#3150)

plugins/inputs/zipkin/zipkin.go

@@ -8,11 +8,11 @@ import (
 	"net/http"
 	"strconv"
 	"sync"
-	"time"
 
 	"github.com/gorilla/mux"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/zipkin/trace"
 )
 
 const (
@@ -32,7 +32,7 @@ const (
 // Recorder represents a type which can record zipkin trace data as well as
 // any accompanying errors, and process that data.
 type Recorder interface {
-	Record(Trace) error
+	Record(trace.Trace) error
 	Error(error)
 }
 
@@ -42,43 +42,6 @@ type Handler interface {
 	Register(router *mux.Router, recorder Recorder) error
 }
 
-// BinaryAnnotation represents a zipkin binary annotation. It contains
-// all of the same fields as might be found in its zipkin counterpart.
-type BinaryAnnotation struct {
-	Key         string
-	Value       string
-	Host        string // annotation.endpoint.ipv4 + ":" + annotation.endpoint.port
-	ServiceName string
-	Type        string
-}
-
-// Annotation represents an ordinary zipkin annotation. It contains the data fields
-// which will become fields/tags in influxdb
-type Annotation struct {
-	Timestamp   time.Time
-	Value       string
-	Host        string // annotation.endpoint.ipv4 + ":" + annotation.endpoint.port
-	ServiceName string
-}
-
-//Span represents a specific zipkin span. It holds the majority of the same
-// data as a zipkin span sent via the thrift protocol, but is presented in a
-// format which is more straightforward for storage purposes.
-type Span struct {
-	ID                string
-	TraceID           string // zipkin traceid high concat with traceid
-	Name              string
-	ParentID          string
-	ServiceName       string
-	Timestamp         time.Time // If zipkin input is nil then time.Now()
-	Duration          time.Duration
-	Annotations       []Annotation
-	BinaryAnnotations []BinaryAnnotation
-}
-
-// Trace is an array (or a series) of spans
-type Trace []Span
-
 const sampleConfig = `
   # path = "/api/v1/spans" # URL path for span data
   # port = 9411            # Port on which Telegraf listens
@@ -122,7 +85,9 @@ func (z *Zipkin) Start(acc telegraf.Accumulator) error {
 
 	router := mux.NewRouter()
 	converter := NewLineProtocolConverter(acc)
-	z.handler.Register(router, converter)
+	if err := z.handler.Register(router, converter); err != nil {
+		return err
+	}
 
 	z.server = &http.Server{
 		Handler: router,