Use stdlib iterators

.golangci.yml

@@ -150,14 +150,6 @@ linters-settings:
         files:
           - "!**/v1adapter/**"
 
-      # TODO: remove once we have upgraded to Go 1.23
-      disallow-iter:
-        deny:
-         - pkg: iter
-           desc: "Use github.com/jaegertracing/jaeger/pkg/iter"
-        files:
-          - "**"
-
   goimports:
     local-prefixes: github.com/jaegertracing/jaeger
   gosec:

cmd/jaeger/internal/exporters/storageexporter/exporter_test.go

@@ -20,12 +20,12 @@ import (
 	"go.uber.org/zap/zaptest"
 
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
+	"github.com/jaegertracing/jaeger/internal/jiter"
 	"github.com/jaegertracing/jaeger/internal/storage/v1"
 	"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
 	factoryMocks "github.com/jaegertracing/jaeger/internal/storage/v1/mocks"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
 	tracestoreMocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore/mocks"
-	"github.com/jaegertracing/jaeger/pkg/iter"
 	"github.com/jaegertracing/jaeger/pkg/otelsemconv"
 )
 
@@ -152,7 +152,7 @@ func TestExporter(t *testing.T) {
 	getTracesIter := traceReader.GetTraces(ctx, tracestore.GetTraceParams{
 		TraceID: requiredTraceID,
 	})
-	requiredTrace, err := iter.FlattenWithErrors(getTracesIter)
+	requiredTrace, err := jiter.FlattenWithErrors(getTracesIter)
 	require.NoError(t, err)
 	resource := requiredTrace[0].ResourceSpans().At(0)
 	assert.Equal(t, spanID, resource.ScopeSpans().At(0).Spans().At(0).SpanID())

cmd/jaeger/internal/integration/trace_reader.go

@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"iter"
 	"math"
 	"strings"
 
@@ -22,7 +23,6 @@ import (
 	"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
-	"github.com/jaegertracing/jaeger/pkg/iter"
 	"github.com/jaegertracing/jaeger/ports"
 )
 

cmd/query/app/apiv3/gateway_test.go

@@ -7,6 +7,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"io"
+	"iter"
 	"net/http"
 	"os"
 	"path"
@@ -25,7 +26,6 @@ import (
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
 	tracestoremocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore/mocks"
 	_ "github.com/jaegertracing/jaeger/pkg/gogocodec" // force gogo codec registration
-	"github.com/jaegertracing/jaeger/pkg/iter"
 )
 
 // Utility functions used from http_gateway_test.go.

cmd/query/app/apiv3/grpc_handler.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"iter"
 
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	"google.golang.org/grpc/codes"
@@ -17,7 +18,6 @@ import (
 	"github.com/jaegertracing/jaeger/internal/proto/api_v3"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
-	"github.com/jaegertracing/jaeger/pkg/iter"
 )
 
 // Handler implements api_v3.QueryServiceServer

cmd/query/app/apiv3/grpc_handler_test.go

@@ -5,6 +5,7 @@ package apiv3
 
 import (
 	"context"
+	"iter"
 	"net"
 	"testing"
 	"time"
@@ -22,7 +23,6 @@ import (
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
 	tracestoremocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore/mocks"
 	_ "github.com/jaegertracing/jaeger/pkg/gogocodec" // force gogo codec registration
-	"github.com/jaegertracing/jaeger/pkg/iter"
 )
 
 var matchContext = mock.AnythingOfType("*context.valueCtx")

cmd/query/app/apiv3/http_gateway.go

@@ -22,11 +22,11 @@ import (
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
+	"github.com/jaegertracing/jaeger/internal/jiter"
 	"github.com/jaegertracing/jaeger/internal/proto/api_v3"
 	"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
-	"github.com/jaegertracing/jaeger/pkg/iter"
 )
 
 const (
@@ -191,7 +191,7 @@ func (h *HTTPGateway) getTrace(w http.ResponseWriter, r *http.Request) {
 		request.RawTraces = rawTraces
 	}
 	getTracesIter := h.QueryService.GetTraces(r.Context(), request)
-	trc, err := iter.FlattenWithErrors(getTracesIter)
+	trc, err := jiter.FlattenWithErrors(getTracesIter)
 	h.returnTraces(trc, err, w)
 }
 
@@ -202,7 +202,7 @@ func (h *HTTPGateway) findTraces(w http.ResponseWriter, r *http.Request) {
 	}
 
 	findTracesIter := h.QueryService.FindTraces(r.Context(), *queryParams)
-	traces, err := iter.FlattenWithErrors(findTracesIter)
+	traces, err := jiter.FlattenWithErrors(findTracesIter)
 	h.returnTraces(traces, err, w)
 }
 

cmd/query/app/apiv3/http_gateway_test.go

@@ -6,6 +6,7 @@ package apiv3
 import (
 	"errors"
 	"fmt"
+	"iter"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -24,7 +25,6 @@ import (
 	dependencyStoreMocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore/mocks"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
 	tracestoremocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore/mocks"
-	"github.com/jaegertracing/jaeger/pkg/iter"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
 )

cmd/query/app/querysvc/v2/querysvc/service.go

@@ -6,6 +6,7 @@ package querysvc
 import (
 	"context"
 	"errors"
+	"iter"
 	"time"
 
 	"go.opentelemetry.io/collector/pdata/pcommon"
@@ -16,7 +17,6 @@ import (
 	"github.com/jaegertracing/jaeger/internal/jptrace"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
-	"github.com/jaegertracing/jaeger/pkg/iter"
 )
 
 var errNoArchiveSpanStorage = errors.New("archive span storage was not configured")

cmd/query/app/querysvc/v2/querysvc/service_test.go

@@ -6,6 +6,7 @@ package querysvc
 import (
 	"context"
 	"fmt"
+	"iter"
 	"testing"
 	"time"
 
@@ -17,11 +18,11 @@ import (
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/adjuster"
+	"github.com/jaegertracing/jaeger/internal/jiter"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore"
 	depstoremocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore/mocks"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
 	tracestoremocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore/mocks"
-	"github.com/jaegertracing/jaeger/pkg/iter"
 )
 
 const millisToNanosMultiplier = int64(time.Millisecond / time.Nanosecond)
@@ -109,7 +110,7 @@ func TestGetTraces_ErrorInReader(t *testing.T) {
 		},
 	}
 	getTracesIter := tqs.queryService.GetTraces(context.Background(), params)
-	_, err := iter.FlattenWithErrors(getTracesIter)
+	_, err := jiter.FlattenWithErrors(getTracesIter)
 	require.ErrorIs(t, err, assert.AnError)
 }
 
@@ -126,7 +127,7 @@ func TestGetTraces_Success(t *testing.T) {
 		},
 	}
 	getTracesIter := tqs.queryService.GetTraces(context.Background(), params)
-	gotTraces, err := iter.FlattenWithErrors(getTracesIter)
+	gotTraces, err := jiter.FlattenWithErrors(getTracesIter)
 	require.NoError(t, err)
 	require.Len(t, gotTraces, 1)
 
@@ -198,7 +199,7 @@ func TestGetTraces_WithRawTraces(t *testing.T) {
 				RawTraces: test.rawTraces,
 			}
 			getTracesIter := tqs.queryService.GetTraces(context.Background(), params)
-			gotTraces, err := iter.FlattenWithErrors(getTracesIter)
+			gotTraces, err := jiter.FlattenWithErrors(getTracesIter)
 			require.NoError(t, err)
 
 			require.Len(t, gotTraces, 1)
@@ -227,7 +228,7 @@ func TestGetTraces_TraceInArchiveStorage(t *testing.T) {
 		},
 	}
 	getTracesIter := tqs.queryService.GetTraces(context.Background(), params)
