Merge branch 'main' into es-kind

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

@@ -88,9 +88,6 @@ jobs:
     - name: Verify Protobuf types are up to date
       run: make proto && { if git status --porcelain | grep '??'; then exit 1; else git diff --name-status --exit-code; fi }
 
-    - name: Verify Thrift types are up to date
-      run: make thrift && { if git status --porcelain | grep '??'; then exit 1; else git diff --name-status --exit-code; fi }
-
     - name: Verify Mockery types are up to date
       run: make generate-mocks && { if git status --porcelain | grep '??'; then exit 1; else git diff --name-status --exit-code; fi }
 

Makefile

@@ -33,7 +33,6 @@ ALL_SRC = $(shell find . -name '*.go' \
 				   -not -path './internal/tools/*' \
 				   -not -path './docker/debug/*' \
 				   -not -path '*/mocks/*' \
-				   -not -path '*/*-gen/*' \
 				   -not -path '*/thrift-0.9.2/*' \
 				   -type f | \
 				sort)
@@ -47,7 +46,7 @@ SCRIPTS_SRC = $(shell find . \( -name '*.sh' -o -name '*.py' -o -name '*.mk' -o
 					sort)
 
 # ALL_PKGS is used with 'nocover' and 'goleak'
-ALL_PKGS = $(shell echo $(dir $(ALL_SRC)) | tr ' ' '\n' | sort -u)
+ALL_PKGS = $(shell echo $(dir $(ALL_SRC)) | tr ' ' '\n' | grep -v '/.*-gen/' | sort -u)
 
 GO=go
 GOOS ?= $(shell $(GO) env GOOS)
@@ -82,7 +81,6 @@ include Makefile.Crossdock.mk
 include Makefile.Docker.mk
 include Makefile.IntegrationTests.mk
 include Makefile.Protobuf.mk
-include Makefile.Thrift.mk
 include Makefile.Tools.mk
 include Makefile.Windows.mk
 

proto-gen/api_v2/collector.go

@@ -1,3 +1,6 @@
+// Copyright (c) 2025 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
 package api_v2
 
 import (

proto-gen/api_v2/query.go

@@ -1,3 +1,6 @@
+// Copyright (c) 2025 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
 package api_v2
 
 import (

proto-gen/api_v2/sampling.go

@@ -1,3 +1,6 @@
+// Copyright (c) 2025 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
 package api_v2
 
 import (

thrift-gen/agent/agent.go

@@ -1,21 +1,30 @@
+// Copyright (c) 2025 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
 package agent
 
 import (
-    modelv1 "github.com/jaegertracing/jaeger-idl/thrift-gen/agent"
+	modelv1 "github.com/jaegertracing/jaeger-idl/thrift-gen/agent"
 )
 
 type Agent = modelv1.Agent
 
 type AgentClient = modelv1.AgentClient
-var NewAgentClientFactory = modelv1.NewAgentClientFactory
-var NewAgentClientProtocol = modelv1.NewAgentClientProtocol
-var NewAgentClient = modelv1.NewAgentClient
+
+var (
+	NewAgentClientFactory  = modelv1.NewAgentClientFactory
+	NewAgentClientProtocol = modelv1.NewAgentClientProtocol
+	NewAgentClient         = modelv1.NewAgentClient
+)
 
 type AgentProcessor = modelv1.AgentProcessor
+
 var NewAgentProcessor = modelv1.NewAgentProcessor
 
 type AgentEmitZipkinBatchArgs = modelv1.AgentEmitZipkinBatchArgs
+
 var NewAgentEmitZipkinBatchArgs = modelv1.NewAgentEmitZipkinBatchArgs
 
 type AgentEmitBatchArgs = modelv1.AgentEmitBatchArgs
-var NewAgentEmitBatchArgs = modelv1.NewAgentEmitBatchArgs
+
+var NewAgentEmitBatchArgs = modelv1.NewAgentEmitBatchArgs