Alias samping.thrift and clean thrift files

.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
 

go.mod

@@ -163,7 +163,7 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jaegertracing/jaeger-idl v0.0.0-20250127031220-68c7c1836e84
+	github.com/jaegertracing/jaeger-idl v0.0.0-20250129145848-5fa35ae945ef
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
 	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
 	github.com/jcmturner/gofork v1.7.6 // indirect

go.sum

@@ -331,6 +331,8 @@ github.com/ionos-cloud/sdk-go/v6 v6.1.11 h1:J/uRN4UWO3wCyGOeDdMKv8LWRzKu6UIkLEae
 github.com/ionos-cloud/sdk-go/v6 v6.1.11/go.mod h1:EzEgRIDxBELvfoa/uBN0kOQaqovLjUWEB7iW4/Q+t4k=
 github.com/jaegertracing/jaeger-idl v0.0.0-20250127031220-68c7c1836e84 h1:yku1F14QLYpYA0kVx+DMcUXcOoS4vtYeSBka4eXR7u4=
 github.com/jaegertracing/jaeger-idl v0.0.0-20250127031220-68c7c1836e84/go.mod h1:okucign90cUWvkXRY3OVBKZKWStz5EokIPMPxirt3nk=
+github.com/jaegertracing/jaeger-idl v0.0.0-20250129145848-5fa35ae945ef h1:LyDmrGCt+QGBneOIQmixXdGLKEOjJmcgBELJITpJ+ak=
+github.com/jaegertracing/jaeger-idl v0.0.0-20250129145848-5fa35ae945ef/go.mod h1:okucign90cUWvkXRY3OVBKZKWStz5EokIPMPxirt3nk=
 github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=
 github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
 github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=

model/converter/json/sampling_test.go

@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
+	api_v1 "github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
 	thriftconv "github.com/jaegertracing/jaeger/model/converter/thrift/jaeger"
-	api_v1 "github.com/jaegertracing/jaeger/thrift-gen/sampling"
 )
 
 func TestSamplingStrategyResponseToJSON_Error(t *testing.T) {

model/converter/thrift/jaeger/sampling_from_domain.go

@@ -8,7 +8,7 @@ import (
 	"math"
 
 	"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
-	"github.com/jaegertracing/jaeger/thrift-gen/sampling"
+	"github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
 )
 
 // ConvertSamplingResponseFromDomain converts proto sampling response to its thrift representation.

model/converter/thrift/jaeger/sampling_from_domain_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
-	"github.com/jaegertracing/jaeger/thrift-gen/sampling"
+	"github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
 )
 
 func TestConvertStrategyTypeFromDomain(t *testing.T) {

model/converter/thrift/jaeger/sampling_to_domain.go

@@ -7,7 +7,7 @@ import (
 	"errors"
 
 	"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
-	"github.com/jaegertracing/jaeger/thrift-gen/sampling"
+	"github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
 )
 
 // ConvertSamplingResponseToDomain converts thrift sampling response to its proto representation.

model/converter/thrift/jaeger/sampling_to_domain_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
-	"github.com/jaegertracing/jaeger/thrift-gen/sampling"
+	"github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
 )
 
 func TestConvertStrategyTypeToDomain(t *testing.T) {

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