feat(emitter): add infra sdk emitter (#67)

* feat(emitter): add infra sdk emitter
the sdk emitter will output to stdout in the SDK v4 format that the Infra agent recognizes

Author: ardias

.golangci.yml

@@ -24,3 +24,6 @@ misspell:
 
 lll:
   line-length: 100
+
+run:
+  timeout: 2m

Makefile

@@ -6,7 +6,7 @@ INTEGRATION  := nri-prometheus
 BINARY_NAME   = $(INTEGRATION)
 IMAGE_NAME   ?= newrelic/nri-prometheus
 GOPATH := $(shell go env GOPATH)
-GOLANGCI_LINT_VERSION := v1.29.0
+GOLANGCI_LINT_VERSION := v1.30.0
 GOLANGCI_LINT_BIN = $(GOPATH)/bin/golangci-lint
 GORELEASER_VERSION := v0.138.0
 GORELEASER_SHA256 := 60cd594e1413483e5728398f861e34834530e0fb1de842312d62ba9ccd57e5f8

cmd/nri-prometheus/main.go

@@ -4,6 +4,7 @@ package main
 
 import (
 	"github.com/newrelic/nri-prometheus/internal/cmd/scraper"
+	"github.com/newrelic/nri-prometheus/internal/integration"
 	"github.com/sirupsen/logrus"
 )
 
@@ -14,17 +15,11 @@ func main() {
 		logrus.WithError(err).Fatal("while loading configuration")
 	}
 
-	if cfg.Standalone {
-		err = scraper.Run(cfg)
-		if err != nil {
-			logrus.WithError(err).Fatal("error occurred while running scraper")
-		}
-	} else {
-		// todo create a proper emitter that add metrics to an integration and prints them to stdout once scraping and processing is performed
-		cfg.Emitters = []string{"integrationSDK4"}
-		err = scraper.RunOnce(cfg)
-		if err != nil {
-			logrus.WithError(err).Fatal("error occurred while running scraper")
-		}
+	logrus.Infof("Starting New Relic's Prometheus OpenMetrics Integration version %s", integration.Version)
+	logrus.Debugf("Config: %#v", cfg)
+
+	err = scraper.Run(cfg)
+	if err != nil {
+		logrus.WithError(err).Fatal("error occurred while running scraper")
 	}
 }

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/googleapis/gnostic v0.2.3-0.20181019180348-e2aafd60c944 // indirect
 	github.com/hashicorp/hcl v1.0.1-0.20190611123218-cf7d376da96d // indirect
 	github.com/imdario/mergo v0.3.8 // indirect
-	github.com/newrelic/infra-integrations-sdk v3.6.4+incompatible
+	github.com/newrelic/infra-integrations-sdk v1.0.1-0.20200903141127-7191d0d048a1
 	github.com/newrelic/newrelic-telemetry-sdk-go v0.4.0
 	github.com/onsi/ginkgo v1.10.1 // indirect
 	github.com/onsi/gomega v1.7.0 // indirect

go.sum

@@ -11,6 +11,7 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+github.com/AlekSi/gocov-xml v0.0.0-20190121064608-3a14fb1c4737/go.mod h1:w1KSuh2JgIL3nyRiZijboSUwbbxOrTzWwyWVFUHtXBQ=
 github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -24,6 +25,7 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/axw/gocov v1.0.0/go.mod h1:LvQpEYiwwIb2nYkXY2fDWhg9/AsYqkhmrCshjlUJECE=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -188,8 +190,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/newrelic/infra-integrations-sdk v3.6.4+incompatible h1:pYjT0FCzUpwArkbcaEvt/2R2AoY8WEcbXui9+Aa1Q60=
-github.com/newrelic/infra-integrations-sdk v3.6.4+incompatible/go.mod h1:tMUHRMq6mJS0YyBnbWrTXAnREnQqC1AGO6Lu45u5xAM=
+github.com/newrelic/infra-integrations-sdk v1.0.1-0.20200903141127-7191d0d048a1 h1:LWCPynX6+O4tAxOAhVkK7vqTVQ5doMiaUA7Q+0N4AkA=
+github.com/newrelic/infra-integrations-sdk v1.0.1-0.20200903141127-7191d0d048a1/go.mod h1:pkt52iL985phO3d+kREkalNFJdjYyccUDTD+IK/Pno8=
 github.com/newrelic/newrelic-telemetry-sdk-go v0.4.0 h1:x9e37QJxmEX1659zmaeOh9dlUKQTmWHIJVRsFTtfDL4=
 github.com/newrelic/newrelic-telemetry-sdk-go v0.4.0/go.mod h1:G9MqE/cHGv3Hx3qpYhfuyFUsGx2DpVcGi1iJIqTg+JQ=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -264,6 +266,7 @@ github.com/stretchr/objx v0.1.2-0.20180626195558-9e1dfc121bca/go.mod h1:HFkY916I
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
@@ -372,6 +375,7 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -419,6 +423,7 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

internal/cmd/scraper/scraper.go

@@ -101,8 +101,6 @@ func validateConfig(cfg *Config) error {
 
 // RunWithEmitters runs the scraper with preselected emitters.
 func RunWithEmitters(cfg *Config, emitters []integration.Emitter) error {
-	logrus.Infof("Starting New Relic's Prometheus OpenMetrics Integration version %s", integration.Version)
-	logrus.Debugf("Config: %#v", cfg)
 
 	if len(emitters) == 0 {
 		return fmt.Errorf("you need to configure at least one valid emitter")
@@ -174,9 +172,6 @@ func RunWithEmitters(cfg *Config, emitters []integration.Emitter) error {
 
 // RunOnceWithEmitters runs the scraper with preselected emitters once.
 func RunOnceWithEmitters(cfg *Config, emitters []integration.Emitter) error {
-	logrus.Infof("Starting New Relic's Prometheus OpenMetrics Integration version %s", integration.Version)
-	logrus.Debugf("Config: %#v", cfg)
-
 	if len(emitters) == 0 {
 		return fmt.Errorf("you need to configure at least one valid emitter")
 	}
@@ -221,23 +216,7 @@ func RunOnceWithEmitters(cfg *Config, emitters []integration.Emitter) error {
 	return nil
 }
 
-// RunOnce runs the scraper only once
-func RunOnce(cfg *Config) error {
-	err := validateConfig(cfg)
-	if err != nil {
-		return fmt.Errorf("while getting configuration options: %w", err)
-	}
-	if cfg.Verbose {
-		logrus.SetLevel(logrus.DebugLevel)
-	}
-	var emitters []integration.Emitter
-	//todo Implement an actual emitter we are currently ignoring cfg.Emitters
-	emitters = append(emitters, integration.NewStdoutEmitter())
-
-	return RunOnceWithEmitters(cfg, emitters)
-}
-
-// Run runs the scraper
+// Run runs the scraper. If Standalone=true it keeps running otherwise runs once and exits
 func Run(cfg *Config) error {
 	err := validateConfig(cfg)
 	if err != nil {
@@ -313,11 +292,21 @@ func Run(cfg *Config) error {
 				return errors.Wrap(err, "could not create new TelemetryEmitter")
 			}
 			emitters = append(emitters, emitter)
+		case "infra-sdk":
+			emitter, _ := integration.NewInfraSdkEmitter()
+			emitters = append(emitters, emitter)
 		default:
 			logrus.Debugf("unknown emitter: %s", e)
 			continue
 		}
 	}
 
-	return RunWithEmitters(cfg, emitters)
+	if cfg.Standalone {
+		logrus.Info("Running in standalone mode...")
+		err = RunWithEmitters(cfg, emitters)
+	} else {
+		logrus.Info("Running in run-once mode...")
+		err = RunOnceWithEmitters(cfg, emitters)
+	}
+	return err
 }

internal/cmd/scraper/scraper_test.go

@@ -115,11 +115,10 @@ func TestRunIntegrationOnce(t *testing.T) {
 		Verbose:        true,
 		ScrapeDuration: "500ms",
 	}
-	err = RunOnce(c)
+	err = Run(c)
 	require.NoError(t, err)
 	require.Equal(t, 2, counter, "the scraper should have hit the mock exactly twice")
 
-	//todo once the emitter works properly we should test that the scraped data is the expected one
 }
 
 func TestScrapingAnsweringWithError(t *testing.T) {
@@ -144,7 +143,7 @@ func TestScrapingAnsweringWithError(t *testing.T) {
 		Verbose:        true,
 		ScrapeDuration: "500ms",
 	}
-	err := RunOnce(c)
+	err := Run(c)
 	// Currently no error is returned in case a scraper does not return any data / err status code
 	require.NoError(t, err)
 	require.Equal(t, 2, counter, "the scraper should have hit the mock exactly twice")
@@ -173,7 +172,7 @@ func TestScrapingAnsweringUnexpectedData(t *testing.T) {
 		Verbose:        true,
 		ScrapeDuration: "500ms",
 	}
-	err := RunOnce(c)
+	err := Run(c)
 	// Currently no error is returned in case a scraper does not return any data / err status code
 	require.NoError(t, err)
 	require.Equal(t, 2, counter, "the scraper should have hit the mock exactly twice")
@@ -194,8 +193,11 @@ func TestScrapingNotAnswering(t *testing.T) {
 		ScrapeDuration: "500ms",
 		ScrapeTimeout:  time.Duration(500) * time.Millisecond,
 	}
-	err := RunOnce(c)
-	// Currently no error is returned in case a scraper does not return any data / err status code
+
+	// when
+	err := Run(c)
+
+	//then
 	require.NoError(t, err)
 
 }