Add datadog apm support

openflagr · Jan 29, 2019 · 6aed959 · 6aed959
1 parent c4188c6
commit 6aed959
Show file tree

Hide file tree

Showing 61 changed files with 10,901 additions and 18 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/config/env.go b/pkg/config/env.go
@@ -56,10 +56,13 @@ var Config = struct {
 	NewRelicKey     string `env:"FLAGR_NEWRELIC_KEY" envDefault:""`
 
 	// StatsdEnabled - enable statsd metrics for all the endpoints and DB operations
-	StatsdEnabled bool   `env:"FLAGR_STATSD_ENABLED" envDefault:"false"`
-	StatsdHost    string `env:"FLAGR_STATSD_HOST" envDefault:"127.0.0.1"`
-	StatsdPort    string `env:"FLAGR_STATSD_PORT" envDefault:"8125"`
-	StatsdPrefix  string `env:"FLAGR_STATSD_PREFIX" envDefault:"flagr."`
+	StatsdEnabled        bool   `env:"FLAGR_STATSD_ENABLED" envDefault:"false"`
+	StatsdHost           string `env:"FLAGR_STATSD_HOST" envDefault:"127.0.0.1"`
+	StatsdPort           string `env:"FLAGR_STATSD_PORT" envDefault:"8125"`
+	StatsdPrefix         string `env:"FLAGR_STATSD_PREFIX" envDefault:"flagr."`
+	StatsdAPMEnabled     bool   `env:"FLAGR_STATSD_APM_ENABLED" envDefault:"false"`
+	StatsdAPMPort        string `env:"FLAGR_STATSD_APM_PORT" envDefault:"8126"`
+	StatsdAPMServiceName string `env:"FLAGR_STATSD_APM_SERVICE_NAME" envDefault:"flagr"`
 
 	// RecorderEnabled - enable data records logging
 	RecorderEnabled bool `env:"FLAGR_RECORDER_ENABLED" envDefault:"false"`

diff --git a/pkg/config/middleware.go b/pkg/config/middleware.go
@@ -17,8 +17,17 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/negroni"
 	"github.com/yadvendar/negroni-newrelic-go-agent"
+	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 )
 
+// ServerShutdown is a callback function that will be called when
+// we tear down the flagr server
+func ServerShutdown() {
+	if Config.StatsdEnabled && Config.StatsdAPMEnabled {
+		tracer.Stop()
+	}
+}
+
 // SetupGlobalMiddleware setup the global middleware
 func SetupGlobalMiddleware(handler http.Handler) http.Handler {
 	n := negroni.New()
@@ -33,6 +42,13 @@ func SetupGlobalMiddleware(handler http.Handler) http.Handler {
 
 	if Config.StatsdEnabled {
 		n.Use(&statsdMiddleware{StatsdClient: Global.StatsdClient})
+
+		if Config.StatsdAPMEnabled {
+			tracer.Start(
+				tracer.WithAgentAddr(fmt.Sprintf("%s:%s", Config.StatsdHost, Config.StatsdAPMPort)),
+				tracer.WithServiceName(Config.StatsdAPMServiceName),
+			)
+		}
 	}
 
 	if Config.NewRelicEnabled {

diff --git a/swagger_gen/restapi/configure_flagr.go b/swagger_gen/restapi/configure_flagr.go
diff --git a/vendor/github.com/philhofer/fwd/LICENSE.md b/vendor/github.com/philhofer/fwd/LICENSE.md
diff --git a/vendor/github.com/philhofer/fwd/README.md b/vendor/github.com/philhofer/fwd/README.md