Fix lint and run for all projects (open-telemetry#217)

Signed-off-by: Bogdan Drutu <[email protected]>

.circleci/config.yml

@@ -124,7 +124,10 @@ jobs:
  paths: go/bin
  - run:
  name: Lint
- command: make -j4 checklicense impi lint misspell
+ command: CMD="make lint" make -j4 for-all
+ - run:
+ name: Checks
+ command: make -j4 checklicense impi misspell
 
  build:
  executor: golang

.golangci.yml

@@ -75,7 +75,7 @@ linters-settings:
  goimports:
  # put imports beginning with prefix after 3rd-party packages;
  # it's a comma-separated list of prefixes
- local-prefixes: github.com/open-telemetry/opentelemetry-collector
+ local-prefixes: github.com/open-telemetry/opentelemetry-collector-contrib
  misspell:
  # Correct spellings using locale preferences for US or UK.
  # Default is to use a neutral variety of English.

Makefile

@@ -53,7 +53,6 @@ for-all:
  $${CMD} ); \
  done
 
-
 .PHONY: install-tools
 install-tools:
  go install github.com/client9/misspell/cmd/misspell

exporter/awsxrayexporter/conn.go

@@ -127,7 +127,8 @@ func GetAWSConfigSession(logger *zap.Logger, cn connAttr, cfg *Config) (*aws.Con
  awsRegion = cfg.Region
  logger.Debug("Fetch region from commandline/config file", zap.String("region", awsRegion))
  } else if !cfg.NoVerifySSL {
- es, err := getDefaultSession(logger)
+ var es *session.Session
+ es, err = getDefaultSession(logger)
  if err != nil {
  logger.Error("Unable to retrieve default session", zap.Error(err))
  } else {

exporter/azuremonitorexporter/factory.go

@@ -68,8 +68,8 @@ func (f *Factory) CreateTraceExporter(logger *zap.Logger, config configmodels.Ex
  return nil, errUnexpectedConfigurationType
  }
 
- transportChannel := f.getTransportChannel(exporterConfig, logger)
- return newTraceExporter(exporterConfig, transportChannel, logger)
+ tc := f.getTransportChannel(exporterConfig, logger)
+ return newTraceExporter(exporterConfig, tc, logger)
 }
 
 // CreateMetricsExporter creates a metrics exporter based on this config.

exporter/jaegerthrifthttpexporter/exporter.go

@@ -59,11 +59,9 @@ func New(
  client: &http.Client{Timeout: clientTimeout},
  }
 
- exp, err := exporterhelper.NewTraceExporterOld(
+ return exporterhelper.NewTraceExporterOld(
  config,
  s.pushTraceData)
-
- return exp, err
 }
 
 // jaegerThriftHTTPSender forwards spans encoded in the jaeger thrift

exporter/jaegerthrifthttpexporter/exporter_test.go

@@ -35,14 +35,14 @@ type args struct {
 }
 
 func TestNew(t *testing.T) {
- args := args{
+ ar := args{
  config: &configmodels.ExporterSettings{},
  httpAddress: testHTTPAddress,
  headers: map[string]string{"test": "test"},
  timeout: 10 * time.Nanosecond,
  }
 
- got, err := New(args.config, args.httpAddress, args.headers, args.timeout)
+ got, err := New(ar.config, ar.httpAddress, ar.headers, ar.timeout)
  assert.NoError(t, err)
  require.NotNil(t, got)
 
@@ -52,12 +52,12 @@ func TestNew(t *testing.T) {
 }
 
 func TestNewFailsWithEmptyExporterName(t *testing.T) {
- args := args{
+ ar := args{
  config: nil,
  httpAddress: testHTTPAddress,
  }
 
- got, err := New(args.config, args.httpAddress, args.headers, args.timeout)
+ got, err := New(ar.config, ar.httpAddress, ar.headers, ar.timeout)
  assert.EqualError(t, err, "nil config")
  assert.Nil(t, got)
 }

exporter/jaegerthrifthttpexporter/factory.go

@@ -73,16 +73,7 @@ func (f *Factory) CreateTraceExporter(
  return nil, err
  }
 
- exp, err := New(
- config,
- expCfg.URL,
- expCfg.Headers,
- expCfg.Timeout)
- if err != nil {
- return nil, err
- }
-
- return exp, nil
+ return New(config, expCfg.URL, expCfg.Headers, expCfg.Timeout)
 }
 
 // CreateMetricsExporter creates a metrics exporter based on this config.

receiver/carbonreceiver/protocol/path_parser_helper.go

@@ -58,9 +58,9 @@ type ParsedPath struct {
 type TargetMetricType string
 
 const (
- DefaultMetricType TargetMetricType = ""
- GaugeMetricType  = "gauge"
- CumulativeMetricType  = "cumulative"
+ DefaultMetricType = TargetMetricType("")
+ GaugeMetricType = TargetMetricType("gauge")
+ CumulativeMetricType = TargetMetricType("cumulative")
 )
 
 // PathParserHelper implements the common code to parse a Carbon line taking a

receiver/carbonreceiver/protocol/regex_parser_test.go

@@ -105,11 +105,11 @@ func Test_regexParser_parsePath(t *testing.T) {
  {
  Regexp: `(?P<key_svc>[^.]+)\.(?P<key_host>[^.]+)\.rpc\.count`,
  NamePrefix: "rpc",
- MetricType: CumulativeMetricType,
+ MetricType: string(CumulativeMetricType),
  },
  {
  Regexp: `^(?P<key_svc>[^.]+)\.(?P<key_host>[^.]+)\.(?P<name_0>[^.]+).(?P<name_1>[^.]+)$`,
- MetricType: GaugeMetricType,
+ MetricType: string(GaugeMetricType),
  },
  },
  }
@@ -214,7 +214,7 @@ func Benchmark_regexPathParser_ParsePath(b *testing.B) {
  {
  Regexp: `(?P<key_svc>[^.]+)\.(?P<key_host>[^.]+)\.rpc\.count`,
  NamePrefix: "rpc",
- MetricType: CumulativeMetricType,
+ MetricType: string(CumulativeMetricType),
  },
  {
  Regexp: `^(?P<key_svc>[^.]+)\.(?P<key_host>[^.]+)\.(?P<name_0>[^.]+).(?P<name_1>[^.]+)$`,

receiver/carbonreceiver/receiver.go

@@ -122,7 +122,8 @@ func (r *carbonReceiver) Start(_ context.Context, host component.Host) error {
  r.startOnce.Do(func() {
  err = nil
  go func() {
- if err := r.server.ListenAndServe(r.parser, r.nextConsumer, r.reporter); err != nil {
+ err = r.server.ListenAndServe(r.parser, r.nextConsumer, r.reporter)
+ if err != nil {
  host.ReportFatalError(err)
  }
  }()

receiver/carbonreceiver/transport/client/plaintext_client.go

@@ -74,26 +74,23 @@ func (g *Graphite) connect(transport Transport) error {
  }
 
  var err error
- var conn net.Conn
-
  switch transport {
  case TCP:
- conn, err = net.DialTimeout("tcp", address, g.Timeout)
+ g.Conn, err = net.DialTimeout("tcp", address, g.Timeout)
  case UDP:
- udpAddr, err := net.ResolveUDPAddr("udp", address)
+ var udpAddr *net.UDPAddr
+ udpAddr, err = net.ResolveUDPAddr("udp", address)
  if err != nil {
  return err
  }
- conn, err = net.DialUDP("udp", nil, udpAddr)
+ g.Conn, err = net.DialUDP("udp", nil, udpAddr)
  if err != nil {
  return err
  }
  default:
  return fmt.Errorf("unknown transport %d", transport)
  }
 
- g.Conn = conn
-
  return err
 }
 

receiver/carbonreceiver/transport/server_test.go

@@ -78,8 +78,7 @@ func Test_Server_ListenAndServe(t *testing.T) {
  wgListenAndServe.Add(1)
  go func() {
  defer wgListenAndServe.Done()
- err := svr.ListenAndServe(p, mc, mr)
- assert.Error(t, err)
+ assert.Error(t, svr.ListenAndServe(p, mc, mr))
  }()
 
  runtime.Gosched()

receiver/carbonreceiver/transport/tcp_server.go

@@ -177,7 +177,8 @@ func (t *tcpServer) handleConnection(
  line := strings.TrimSpace(string(bytes))
  if line != "" {
  numReceivedTimeSeries++
- metric, err := p.Parse(line)
+ var metric *metricspb.Metric
+ metric, err = p.Parse(line)
  if err != nil {
  numInvalidTimeSeries++
  t.reporter.OnTranslationError(ctx, err)

receiver/jaegerlegacyreceiver/trace_receiver.go

@@ -15,9 +15,7 @@
 package jaegerlegacyreceiver
 
 import (
- "bytes"
  "context"
- "errors"
  "fmt"
  "net"
  "sync"
@@ -139,22 +137,11 @@ func (jr *jReceiver) Shutdown(context.Context) error {
 func (jr *jReceiver) stopTraceReceptionLocked() error {
  var err = componenterror.ErrAlreadyStopped
  jr.stopOnce.Do(func() {
- var errs []error
-
+ err = nil
  if jr.tchanServer.tchannel != nil {
  jr.tchanServer.tchannel.Close()
  jr.tchanServer.tchannel = nil
  }
- if len(errs) == 0 {
- err = nil
- return
- }
- // Otherwise combine all these errors
- buf := new(bytes.Buffer)
- for _, err := range errs {
- fmt.Fprintf(buf, "%s\n", err.Error())
- }
- err = errors.New(buf.String())
  })
 
  return err

receiver/k8sclusterreceiver/collection/namespaces.go

@@ -24,9 +24,7 @@ import (
 )
 
 func getMetricsForNamespace(ns *corev1.Namespace) []*resourceMetrics {
- metrics := make([]*metricspb.Metric, 0)
-
- metrics = []*metricspb.Metric{
+ metrics := []*metricspb.Metric{
  {
  MetricDescriptor: &metricspb.MetricDescriptor{
  Name: "kubernetes/namespace/phase",

receiver/k8sclusterreceiver/receiver.go

@@ -56,12 +56,12 @@ func (kr *kubernetesReceiver) Start(ctx context.Context, host component.Host) er
  for {
  select {
  case <-ticker.C:
- c := obsreport.StartMetricsReceiveOp(ctx, dataformat, transport)
+ c2 := obsreport.StartMetricsReceiveOp(ctx, dataformat, transport)
 
- numTimeseries, numPoints, errs := kr.dispatchMetricData(c)
+ numTimeseries, numPoints, errs := kr.dispatchMetricData(c2)
  err := componenterror.CombineErrors(errs)
 
- obsreport.EndMetricsReceiveOp(c, dataformat, numPoints, numTimeseries, err)
+ obsreport.EndMetricsReceiveOp(c2, dataformat, numPoints, numTimeseries, err)
  case <-c.Done():
  return
  }

receiver/receivercreator/factory.go

@@ -66,7 +66,7 @@ func (f *Factory) CustomUnmarshaler() component.CustomUnmarshaler {
  }
 
  // Unmarshals receiver_creator configuration like rule.
- if err := receiversCfg.UnmarshalKey(subreceiverKey, &subreceiver); err != nil {
+ if err = receiversCfg.UnmarshalKey(subreceiverKey, &subreceiver); err != nil {
  return fmt.Errorf("failed to deserialize sub-receiver %q: %s", subreceiverKey, err)
  }
 

receiver/redisreceiver/receiver.go

@@ -46,11 +46,11 @@ func newRedisReceiver(
 
 // Set up and kick off the interval runner.
 func (r *redisReceiver) Start(ctx context.Context, host component.Host) error {
- client := newRedisClient(&redis.Options{
+ c := newRedisClient(&redis.Options{
  Addr: r.config.Endpoint,
  Password: r.config.Password,
  })
- redisRunnable := newRedisRunnable(ctx, client, r.config.ServiceName, r.consumer, r.logger)
+ redisRunnable := newRedisRunnable(ctx, c, r.config.ServiceName, r.consumer, r.logger)
  r.intervalRunner = interval.NewRunner(r.config.CollectionInterval, redisRunnable)
 
  go func() {

receiver/redisreceiver/redis_runnable.go

@@ -68,19 +68,19 @@ func (r *redisRunnable) Setup() error {
 // keyspace lines returned by Redis. There should be one keyspace line per
 // active Redis database, of which there can be 16.
 func (r *redisRunnable) Run() error {
- const dataformat = "redis"
+ const dataFormat = "redis"
  const transport = "http" // todo verify this
- ctx := obsreport.StartMetricsReceiveOp(r.ctx, dataformat, transport)
+ ctx := obsreport.StartMetricsReceiveOp(r.ctx, dataFormat, transport)
 
- info, err := r.redisSvc.info()
+ inf, err := r.redisSvc.info()
  if err != nil {
- obsreport.EndMetricsReceiveOp(ctx, dataformat, 0, 0, err)
+ obsreport.EndMetricsReceiveOp(ctx, dataFormat, 0, 0, err)
  return nil
  }
 
- uptime, err := info.getUptimeInSeconds()
+ uptime, err := inf.getUptimeInSeconds()
  if err != nil {
- obsreport.EndMetricsReceiveOp(ctx, dataformat, 0, 0, err)
+ obsreport.EndMetricsReceiveOp(ctx, dataFormat, 0, 0, err)
  return nil
  }
 
@@ -90,15 +90,15 @@ func (r *redisRunnable) Run() error {
  r.timeBundle.update(time.Now(), uptime)
  }
 
- metrics, warnings := info.buildFixedProtoMetrics(r.redisMetrics, r.timeBundle)
+ metrics, warnings := inf.buildFixedProtoMetrics(r.redisMetrics, r.timeBundle)
  if warnings != nil {
  r.logger.Warn(
  "errors parsing redis string",
  zap.Errors("parsing errors", warnings),
  )
  }
 
- keyspaceMetrics, warnings := info.buildKeyspaceProtoMetrics(r.timeBundle)
+ keyspaceMetrics, warnings := inf.buildKeyspaceProtoMetrics(r.timeBundle)
  metrics = append(metrics, keyspaceMetrics...)
  if warnings != nil {
  r.logger.Warn(
@@ -111,7 +111,7 @@ func (r *redisRunnable) Run() error {
 
  err = r.metricsConsumer.ConsumeMetricsData(r.ctx, *md)
  numTimeSeries, numPoints := obsreport.CountMetricPoints(*md)
- obsreport.EndMetricsReceiveOp(ctx, dataformat, numPoints, numTimeSeries, err)
+ obsreport.EndMetricsReceiveOp(ctx, dataFormat, numPoints, numTimeSeries, err)
 
  return nil
 }

receiver/sapmreceiver/trace_receiver.go

@@ -36,10 +36,6 @@ import (
  "go.uber.org/zap"
 )
 
-const (
- traceSource string = "sapm"
-)
-
 var gzipWriterPool = &sync.Pool{
  New: func() interface{} {
  return gzip.NewWriter(ioutil.Discard)
@@ -106,7 +102,7 @@ func (sr *sapmReceiver) HTTPHandlerFunc(rw http.ResponseWriter, req *http.Reques
  // build the response message
  // NOTE currently the response is an empty struct. As an optimization this receiver will pass a
  // byte array that was generated in the receiver's constructor. If this receiver needs to return
- // more than an empty struct, then the sapm.PostSpansResponse{} struct will need to be marshalled
+ // more than an empty struct, then the sapm.PostSpansResponse{} struct will need to be marshaled
  // and on error a http.StatusInternalServerError should be written to the http.ResponseWriter and
  // this function should immediately return.
  var respBytes = sr.defaultResponse

receiver/signalfxreceiver/receiver.go

@@ -112,9 +112,9 @@ func New(
  },
  }
 
- mux := mux.NewRouter()
- mux.HandleFunc("/v2/datapoint", r.handleReq)
- r.server.Handler = mux
+ mx := mux.NewRouter()
+ mx.HandleFunc("/v2/datapoint", r.handleReq)
+ r.server.Handler = mx
 
  return r, nil
 }
@@ -131,7 +131,7 @@ func (r *sfxReceiver) Start(_ context.Context, host component.Host) error {
  err = nil
 
  go func() {
- if err := r.server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+ if err = r.server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
  host.ReportFatalError(err)
  }
  }()
@@ -190,7 +190,7 @@ func (r *sfxReceiver) handleReq(resp http.ResponseWriter, req *http.Request) {
  }
 
  msg := &sfxpb.DataPointUploadMessage{}
- if err := proto.Unmarshal(body, msg); err != nil {
+ if err = proto.Unmarshal(body, msg); err != nil {
  r.failRequest(ctx, resp, http.StatusBadRequest, errUnmarshalBodyRespBody, err)
  return
  }