-	gotTraces, err := iter.FlattenWithErrors(getTracesIter)
+	gotTraces, err := jiter.FlattenWithErrors(getTracesIter)
 	require.NoError(t, err)
 	require.Len(t, gotTraces, 1)
 
@@ -283,7 +284,7 @@ func TestFindTraces_Success(t *testing.T) {
 
 	query := TraceQueryParams{TraceQueryParams: queryParams}
 	getTracesIter := tqs.queryService.FindTraces(context.Background(), query)
-	gotTraces, err := iter.FlattenWithErrors(getTracesIter)
+	gotTraces, err := jiter.FlattenWithErrors(getTracesIter)
 	require.NoError(t, err)
 	require.Len(t, gotTraces, 1)
 
@@ -366,7 +367,7 @@ func TestFindTraces_WithRawTraces_PerformsAdjustment(t *testing.T) {
 				RawTraces: test.rawTraces,
 			}
 			getTracesIter := tqs.queryService.FindTraces(context.Background(), query)
-			gotTraces, err := iter.FlattenWithErrors(getTracesIter)
+			gotTraces, err := jiter.FlattenWithErrors(getTracesIter)
 			require.NoError(t, err)
 
 			require.Len(t, gotTraces, 1)
@@ -502,7 +503,7 @@ func TestFindTraces_WithRawTraces_PerformsAggregation(t *testing.T) {
 				RawTraces: test.rawTraces,
 			}
 			getTracesIter := tqs.queryService.FindTraces(context.Background(), query)
-			gotTraces, err := iter.FlattenWithErrors(getTracesIter)
+			gotTraces, err := jiter.FlattenWithErrors(getTracesIter)
 			require.NoError(t, err)
 			assert.Equal(t, test.expected, gotTraces)
 			assert.Equal(t, test.expectedAdjustCalls, adjustCalls)

pkg/iter/iter.go → internal/jiter/iter.go

@@ -2,14 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // Package iter is a backport of Go 1.23 official "iter" package, until we upgrade.
-package iter
+package jiter
 
-type (
-	Seq[V any]     func(yield func(V) bool)
-	Seq2[K, V any] func(yield func(K, V) bool)
+import (
+	"iter"
 )
 
-func CollectWithErrors[V any](seq Seq2[V, error]) ([]V, error) {
+func CollectWithErrors[V any](seq iter.Seq2[V, error]) ([]V, error) {
 	var result []V
 	var err error
 	seq(func(v V, e error) bool {
@@ -26,7 +25,7 @@ func CollectWithErrors[V any](seq Seq2[V, error]) ([]V, error) {
 	return result, nil
 }
 
-func FlattenWithErrors[V any](seq Seq2[[]V, error]) ([]V, error) {
+func FlattenWithErrors[V any](seq iter.Seq2[[]V, error]) ([]V, error) {
 	var result []V
 	var err error
 	seq(func(v []V, e error) bool {

pkg/iter/iter_test.go → internal/jiter/iter_test.go

@@ -1,9 +1,10 @@
 // Copyright (c) 2024 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package iter
+package jiter
 
 import (
+	"iter"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -13,7 +14,7 @@ import (
 func TestCollectWithErrors(t *testing.T) {
 	tests := []struct {
 		name     string
-		seq      Seq2[string, error]
+		seq      iter.Seq2[string, error]
 		expected []string
 		err      error
 	}{
@@ -70,7 +71,7 @@ func TestCollectWithErrors(t *testing.T) {
 func TestFlattenWithErrors(t *testing.T) {
 	tests := []struct {
 		name     string
-		seq      Seq2[[]string, error]
+		seq      iter.Seq2[[]string, error]
 		expected []string
 		err      error
 	}{

pkg/iter/package_test.go → internal/jiter/package_test.go

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package iter
+package jiter
 
 import (
 	"testing"

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.

internal/jptrace/spaniter.go

@@ -4,9 +4,9 @@
 package jptrace
 
 import (
-	"go.opentelemetry.io/collector/pdata/ptrace"
+	"iter"
 
-	"github.com/jaegertracing/jaeger/pkg/iter"
+	"go.opentelemetry.io/collector/pdata/ptrace"
 )
 
 type SpanIterPos struct {

internal/storage/v2/api/tracestore/reader.go

@@ -5,13 +5,13 @@ package tracestore
 
 import (
 	"context"
+	"iter"
 	"time"
 
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 
 	"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
-	"github.com/jaegertracing/jaeger/pkg/iter"
 )
 
 // Reader finds and loads traces and other data from storage.

internal/storage/v2/v1adapter/spanreader_test.go

@@ -5,6 +5,7 @@ package v1adapter
 
 import (
 	"context"
+	"iter"
 	"testing"
 	"time"
 
@@ -18,7 +19,6 @@ import (
 	"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
 	tracestoremocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore/mocks"
-	"github.com/jaegertracing/jaeger/pkg/iter"
 )
 
 func TestSpanReader_GetTrace(t *testing.T) {

internal/storage/v2/v1adapter/tracereader.go

@@ -6,6 +6,7 @@ package v1adapter
 import (
 	"context"
 	"errors"
+	"iter"
 
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
@@ -15,7 +16,6 @@ import (
 	"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
-	"github.com/jaegertracing/jaeger/pkg/iter"
 )
 
 var _ tracestore.Reader = (*TraceReader)(nil)