Merge branch 'main' into sampling_refactoring

.codecov.yml

@@ -23,9 +23,7 @@ coverage:
     project:
       default:
         enabled: yes
-        # Temporarily lower threshold below 95%
-        # Tacked in https://github.com/jaegertracing/jaeger/issues/5194
-        target: 94.4%
+        target: 95%
     patch:
       default:
         enabled: yes

.github/dependabot.yml

@@ -18,9 +18,6 @@ updates:
       otel-instrumentation:
         patterns:
           - "go.opentelemetry.io/contrib/instrumentation/*"
-      hashicorp:
-        patterns:
-          - "github.com/hashicorp/*"
 
   - package-ecosystem: "github-actions"
     directory: "/"

.github/workflows/ci-elasticsearch.yml

@@ -21,12 +21,6 @@ jobs:
     strategy:
       matrix:
         version:
-        - major: 5.x
-          image: 5.6.16
-          distribution: elasticsearch
-        - major: 6.x
-          image: 6.8.18
-          distribution: elasticsearch
         - major: 7.x
           image: 7.14.0
           distribution: elasticsearch

.github/workflows/ci-lint-checks.yaml

@@ -14,7 +14,7 @@ concurrency:
 # See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
 permissions:  # added using https://github.com/step-security/secure-workflows
   contents: read
-  
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -30,11 +30,14 @@ jobs:
       with:
         go-version: 1.22.x
 
+    - name: Print Jaeger version
+      run: make echo-version
+
     - name: Install tools
       run: make install-test-tools
 
     - name: Lint
       run: make lint
-    
+
     - name: Ensure PR is not on main branch
-      uses: ./.github/actions/block-pr-not-on-main
+      uses: ./.github/actions/block-pr-not-on-main

.github/workflows/ci-unit-tests.yml

@@ -32,6 +32,10 @@ jobs:
         go-version: 1.22.x
         cache-dependency-path: ./go.sum
 
+    # download dependencies separately to keep unit test step's output cleaner
+    - name: go mod download
+      run: go mod download
+
     - name: Install test deps
       # even though the same target runs from test-ci, running it separately makes for cleaner log in GH workflow
       run: make install-test-tools

.github/workflows/dependency-review.yml

@@ -24,4 +24,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@5bbc3ba658137598168acb2ab73b21c432dd411b # v4.2.5
+        uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2

.github/workflows/scorecard.yml

@@ -42,7 +42,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
         with:
           results_file: results.sarif
           results_format: sarif

.gitignore

@@ -17,7 +17,6 @@ cover.html
 vendor/
 examples/hotrod/hotrod
 examples/hotrod/hotrod-*
-examples/memstore-plugin/memstore-plugin
 cmd/all-in-one/all-in-one-*
 cmd/agent/agent
 cmd/agent/agent-*

Makefile

@@ -65,7 +65,9 @@ IMPORT_LOG=.import.log
 COLORIZE ?= | $(SED) 's/PASS/✅ PASS/g' | $(SED) 's/FAIL/❌ FAIL/g' | $(SED) 's/SKIP/🔕 SKIP/g'
 
 GIT_SHA=$(shell git rev-parse HEAD)
-GIT_CLOSEST_TAG=$(shell git describe --abbrev=0 --tags)
+GIT_SHALLOW_CLONE := $(shell git rev-parse --is-shallow-repository)
+# Some of GitHub Actions workflows do a shallow checkout without tags. This avoids logging warnings from git.
+GIT_CLOSEST_TAG=$(shell if [ "$(GIT_SHALLOW_CLONE)" = "false" ]; then git describe --abbrev=0 --tags; else echo 0.0.0; fi)
 ifneq ($(GIT_CLOSEST_TAG),$(shell echo ${GIT_CLOSEST_TAG} | grep -E "$(semver_regex)"))
 	$(warning GIT_CLOSEST_TAG=$(GIT_CLOSEST_TAG) is not in the semver format $(semver_regex))
 endif
