Enable Lint Rules: confusing-results & receiver-naming

.golangci.yml

@@ -210,15 +210,9 @@ linters-settings:
         # investigate, could be real bugs. But didn't recent Go version changed loop variables semantics?
         - name: range-val-address
           disabled: true
-        # enable after cleanup
-        - name: confusing-results
-          disabled: true
         # enable after cleanup: "tag on not-exported field"
         - name: struct-tag
           disabled: true
-        # enable after cleanup
-        - name: receiver-naming
-          disabled: true
         # this is idiocy, promotes less readable code. Don't enable.
         - name: var-declaration
           disabled: true

model/converter/thrift/zipkin/to_domain.go

@@ -198,9 +198,9 @@
 }
 
 // Get a correct start time to use for the span if it's not set directly
-func (td toDomain) getStartTimeAndDuration(zSpan *zipkincore.Span) (int64, int64) {
-	timestamp := zSpan.GetTimestamp()
-	duration := zSpan.GetDuration()
+func (td toDomain) getStartTimeAndDuration(zSpan *zipkincore.Span) (timestamp, duration int64) {
+	timestamp = zSpan.GetTimestamp()
+	duration = zSpan.GetDuration()
 	if timestamp == 0 {
 		cs := td.findAnnotation(zSpan, zipkincore.CLIENT_SEND)
 		sr := td.findAnnotation(zSpan, zipkincore.SERVER_RECV)

pkg/config/tlscfg/options.go

@@ -136,19 +136,19 @@ func (p Options) loadCertPool() (*x509.CertPool, error) {
 	return certPool, nil
 }
 
-func (o *Options) ToOtelClientConfig() configtls.ClientConfig {
+func (p *Options) ToOtelClientConfig() configtls.ClientConfig {
 	return configtls.ClientConfig{
-		Insecure:           !o.Enabled,
-		InsecureSkipVerify: o.SkipHostVerify,
-		ServerName:         o.ServerName,
+		Insecure:           !p.Enabled,
+		InsecureSkipVerify: p.SkipHostVerify,
+		ServerName:         p.ServerName,
 		Config: configtls.Config{
-			CAFile:         o.CAPath,
-			CertFile:       o.CertPath,
-			KeyFile:        o.KeyPath,
-			CipherSuites:   o.CipherSuites,
-			MinVersion:     o.MinVersion,
-			MaxVersion:     o.MaxVersion,
-			ReloadInterval: o.ReloadInterval,
+			CAFile:         p.CAPath,
+			CertFile:       p.CertPath,
+			KeyFile:        p.KeyPath,
+			CipherSuites:   p.CipherSuites,
+			MinVersion:     p.MinVersion,
+			MaxVersion:     p.MaxVersion,
+			ReloadInterval: p.ReloadInterval,
 		},
 	}
 }

plugin/storage/es/mappings/mapping.go

@@ -51,12 +51,12 @@ func (mb *MappingBuilder) GetMapping(mapping string) (string, error) {
 }
 
 // GetSpanServiceMappings returns span and service mappings
-func (mb *MappingBuilder) GetSpanServiceMappings() (string, string, error) {
-	spanMapping, err := mb.GetMapping("jaeger-span")
+func (mb *MappingBuilder) GetSpanServiceMappings() (spanMapping string, serviceMapping string, err error) {
+	spanMapping, err = mb.GetMapping("jaeger-span")
 	if err != nil {
 		return "", "", err
 	}
-	serviceMapping, err := mb.GetMapping("jaeger-service")
+	serviceMapping, err = mb.GetMapping("jaeger-service")
 	if err != nil {
 		return "", "", err
 	}