From ec1566187a492d2f0d524acbea079f2281c5fc67 Mon Sep 17 00:00:00 2001
From: Joe Kralicky <joekralicky@gmail.com>
Date: Fri, 20 Dec 2024 03:41:09 +0000
Subject: [PATCH] linter pass

---
 internal/telemetry/trace/util.go           |  2 +-
 internal/testenv/selftests/tracing_test.go |  6 ++--
 internal/testutil/tracing.go               | 34 +++++++++++-----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/internal/telemetry/trace/util.go b/internal/telemetry/trace/util.go
index 47da3bf7b..9f62beb85 100644
--- a/internal/telemetry/trace/util.go
+++ b/internal/telemetry/trace/util.go
@@ -43,7 +43,7 @@ func ParseTraceparent(traceparent string) (oteltrace.SpanContext, error) {
 	return oteltrace.NewSpanContext(oteltrace.SpanContextConfig{
 		TraceID:    traceID,
 		SpanID:     spanID,
-		TraceFlags: oteltrace.TraceFlags(traceFlags),
+		TraceFlags: traceFlags,
 	}), nil
 }
 
diff --git a/internal/testenv/selftests/tracing_test.go b/internal/testenv/selftests/tracing_test.go
index 16055c75d..bed938326 100644
--- a/internal/testenv/selftests/tracing_test.go
+++ b/internal/testenv/selftests/tracing_test.go
@@ -155,9 +155,9 @@ func TestSampling(t *testing.T) {
 
 	handler := func(w http.ResponseWriter, req *http.Request) {
 		span := oteltrace.SpanFromContext(req.Context())
-		spanId := span.SpanContext().SpanID().String()
-		traceId := span.SpanContext().TraceID().String()
-		_, _ = spanId, traceId
+		spanID := span.SpanContext().SpanID().String()
+		traceID := span.SpanContext().TraceID().String()
+		_, _ = spanID, traceID
 		flags := span.SpanContext().TraceFlags()
 		path := req.URL.Path
 		if flags.IsSampled() {
diff --git a/internal/testutil/tracing.go b/internal/testutil/tracing.go
index e8e480c2b..00afe7dba 100644
--- a/internal/testutil/tracing.go
+++ b/internal/testutil/tracing.go
@@ -42,32 +42,32 @@ type TraceDetails struct {
 }
 
 func (td *TraceDetails) SpanTree() *SpanTree {
-	nodesById := map[oteltrace.SpanID]*SpanTreeNode{}
-	nodesById[oteltrace.SpanID([8]byte{})] = &SpanTreeNode{} // root node
+	nodesByID := map[oteltrace.SpanID]*SpanTreeNode{}
+	nodesByID[oteltrace.SpanID([8]byte{})] = &SpanTreeNode{} // root node
 	for _, span := range td.Spans {
-		spanId, _ := trace.ToSpanID(span.Raw.SpanId)
-		nodesById[spanId] = &SpanTreeNode{
+		spanID, _ := trace.ToSpanID(span.Raw.SpanId)
+		nodesByID[spanID] = &SpanTreeNode{
 			Span: span,
 		}
 	}
 	detachedNodesById := map[oteltrace.SpanID]*SpanTreeNode{}
 	for _, span := range td.Spans {
-		spanId, _ := trace.ToSpanID(span.Raw.SpanId)
-		parentSpanId, _ := trace.ToSpanID(span.Raw.ParentSpanId)
-		if _, ok := nodesById[parentSpanId]; !ok {
-			detachedNodesById[parentSpanId] = &SpanTreeNode{}
-			nodesById[parentSpanId] = detachedNodesById[parentSpanId]
+		spanID, _ := trace.ToSpanID(span.Raw.SpanId)
+		parentSpanID, _ := trace.ToSpanID(span.Raw.ParentSpanId)
+		if _, ok := nodesByID[parentSpanID]; !ok {
+			detachedNodesById[parentSpanID] = &SpanTreeNode{}
+			nodesByID[parentSpanID] = detachedNodesById[parentSpanID]
 		}
-		nodesById[spanId].Parent = nodesById[parentSpanId]
-		nodesById[parentSpanId].Children = append(nodesById[parentSpanId].Children, nodesById[spanId])
+		nodesByID[spanID].Parent = nodesByID[parentSpanID]
+		nodesByID[parentSpanID].Children = append(nodesByID[parentSpanID].Children, nodesByID[spanID])
 	}
-	for _, node := range nodesById {
+	for _, node := range nodesByID {
 		slices.SortFunc(node.Children, func(a, b *SpanTreeNode) int {
 			return cmp.Compare(a.Span.Raw.StartTimeUnixNano, b.Span.Raw.StartTimeUnixNano)
 		})
 	}
 	return &SpanTree{
-		Root:            nodesById[oteltrace.SpanID([8]byte{})],
+		Root:            nodesByID[oteltrace.SpanID([8]byte{})],
 		DetachedParents: detachedNodesById,
 	}
 }
@@ -106,15 +106,15 @@ func (tr *TraceResults) computeTraces() *Traces {
 		for _, scopeSpans := range resSpan.ScopeSpans {
 			scope := scopeSpans.Scope
 			for _, span := range scopeSpans.Spans {
-				traceId, _ := trace.ToTraceID(span.TraceId)
+				traceID, _ := trace.ToTraceID(span.TraceId)
 				var details *TraceDetails
-				if d, ok := tracesById[traceId]; ok {
+				if d, ok := tracesById[traceID]; ok {
 					details = d
 				} else {
 					details = &TraceDetails{
-						ID: traceId,
+						ID: traceID,
 					}
-					tracesById[traceId] = details
+					tracesById[traceID] = details
 				}
 				svc := ""
 				for _, attr := range resource.Attributes {