@@ -91,9 +93,15 @@ include Makefile.Crossdock.mk
 .PHONY: test-and-lint
 test-and-lint: test fmt lint
 
+.PHONY: echo-version
+echo-version:
+	@echo "GIT_CLOSEST_TAG=$(GIT_CLOSEST_TAG)"
+
+.PHONY: echo-all-pkgs
 echo-all-pkgs:
 	@echo $(ALL_PKGS) | tr ' ' '\n' | sort
 
+.PHONY: echo-all-srcs
 echo-all-srcs:
 	@echo $(ALL_SRC) | tr ' ' '\n' | sort
 
@@ -139,7 +147,6 @@ badger-storage-integration-test:
 
 .PHONY: grpc-storage-integration-test
 grpc-storage-integration-test:
-	(cd examples/memstore-plugin/ && go build .)
 	STORAGE=grpc $(MAKE) storage-integration-test
 
 # this test assumes STORAGE environment variable is set to elasticsearch|opensearch
@@ -475,10 +482,6 @@ generate-mocks: install-tools
 	$(MOCKERY) --all --dir ./storage/spanstore/ --output ./storage/spanstore/mocks
 	$(MOCKERY) --all --dir ./proto-gen/storage_v1/ --output ./proto-gen/storage_v1/mocks
 
-.PHONY: echo-version
-echo-version:
-	@echo $(GIT_CLOSEST_TAG)
-
 .PHONY: certs
 certs:
 	cd pkg/config/tlscfg/testdata && ./gen-certs.sh

cmd/agent/app/reporter/grpc/collector_proxy_test.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"io"
 	"net"
+	"sync"
 	"testing"
 	"time"
 
