Merge pull request #5 from catkins/catkins/add-dd-trace-support

Add support for datadog tracing

.travis.yml

@@ -1,8 +1,7 @@
 language: go
 
 go:
-  - 1.8
-  - 1.9
+  - 1.11
 
 cache:
   - vendor
@@ -16,4 +15,4 @@ install:
   - dep ensure -v
 
 script:
-  - go test -v -race
+  - go test -v -race ./...

Dockerfile

@@ -1,9 +1,9 @@
-FROM golang:1.9 as binary-builder
+FROM golang:1.11 as binary-builder
 
 WORKDIR /go/src/github.com/catkins/statsd-logger
 
 # install dep
-RUN curl -L https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64 > $GOPATH/bin/dep \
+RUN curl -L https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 > $GOPATH/bin/dep \
   && chmod +x $GOPATH/bin/dep
 
 # install runtime dependencies

Gopkg.toml

@@ -17,3 +17,7 @@
  name = "github.com/stretchr/testify"
  revision = "890a5c3458b43e6104ff5da8dfa139d013d77544"
 
+
+[[constraint]]
+  name = "github.com/vmihailenco/msgpack"
+  version = "4.0.0"

README.md

@@ -19,43 +19,6 @@ statsd-logger
 echo -n "my.awesome_counter:1|c#cool:tags,another_tag:with_value" | nc -u -w0 localhost 8125
 ```
 
-### Library
-
-```bash
-go get -u github.com/catkins/statsd-logger
-```
-
-Embed it into an existing application
-
-```go
-package main
-
-import (
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/catkins/statsd-logger"
-)
-
-func main() {
-	shutdownChan := make(chan os.Signal)
-	signal.Notify(shutdownChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGKILL)
-
-	server, err := statsdLogger.New("0.0.0.0:8125")
-	if err != nil {
-		panic(err)
-	}
-
-	go func() {
-		server.Listen()
-	}()
-
-	<-shutdownChan
-	server.Close()
-}
-```
-
 ## Docker
 
 `statsd-logger` can also log StatsD metrics being being sent to udp:8125 on running `docker` containers without modification.

cmd/statsd-logger/main.go

@@ -5,22 +5,30 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/catkins/statsd-logger"
+	"github.com/catkins/statsd-logger/metrics"
+	"github.com/catkins/statsd-logger/trace"
 )
 
 func main() {
 	shutdownChan := make(chan os.Signal)
 	signal.Notify(shutdownChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGKILL)
 
-	server, err := statsdLogger.New("0.0.0.0:8125")
+	metricsServer, err := metrics.NewServer(metrics.DefaultAddress)
 	if err != nil {
 		panic(err)
 	}
 
 	go func() {
-		server.Listen()
+		metricsServer.Listen()
+	}()
+
+	traceServer := trace.NewServer(trace.DefaultAddress)
+
+	go func() {
+		traceServer.Listen()
 	}()
 
 	<-shutdownChan
-	server.Close()
+	metricsServer.Close()
+	traceServer.Close()
 }

formatter.go → metrics/formatter.go

@@ -1,4 +1,4 @@
-package statsdLogger
+package metrics
 
 import (
 	"fmt"

formatter_test.go → metrics/formatter_test.go

@@ -1,4 +1,4 @@
-package statsdLogger
+package metrics
 
 import "testing"
 import "github.com/fatih/color"

metric.go → metrics/metric.go

@@ -1,6 +1,9 @@
-package statsdLogger
+package metrics
 
-import "strings"
+import (
+	"fmt"
+	"strings"
+)
 
 // Metric is an intermediate representation of a raw statsd metric for easier presentation
 type Metric struct {
@@ -9,8 +12,14 @@ type Metric struct {
 	Tags  string
 }
 
-// ParseMetric takes a raw statsd metric and returns a populated Metric
-func ParseMetric(rawMetric string) Metric {
+// Parse takes a raw statsd metric and returns a populated Metric
+func Parse(rawMetric string) (metric Metric) {
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Printf("error parsing metric: %+v\n", r)
+		}
+	}()
+
 	metricNameAndRest := strings.SplitN(rawMetric, ":", 2)
 	name := metricNameAndRest[0]
 	valueAndTags := strings.SplitN(metricNameAndRest[1], "#", 2)

metric_test.go → metrics/metric_test.go

@@ -1,12 +1,12 @@
-package statsdLogger
+package metrics
 
 import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
-func TestParseMetric(t *testing.T) {
+func TestParse(t *testing.T) {
 	cases := []struct {
 		input    string
 		expected Metric
@@ -22,6 +22,6 @@ func TestParseMetric(t *testing.T) {
 	}
 
 	for _, tc := range cases {
-		assert.Equal(t, tc.expected, ParseMetric(tc.input))
+		assert.Equal(t, tc.expected, Parse(tc.input))
 	}
 }

server.go → metrics/server.go

@@ -1,7 +1,7 @@
-// Package statsdLogger provides a simple dummy StatsD logging server for local development
+// Package metrics provides a simple dummy StatsD logging server for local development
 //
 // Adapted from http://lee.hambley.name/2013/01/26/dirt-simple-statsd-server-for-local-development.html
-package statsdLogger
+package metrics
 
 import (
 	"errors"
@@ -28,8 +28,8 @@ type Server interface {
 	Close() error
 }
 
-// New returns a local statsd logging server which logs to statsdLogger.DefaultOutput and is formatted with statsdLogger.DefaultFormatter
-func New(address string, options ...func(*server)) (Server, error) {
+// NewServer returns a local statsd logging server which logs to statsdLogger.DefaultOutput and is formatted with statsdLogger.DefaultFormatter
+func NewServer(address string, options ...func(*server)) (Server, error) {
 	addr, err := net.ResolveUDPAddr("udp", address)
 	if err != nil {
 		return nil, errors.New("[StatsD] Invalid address")
@@ -90,7 +90,7 @@ func (s *server) Listen() error {
 
 	fmt.Fprintf(s.output, "[StatsD] Listening on port %d\n", s.port)
 
-	buffer := make([]byte, 1024)
+	buffer := make([]byte, 10000)
 
 	for !s.isClosed() {
 		numBytes, err := s.connection.Read(buffer)
@@ -106,7 +106,7 @@ func (s *server) Listen() error {
 		}
 
 		rawMetric := buffer[0:numBytes]
-		metric := ParseMetric(string(rawMetric))
+		metric := Parse(string(rawMetric))
 
 		s.logMetric(metric)
 	}

server_test.go → metrics/server_test.go

@@ -1,4 +1,4 @@
-package statsdLogger
+package metrics
 
 import (
 	"bytes"
@@ -16,7 +16,7 @@ import (
 
 const (
 	testServerAddress = ":5678"
-	testSErverPort    = 5678
+	testServerPort    = 5678
 )
 
 func TestListen(t *testing.T) {
@@ -27,7 +27,7 @@ func TestListen(t *testing.T) {
 		sync.Mutex{},
 	}
 
-	server, err := New(testServerAddress, WithWriter(output))
+	server, err := NewServer(testServerAddress, WithWriter(output))
 
 	go func() { server.Listen() }()
 
@@ -48,7 +48,7 @@ func TestListen(t *testing.T) {
 }
 
 func TestInvalidAddress(t *testing.T) {
-	server, err := New("abcd", WithWriter(ioutil.Discard))
+	server, err := NewServer("abcd", WithWriter(ioutil.Discard))
 
 	assert.Error(t, err, "[StatsD] Invalid address")
 
@@ -60,7 +60,7 @@ func TestInvalidAddress(t *testing.T) {
 func TestClose(t *testing.T) {
 	// TODO: for some reason, having this test use the `testServerAddress` seems to cause panics
 	// probably should figure out why
-	server, err := New(":0", WithWriter(ioutil.Discard))
+	server, err := NewServer(":0", WithWriter(ioutil.Discard))
 	assert.Nil(t, err)
 	assert.NotNil(t, server)
 
@@ -77,7 +77,7 @@ func TestWithFormatter(t *testing.T) {
 	metric := Metric{Name: "cool_metric"}
 	formatter.On("Format", metric).Return("ate 2 burgers")
 
-	server, err := New(testServerAddress, WithFormatter(formatter), WithWriter(ioutil.Discard))
+	server, err := NewServer(testServerAddress, WithFormatter(formatter), WithWriter(ioutil.Discard))
 	defer server.Close()
 	assert.Nil(t, err)