Ensure consistency between package names for all receivers (#407)

Author: Bogdan Drutu

cmd/ocagent/main.go

@@ -37,11 +37,11 @@ import (
 	"github.com/census-instrumentation/opencensus-service/internal/config"
 	"github.com/census-instrumentation/opencensus-service/internal/config/viperutils"
 	"github.com/census-instrumentation/opencensus-service/receiver"
-	"github.com/census-instrumentation/opencensus-service/receiver/jaeger"
-	"github.com/census-instrumentation/opencensus-service/receiver/opencensus"
-	promreceiver "github.com/census-instrumentation/opencensus-service/receiver/prometheus"
-	"github.com/census-instrumentation/opencensus-service/receiver/zipkin"
-	"github.com/census-instrumentation/opencensus-service/receiver/zipkin/scribe"
+	"github.com/census-instrumentation/opencensus-service/receiver/jaegerreceiver"
+	"github.com/census-instrumentation/opencensus-service/receiver/opencensusreceiver"
+	"github.com/census-instrumentation/opencensus-service/receiver/prometheusreceiver"
+	"github.com/census-instrumentation/opencensus-service/receiver/zipkinreceiver"
+	"github.com/census-instrumentation/opencensus-service/receiver/zipkinreceiver/scribe"
 )
 
 var configYAMLFile string
@@ -192,7 +192,7 @@ func runZPages(port int) func() error {
 func runOCReceiver(acfg *config.Config, sr receiver.TraceReceiverSink, mr receiver.MetricsReceiverSink) (doneFn func() error, err error) {
 	addr := acfg.OpenCensusReceiverAddress()
 	corsOrigins := acfg.OpenCensusReceiverCorsAllowedOrigins()
-	ocr, err := opencensus.New(addr, opencensus.WithCorsOrigins(corsOrigins))
+	ocr, err := opencensusreceiver.New(addr, opencensusreceiver.WithCorsOrigins(corsOrigins))
 	if err != nil {
 		return nil, fmt.Errorf("Failed to create the OpenCensus receiver on address %q: error %v", addr, err)
 	}
@@ -232,7 +232,7 @@ func runOCReceiver(acfg *config.Config, sr receiver.TraceReceiverSink, mr receiv
 }
 
 func runJaegerReceiver(collectorThriftPort, collectorHTTPPort int, sr receiver.TraceReceiverSink) (doneFn func() error, err error) {
-	jtr, err := jaeger.New(context.Background(), &jaeger.Configuration{
+	jtr, err := jaegerreceiver.New(context.Background(), &jaegerreceiver.Configuration{
 		CollectorThriftPort: collectorThriftPort,
 		CollectorHTTPPort:   collectorHTTPPort,
 
@@ -285,8 +285,8 @@ func runZipkinScribeReceiver(config *config.ScribeReceiverConfig, sr receiver.Tr
 	return doneFn, nil
 }
 
-func runPrometheusReceiver(promConfig *promreceiver.Configuration, mr receiver.MetricsReceiverSink) (doneFn func() error, err error) {
-	pmr, err := promreceiver.New(promConfig)
+func runPrometheusReceiver(promConfig *prometheusreceiver.Configuration, mr receiver.MetricsReceiverSink) (doneFn func() error, err error) {
+	pmr, err := prometheusreceiver.New(promConfig)
 	if err != nil {
 		return nil, err
 	}

cmd/occollector/app/collector/receivers.go

@@ -22,11 +22,11 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder"
-	"github.com/census-instrumentation/opencensus-service/internal/collector/jaeger"
-	"github.com/census-instrumentation/opencensus-service/internal/collector/opencensus"
+	jaegerreceiver "github.com/census-instrumentation/opencensus-service/internal/collector/jaeger"
+	ocreceiver "github.com/census-instrumentation/opencensus-service/internal/collector/opencensus"
 	"github.com/census-instrumentation/opencensus-service/internal/collector/processor"
-	"github.com/census-instrumentation/opencensus-service/internal/collector/zipkin"
-	"github.com/census-instrumentation/opencensus-service/internal/collector/zipkin/scribe"
+	zipkinreceiver "github.com/census-instrumentation/opencensus-service/internal/collector/zipkin"
+	zipkinscribereceiver "github.com/census-instrumentation/opencensus-service/internal/collector/zipkin/scribe"
 	"github.com/census-instrumentation/opencensus-service/receiver"
 )
 

exporter/exporterparser/zipkin_test.go

@@ -35,7 +35,7 @@ import (
 	"github.com/census-instrumentation/opencensus-service/exporter"
 	"github.com/census-instrumentation/opencensus-service/internal/config/viperutils"
 	"github.com/census-instrumentation/opencensus-service/internal/testutils"
-	"github.com/census-instrumentation/opencensus-service/receiver/zipkin"
+	"github.com/census-instrumentation/opencensus-service/receiver/zipkinreceiver"
 )
 
 func TestZipkinEndpointFromNode(t *testing.T) {

internal/collector/jaeger/receiver.go

@@ -31,7 +31,7 @@ import (
 	"github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder"
 	"github.com/census-instrumentation/opencensus-service/internal/collector/processor"
 	"github.com/census-instrumentation/opencensus-service/receiver"
-	"github.com/census-instrumentation/opencensus-service/receiver/jaeger"
+	"github.com/census-instrumentation/opencensus-service/receiver/jaegerreceiver"
 )
 
 // Start starts the Jaeger receiver endpoint.
@@ -42,7 +42,7 @@ func Start(logger *zap.Logger, v *viper.Viper, spanProc processor.SpanProcessor)
 	}
 
 	ctx := context.Background()
-	jtr, err := jaeger.New(ctx, &jaeger.Configuration{
+	jtr, err := jaegerreceiver.New(ctx, &jaegerreceiver.Configuration{
 		CollectorThriftPort: rOpts.ThriftTChannelPort,
 		CollectorHTTPPort:   rOpts.ThriftHTTPPort,
 	})

internal/collector/opencensus/receiver.go

@@ -27,7 +27,7 @@ import (
 	"github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder"
 	"github.com/census-instrumentation/opencensus-service/internal/collector/processor"
 	"github.com/census-instrumentation/opencensus-service/receiver"
-	"github.com/census-instrumentation/opencensus-service/receiver/opencensus"
+	"github.com/census-instrumentation/opencensus-service/receiver/opencensusreceiver"
 )
 
 // Start starts the OpenCensus receiver endpoint.
@@ -39,7 +39,7 @@ func Start(logger *zap.Logger, v *viper.Viper, spanProc processor.SpanProcessor)
 
 	addr := ":" + strconv.FormatInt(int64(rOpts.Port), 10)
 
-	ocr, err := opencensus.New(addr)
+	ocr, err := opencensusreceiver.New(addr)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to create the OpenCensus trace receiver: %v", err)
 	}

internal/collector/zipkin/receiver.go

@@ -27,7 +27,7 @@ import (
 	"github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder"
 	"github.com/census-instrumentation/opencensus-service/internal/collector/processor"
 	"github.com/census-instrumentation/opencensus-service/receiver"
-	zr "github.com/census-instrumentation/opencensus-service/receiver/zipkin"
+	"github.com/census-instrumentation/opencensus-service/receiver/zipkinreceiver"
 )
 
 // Start starts the Zipkin receiver endpoint.
@@ -38,7 +38,7 @@ func Start(logger *zap.Logger, v *viper.Viper, spanProc processor.SpanProcessor)
 	}
 
 	addr := ":" + strconv.FormatInt(int64(rOpts.Port), 10)
-	zi, err := zr.New(addr)
+	zi, err := zipkinreceiver.New(addr)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to create the Zipkin receiver: %v", err)
 	}

internal/collector/zipkin/scribe/receiver.go

@@ -26,7 +26,7 @@ import (
 	"github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder"
 	"github.com/census-instrumentation/opencensus-service/internal/collector/processor"
 	"github.com/census-instrumentation/opencensus-service/receiver"
-	"github.com/census-instrumentation/opencensus-service/receiver/zipkin/scribe"
+	"github.com/census-instrumentation/opencensus-service/receiver/zipkinreceiver/scribe"
 )
 
 // Start starts the Zipkin Scribe receiver endpoint.

internal/config/config.go

@@ -27,7 +27,7 @@ import (
 
 	"github.com/census-instrumentation/opencensus-service/exporter"
 	"github.com/census-instrumentation/opencensus-service/exporter/exporterparser"
-	promreceiver "github.com/census-instrumentation/opencensus-service/receiver/prometheus"
+	"github.com/census-instrumentation/opencensus-service/receiver/prometheusreceiver"
 )
 
 // We expect the configuration.yaml file to look like this:
@@ -100,7 +100,7 @@ type Receivers struct {
 	//
 	//          static_configs:
 	//              - targets: ['localhost:9988']
-	Prometheus *promreceiver.Configuration `yaml:"prometheus"`
+	Prometheus *prometheusreceiver.Configuration `yaml:"prometheus"`
 }
 
 // ReceiverConfig is the per-receiver configuration that identifies attributes
@@ -256,7 +256,7 @@ func (c *Config) PrometheusReceiverEnabled() bool {
 
 // PrometheusConfiguration deferences and returns the Prometheus configuration
 // if non-nil.
-func (c *Config) PrometheusConfiguration() *promreceiver.Configuration {
+func (c *Config) PrometheusConfiguration() *prometheusreceiver.Configuration {
 	if c == nil || c.Receivers == nil {
 		return nil
 	}

receiver/end_to_end_test.go

@@ -25,14 +25,14 @@ import (
 
 	"github.com/census-instrumentation/opencensus-service/data"
 	"github.com/census-instrumentation/opencensus-service/receiver"
-	"github.com/census-instrumentation/opencensus-service/receiver/opencensus"
+	"github.com/census-instrumentation/opencensus-service/receiver/opencensusreceiver"
 )
 
 func Example_endToEnd() {
 	// This is what the cmd/ocagent code would look like this.
 	// A trace receiver as per the trace receiver
 	// configs that have been parsed.
-	tr, err := opencensus.New("localhost:55678")
+	tr, err := opencensusreceiver.New("localhost:55678")
 	if err != nil {
 		log.Fatalf("Failed to create trace receiver: %v", err)
 	}

receiver/jaeger/jaeger_agent_test.go …iver/jaegerreceiver/jaeger_agent_test.goreceiver/jaeger/jaeger_agent_test.go renamed to receiver/jaegerreceiver/jaeger_agent_test.go receiver/jaeger/jaeger_agent_test.go renamed to receiver/jaegerreceiver/jaeger_agent_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package jaeger_test
+package jaegerreceiver
 
 import (
 	"bytes"
@@ -29,14 +29,13 @@ import (
 	agenttracepb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1"
 	tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
 	"github.com/census-instrumentation/opencensus-service/internal"
-	jaegerreceiver "github.com/census-instrumentation/opencensus-service/receiver/jaeger"
 	"github.com/census-instrumentation/opencensus-service/receiver/testhelper"
 )
 
 func TestJaegerAgentUDP_ThriftCompact_6831(t *testing.T) {
 	port := 6831
 	addrForClient := fmt.Sprintf(":%d", port)
-	testJaegerAgent(t, addrForClient, &jaegerreceiver.Configuration{
+	testJaegerAgent(t, addrForClient, &Configuration{
 		AgentCompactThriftPort: port,
 	})
 }
@@ -46,14 +45,14 @@ func TestJaegerAgentUDP_ThriftBinary_6832(t *testing.T) {
 
 	port := 6832
 	addrForClient := fmt.Sprintf(":%d", port)
-	testJaegerAgent(t, addrForClient, &jaegerreceiver.Configuration{
+	testJaegerAgent(t, addrForClient, &Configuration{
 		AgentBinaryThriftPort: port,
 	})
 }
 
-func testJaegerAgent(t *testing.T, agentEndpoint string, receiverConfig *jaegerreceiver.Configuration) {
+func testJaegerAgent(t *testing.T, agentEndpoint string, receiverConfig *Configuration) {
 	// 1. Create the Jaeger receiver aka "server"
-	jr, err := jaegerreceiver.New(context.Background(), receiverConfig)
+	jr, err := New(context.Background(), receiverConfig)
 	if err != nil {
 		t.Fatalf("Failed to create new Jaeger Receiver: %v", err)
 	}