Add OTLP ingest

config/config.go

@@ -25,6 +25,10 @@ type Config interface {
 	// peer traffic
 	GetPeerListenAddr() (string, error)
 
+	// GetGRPCListenAddr returns the address and port on which to listen for
+	// incoming events over gRPC
+	GetGRPCListenAddr() (string, error)
+
 	// GetAPIKeys returns a list of Honeycomb API keys
 	GetAPIKeys() ([]string, error)
 

config/config_test.go

@@ -57,6 +57,7 @@ func TestReload(t *testing.T) {
 
 	dummy := []byte(`
 	ListenAddr="0.0.0.0:8080"
+	GRPCListenAddr="0.0.0.0:9090"
 
 	[InMemCollector]
 		CacheCapacity=1000
@@ -81,6 +82,9 @@ func TestReload(t *testing.T) {
 	if d, _ := c.GetListenAddr(); d != "0.0.0.0:8080" {
 		t.Error("received", d, "expected", "0.0.0.0:8080")
 	}
+	if d, _ := c.GetGRPCListenAddr(); d != "0.0.0.0:9090" {
+		t.Error("received", d, "expected", "0.0.0.0:9090")
+	}
 
 	wg := &sync.WaitGroup{}
 
@@ -118,6 +122,8 @@ func TestReload(t *testing.T) {
 
 	if file, err := os.OpenFile(configFile.Name(), os.O_RDWR, 0644); err == nil {
 		file.WriteString(`ListenAddr = "0.0.0.0:9000"`)
+		file.WriteString("\n")
+		file.WriteString(`GRPCListenAddr = "0.0.0.0:1010"`)
 		file.Close()
 	}
 
@@ -126,7 +132,9 @@ func TestReload(t *testing.T) {
 	if d, _ := c.GetListenAddr(); d != "0.0.0.0:9000" {
 		t.Error("received", d, "expected", "0.0.0.0:9000")
 	}
-
+	if d, _ := c.GetGRPCListenAddr(); d != "0.0.0.0:1010" {
+		t.Error("received", d, "expected", "0.0.0.0:1010")
+	}
 }
 
 func TestReadDefaults(t *testing.T) {

config/file_config.go

@@ -53,8 +53,9 @@ func (r *RulesBasedSamplerConfig) String() string {
 }
 
 type configContents struct {
-	ListenAddr         string        `validate:"required"`
-	PeerListenAddr     string        `validate:"required"`
+	ListenAddr         string `validate:"required"`
+	PeerListenAddr     string `validate:"required"`
+	GRPCListenAddr     string
 	APIKeys            []string      `validate:"required"`
 	HoneycombAPI       string        `validate:"required,url"`
 	Logger             string        `validate:"required,oneof= logrus honeycomb"`
@@ -379,6 +380,20 @@ func (f *fileConfig) GetPeerListenAddr() (string, error) {
 	return f.conf.PeerListenAddr, nil
 }
 
+func (f *fileConfig) GetGRPCListenAddr() (string, error) {
+	f.mux.RLock()
+	defer f.mux.RUnlock()
+
+	// GRPC listen addr is optional, only check value is valid if not empty
+	if f.conf.GRPCListenAddr != "" {
+		_, _, err := net.SplitHostPort(f.conf.GRPCListenAddr)
+		if err != nil {
+			return "", err
+		}
+	}
+	return f.conf.GRPCListenAddr, nil
+}
+
 func (f *fileConfig) GetAPIKeys() ([]string, error) {
 	f.mux.RLock()
 	defer f.mux.RUnlock()

config/mock.go

@@ -22,6 +22,8 @@ type MockConfig struct {
 	GetListenAddrVal                     string
 	GetPeerListenAddrErr                 error
 	GetPeerListenAddrVal                 string
+	GetGRPCListenAddrErr                 error
+	GetGRPCListenAddrVal                 string
 	GetLoggerTypeErr                     error
 	GetLoggerTypeVal                     string
 	GetHoneycombLoggerConfigErr          error
@@ -114,6 +116,12 @@ func (m *MockConfig) GetPeerListenAddr() (string, error) {
 
 	return m.GetPeerListenAddrVal, m.GetPeerListenAddrErr
 }
+func (m *MockConfig) GetGRPCListenAddr() (string, error) {
+	m.Mux.RLock()
+	defer m.Mux.RUnlock()
+
+	return m.GetGRPCListenAddrVal, m.GetGRPCListenAddrErr
+}
 func (m *MockConfig) GetLoggerType() (string, error) {
 	m.Mux.RLock()
 	defer m.Mux.RUnlock()

go.mod

@@ -12,7 +12,10 @@ require (
 	github.com/garyburd/redigo v1.6.0
 	github.com/go-playground/universal-translator v0.17.0 // indirect
 	github.com/go-playground/validator v9.31.0+incompatible
+	github.com/gogo/protobuf v1.3.1
+	github.com/golang/protobuf v1.4.3
 	github.com/gorilla/mux v1.6.3-0.20190108142930-08e7f807d38d
+	github.com/grpc-ecosystem/grpc-gateway v1.12.1
 	github.com/hashicorp/golang-lru v0.5.1
 	github.com/honeycombio/dynsampler-go v0.2.1
 	github.com/honeycombio/libhoney-go v1.12.4
@@ -35,6 +38,7 @@ require (
 	github.com/vmihailenco/msgpack/v4 v4.3.11
 	golang.org/x/sys v0.0.0-20200722175500-76b94024e4b6 // indirect
 	golang.org/x/text v0.3.3 // indirect
+	google.golang.org/grpc v1.32.0
 	gopkg.in/alexcesaro/statsd.v2 v2.0.0
 	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
 	gopkg.in/ini.v1 v1.57.0 // indirect

internal/opentelemetry-proto-gen/README.md

@@ -0,0 +1,3 @@
+# OTLP Protobuf Definitions
+
+The definitions can be found [here](https://github.com/open-telemetry/opentelemetry-proto/tree/59c488bfb8fb6d0458ad6425758b70259ff4a2bd).