From fbb3d4f8fc8566753f779db799c5f17ab8c0e01f Mon Sep 17 00:00:00 2001 From: Mahad Zaryab Date: Wed, 25 Dec 2024 10:35:34 -0500 Subject: [PATCH 1/3] Fix Incorrect Package Usage Signed-off-by: Mahad Zaryab --- internal/jptrace/aggregator.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/jptrace/aggregator.go b/internal/jptrace/aggregator.go index fa8cde63646..f8c4b5c12d8 100644 --- a/internal/jptrace/aggregator.go +++ b/internal/jptrace/aggregator.go @@ -4,10 +4,10 @@ package jptrace import ( - "iter" - "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" + + "github.com/jaegertracing/jaeger/pkg/iter" ) // AggregateTraces aggregates a sequence of trace batches into individual traces. From 0fdb1d957156a1e64dd50a4d256c62391628aeac Mon Sep 17 00:00:00 2001 From: Mahad Zaryab Date: Wed, 25 Dec 2024 10:35:46 -0500 Subject: [PATCH 2/3] Add Linter Rule Signed-off-by: Mahad Zaryab --- .golangci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.golangci.yml b/.golangci.yml index bf9ff03b876..c755a30d4fa 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -146,6 +146,14 @@ linters-settings: files: - "!**/jptrace/**" + # TODO: remove once we have upgraded to Go 1.233 + disallow-iter: + deny: + - pkg: iter + desc: "Use github.com/jaegertracing/jaeger/pkg/iter" + files: + - "**" + goimports: local-prefixes: github.com/jaegertracing/jaeger gosec: From 95abcef85cb29b10f653f411ed2d04e3358ae64f Mon Sep 17 00:00:00 2001 From: Mahad Zaryab Date: Wed, 25 Dec 2024 10:53:32 -0500 Subject: [PATCH 3/3] Fix Typo Signed-off-by: Mahad Zaryab --- .golangci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index c755a30d4fa..97170f1338a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -146,7 +146,7 @@ linters-settings: files: - "!**/jptrace/**" - # TODO: remove once we have upgraded to Go 1.233 + # TODO: remove once we have upgraded to Go 1.23 disallow-iter: deny: - pkg: iter