#4147 fixed errors reported by linters

Signed-off-by: Vladyslav Diachenko <[email protected]>

Author: vlad-diachenko

pkg/querier/tenantfederation/merge_queryable_test.go

@@ -9,7 +9,6 @@ import (
 	"testing"
 	"time"
 
-	sl "github.com/cortexproject/cortex/pkg/util/spanlogger"
 	"github.com/opentracing/opentracing-go"
 	"github.com/opentracing/opentracing-go/mocktracer"
 	"github.com/prometheus/common/model"
@@ -21,6 +20,7 @@ import (
 
 	"github.com/cortexproject/cortex/pkg/querier/series"
 	"github.com/cortexproject/cortex/pkg/tenant"
+	sl "github.com/cortexproject/cortex/pkg/util/spanlogger"
 )
 
 const (
@@ -507,9 +507,9 @@ func TestTracingMergeQueryable(t *testing.T) {
 
 	require.NoError(t, seriesSet.Err())
 	spans := mockTracer.FinishedSpans()
-	assertSpanExist(t, spans, "mergeQuerier.select", map[string]string{sl.TenantIdTagName: "team-a|team-b"})
-	assertSpanExist(t, spans, "mockTenantQuerier.select", map[string]string{sl.TenantIdTagName: "team-a"})
-	assertSpanExist(t, spans, "mockTenantQuerier.select", map[string]string{sl.TenantIdTagName: "team-b"})
+	assertSpanExist(t, spans, "mergeQuerier.select", map[string]string{sl.TenantIDTagName: "team-a|team-b"})
+	assertSpanExist(t, spans, "mockTenantQuerier.select", map[string]string{sl.TenantIDTagName: "team-a"})
+	assertSpanExist(t, spans, "mockTenantQuerier.select", map[string]string{sl.TenantIDTagName: "team-b"})
 }
 
 func assertSpanExist(t *testing.T,

pkg/util/spanlogger/spanlogger.go

@@ -8,15 +8,15 @@ import (
 	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/opentracing/opentracing-go/ext"
 	otlog "github.com/opentracing/opentracing-go/log"
-	"github.com/weaveworks/common/user"
 
+	"github.com/cortexproject/cortex/pkg/tenant"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
 )
 
 type loggerCtxMarker struct{}
 
 const (
-	TenantIdTagName = "tenant_id"
+	TenantIDTagName = "tenant_id"
 )
 
 var (
@@ -39,8 +39,8 @@ func New(ctx context.Context, method string, kvps ...interface{}) (*SpanLogger,
 // retrieved with FromContext or FromContextWithFallback.
 func NewWithLogger(ctx context.Context, l log.Logger, method string, kvps ...interface{}) (*SpanLogger, context.Context) {
 	span, ctx := opentracing.StartSpanFromContext(ctx, method)
-	if orgId, err := user.ExtractOrgID(ctx); err == nil {
-		span.SetTag(TenantIdTagName, orgId)
+	if ids, _ := tenant.TenantIDs(ctx); ids != nil {
+		span.SetTag(TenantIDTagName, tenant.JoinTenantIDs(ids))
 	}
 	logger := &SpanLogger{
 		Logger: log.With(util_log.WithContext(ctx, l), "method", method),

pkg/util/spanlogger/spanlogger_test.go

@@ -50,13 +50,13 @@ func TestSpanLogger_CustomLogger(t *testing.T) {
 func TestSpanCreatedWithTenantTag(t *testing.T) {
 	mockSpan := createSpan(user.InjectOrgID(context.Background(), "team-a"))
 
-	require.Equal(t, "team-a", mockSpan.Tag(TenantIdTagName))
+	require.Equal(t, "team-a", mockSpan.Tag(TenantIDTagName))
 }
 
 func TestSpanCreatedWithoutTenantTag(t *testing.T) {
 	mockSpan := createSpan(context.Background())
 
-	_, exist := mockSpan.Tags()[TenantIdTagName]
+	_, exist := mockSpan.Tags()[TenantIDTagName]
 	require.False(t, exist)
 }