@@ -35,15 +36,13 @@ var _ io.Closer = (*ProxyBuilder)(nil)
 
 func TestMultipleCollectors(t *testing.T) {
 	spanHandler1 := &mockSpanHandler{}
-	s1, addr1 := initializeGRPCTestServer(t, func(s *grpc.Server) {
+	_, addr1 := initializeGRPCTestServer(t, func(s *grpc.Server) {
 		api_v2.RegisterCollectorServiceServer(s, spanHandler1)
 	})
-	defer s1.Stop()
 	spanHandler2 := &mockSpanHandler{}
-	s2, addr2 := initializeGRPCTestServer(t, func(s *grpc.Server) {
+	_, addr2 := initializeGRPCTestServer(t, func(s *grpc.Server) {
 		api_v2.RegisterCollectorServiceServer(s, spanHandler2)
 	})
-	defer s2.Stop()
 
 	mFactory := metricstest.NewFactory(time.Microsecond)
 	defer mFactory.Stop()
@@ -79,8 +78,15 @@ func initializeGRPCTestServer(t *testing.T, beforeServe func(server *grpc.Server
 	lis, err := net.Listen("tcp", "localhost:0")
 	require.NoError(t, err)
 	beforeServe(server)
+	var wg sync.WaitGroup
+	wg.Add(1)
 	go func() {
 		require.NoError(t, server.Serve(lis))
+		wg.Done()
 	}()
+	t.Cleanup(func() {
+		server.Stop()
+		wg.Wait()
+	})
 	return server, lis.Addr()
 }

cmd/esmapping-generator/app/renderer/render_test.go

@@ -56,14 +56,6 @@ func Test_getMappingAsString(t *testing.T) {
 			name: "ES version 7", args: app.Options{Mapping: "jaeger-span", EsVersion: 7, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "true", ILMPolicyName: "jaeger-test-policy"},
 			want: "ES version 7",
 		},
-		{
-			name: "ES version 6", args: app.Options{Mapping: "jaeger-span", EsVersion: 6, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "false", ILMPolicyName: "jaeger-test-policy"},
-			want: "ES version 6",
-		},
-		{
-			name: "Parse Error version 6", args: app.Options{Mapping: "jaeger-span", EsVersion: 6, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "false", ILMPolicyName: "jaeger-test-policy"},
-			wantErr: errors.New("parse error"),
-		},
 		{
 			name: "Parse Error version 7", args: app.Options{Mapping: "jaeger-span", EsVersion: 7, Shards: 5, Replicas: 1, IndexPrefix: "test", UseILM: "true", ILMPolicyName: "jaeger-test-policy"},
 			wantErr: errors.New("parse error"),

cmd/jaeger/config-remote-storage.yaml

@@ -14,8 +14,10 @@ extensions:
   jaeger_storage:
     grpc:
       external-storage:
-        server: localhost:17271
-        connection-timeout: 5s
+        endpoint: localhost:17271
+        timeout: 5s
+        tls:
+          insecure: true
 
 receivers:
   otlp:

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

@@ -40,7 +40,7 @@ func createTracesExporter(ctx context.Context, set exporter.CreateSettings, conf
 		exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}),
 		// Disable Timeout/RetryOnFailure and SendingQueue
 		exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}),
-		exporterhelper.WithRetry(configretry.NewDefaultBackOffConfig()),
+		exporterhelper.WithRetry(configretry.BackOffConfig{Enabled: false}),
 		exporterhelper.WithQueue(exporterhelper.QueueSettings{Enabled: false}),
 		exporterhelper.WithStart(ex.start),
 		exporterhelper.WithShutdown(ex.close),

cmd/jaeger/internal/extension/jaegerquery/server_test.go

@@ -101,7 +101,7 @@ func (storageHost) GetExporters() map[component.DataType]map[component.ID]compon
 func TestServerDependencies(t *testing.T) {
 	expectedDependencies := []component.ID{jaegerstorage.ID}
 	telemetrySettings := component.TelemetrySettings{
-		Logger: zaptest.NewLogger(t),
+		Logger: zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller())),
 	}
 
 	server := newServer(createDefaultConfig().(*Config), telemetrySettings)
@@ -160,7 +160,7 @@ func TestServerStart(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			telemetrySettings := component.TelemetrySettings{
-				Logger: zaptest.NewLogger(t),
+				Logger: zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller())),
 			}
 			server := newServer(tt.config, telemetrySettings)
 			err := server.Start(context.Background(), host)

cmd/jaeger/internal/extension/jaegerstorage/config.go

@@ -18,7 +18,7 @@ import (
 type Config struct {
 	Memory        map[string]memoryCfg.Configuration   `mapstructure:"memory"`
 	Badger        map[string]badgerCfg.NamespaceConfig `mapstructure:"badger"`
-	GRPC          map[string]grpcCfg.Configuration     `mapstructure:"grpc"`
+	GRPC          map[string]grpcCfg.ConfigV2          `mapstructure:"grpc"`
 	Opensearch    map[string]esCfg.Configuration       `mapstructure:"opensearch"`
 	Elasticsearch map[string]esCfg.Configuration       `mapstructure:"elasticsearch"`
 	Cassandra     map[string]cassandra.Options         `mapstructure:"cassandra"`

cmd/jaeger/internal/extension/jaegerstorage/extension.go

@@ -117,7 +117,7 @@ func (s *storageExt) Start(ctx context.Context, host component.Host) error {
 		cfg:         s.config.Badger,
 		builder:     badger.NewFactoryWithConfig,
 	}
-	grpcStarter := &starter[grpcCfg.Configuration, *grpc.Factory]{
+	grpcStarter := &starter[grpcCfg.ConfigV2, *grpc.Factory]{
 		ext:         s,
 		storageKind: "grpc",
 		cfg:         s.config.GRPC,

cmd/jaeger/internal/integration/badger_test.go

@@ -15,7 +15,6 @@ func TestBadgerStorage(t *testing.T) {
 	s := &E2EStorageIntegration{
 		ConfigFile: "../../config-badger.yaml",
 		StorageIntegration: integration.StorageIntegration{
-			SkipBinaryAttrs: true,
 			SkipArchiveTest: true,
 			CleanUp:         purge,
 

cmd/jaeger/internal/integration/cassandra_test.go

@@ -17,7 +17,6 @@ func TestCassandraStorage(t *testing.T) {
 			CleanUp:                      purge,
 			GetDependenciesReturnsSource: true,
 			SkipArchiveTest:              true,
-			SkipBinaryAttrs:              true,
 
 			SkipList: integration.CassandraSkippedTests,
 		},

cmd/jaeger/internal/integration/e2e_integration.go

@@ -45,7 +45,7 @@ type E2EStorageIntegration struct {
 // it also initialize the SpanWriter and SpanReader below.
 // This function should be called before any of the tests start.
 func (s *E2EStorageIntegration) e2eInitialize(t *testing.T, storage string) {
-	logger := zaptest.NewLogger(t, zaptest.Level(zap.DebugLevel))
+	logger := zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller()))
 	configFile := createStorageCleanerConfig(t, s.ConfigFile, storage)
 	t.Logf("Starting Jaeger-v2 in the background with config file %s", configFile)
 
@@ -98,22 +98,22 @@ func (s *E2EStorageIntegration) e2eInitialize(t *testing.T, storage string) {
 			// A Github Actions special annotation to create a foldable section
 			// in the Github runner output.
 			// https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#grouping-log-lines
-			fmt.Println("::group::Jaeger-v2 binary logs")
+			fmt.Println("::group::🚧 🚧 🚧 Jaeger-v2 binary logs")
 			outLogs, err := os.ReadFile(outFile.Name())
 			require.NoError(t, err)
-			fmt.Printf("Jaeger-v2 output logs:\n%s", outLogs)
+			fmt.Printf("🚧 🚧 🚧 Jaeger-v2 output logs:\n%s", outLogs)
 
 			errLogs, err := os.ReadFile(errFile.Name())
 			require.NoError(t, err)
-			fmt.Printf("Jaeger-v2 error logs:\n%s", errLogs)
+			fmt.Printf("🚧 🚧 🚧 Jaeger-v2 error logs:\n%s", errLogs)
 			// End of Github Actions foldable section annotation.
 			fmt.Println("::endgroup::")
 		}
 	})
 
 	s.SpanWriter, err = createSpanWriter(logger, otlpPort)
 	require.NoError(t, err)
-	s.SpanReader, err = createSpanReader(ports.QueryGRPC)
+	s.SpanReader, err = createSpanReader(logger, ports.QueryGRPC)
 	require.NoError(t, err)
 }
 

cmd/jaeger/internal/integration/es_test.go

@@ -17,7 +17,6 @@ func TestESStorage(t *testing.T) {
 		StorageIntegration: integration.StorageIntegration{
 			CleanUp:                      purge,
 			Fixtures:                     integration.LoadAndParseQueryTestCases(t, "fixtures/queries_es.json"),
-			SkipBinaryAttrs:              true,
 			GetOperationsMissingSpanKind: true,
 		},
 	}

cmd/jaeger/internal/integration/grpc_test.go

@@ -30,9 +30,6 @@ func TestGRPCStorage(t *testing.T) {
 	s := &GRPCStorageIntegration{
 		E2EStorageIntegration: E2EStorageIntegration{
 			ConfigFile: "../../config-remote-storage.yaml",
-			StorageIntegration: integration.StorageIntegration{
-				SkipBinaryAttrs: true,
-			},
 		},
 	}
 	s.CleanUp = s.cleanUp

cmd/jaeger/internal/integration/os_test.go

@@ -16,7 +16,6 @@ func TestOSStorage(t *testing.T) {
 		StorageIntegration: integration.StorageIntegration{
 			CleanUp:                      purge,
 			Fixtures:                     integration.LoadAndParseQueryTestCases(t, "fixtures/queries_es.json"),
-			SkipBinaryAttrs:              true,
 			GetOperationsMissingSpanKind: true,
 		},
 	}