Skip to content

Commit 10bacb7

Browse files
authored
Alias samping.thrift and clean thrift files (jaegertracing#6630)
## Which problem is this PR solving? - jaegertracing#6617 ## Description of the changes - remove unused Thrift files - remove thrift makefile - edit makefile - alias samping.thrift ## How was this change tested? - `make test lint` ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: nabil salah <[email protected]> Signed-off-by: Nabil Salah <[email protected]>
1 parent 97e800d commit 10bacb7

15 files changed

+128
-2071
lines changed

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

-3
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ jobs:
8888
- name: Verify Protobuf types are up to date
8989
run: make proto && { if git status --porcelain | grep '??'; then exit 1; else git diff --name-status --exit-code; fi }
9090

91-
- name: Verify Thrift types are up to date
92-
run: make thrift && { if git status --porcelain | grep '??'; then exit 1; else git diff --name-status --exit-code; fi }
93-
9491
- name: Verify Mockery types are up to date
9592
run: make generate-mocks && { if git status --porcelain | grep '??'; then exit 1; else git diff --name-status --exit-code; fi }
9693

Makefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ ALL_SRC = $(shell find . -name '*.go' \
3333
-not -path './internal/tools/*' \
3434
-not -path './docker/debug/*' \
3535
-not -path '*/mocks/*' \
36-
-not -path '*/*-gen/*' \
3736
-not -path '*/thrift-0.9.2/*' \
3837
-type f | \
3938
sort)
@@ -47,7 +46,7 @@ SCRIPTS_SRC = $(shell find . \( -name '*.sh' -o -name '*.py' -o -name '*.mk' -o
4746
sort)
4847

4948
# ALL_PKGS is used with 'nocover' and 'goleak'
50-
ALL_PKGS = $(shell echo $(dir $(ALL_SRC)) | tr ' ' '\n' | sort -u)
49+
ALL_PKGS = $(shell echo $(dir $(ALL_SRC)) | tr ' ' '\n' | grep -v '/.*-gen/' | sort -u)
5150

5251
GO=go
5352
GOOS ?= $(shell $(GO) env GOOS)
@@ -82,7 +81,6 @@ include Makefile.Crossdock.mk
8281
include Makefile.Docker.mk
8382
include Makefile.IntegrationTests.mk
8483
include Makefile.Protobuf.mk
85-
include Makefile.Thrift.mk
8684
include Makefile.Tools.mk
8785
include Makefile.Windows.mk
8886

Makefile.Thrift.mk

-22
This file was deleted.

proto-gen/api_v2/collector.go

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025 The Jaeger Authors.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package api_v2
25

36
import (

proto-gen/api_v2/query.go

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025 The Jaeger Authors.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package api_v2
25

36
import (

proto-gen/api_v2/sampling.go

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025 The Jaeger Authors.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package api_v2
25

36
import (

thrift-gen/agent/agent.go

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
1+
// Copyright (c) 2025 The Jaeger Authors.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package agent
25

36
import (
4-
modelv1 "github.com/jaegertracing/jaeger-idl/thrift-gen/agent"
7+
modelv1 "github.com/jaegertracing/jaeger-idl/thrift-gen/agent"
58
)
69

710
type Agent = modelv1.Agent
811

912
type AgentClient = modelv1.AgentClient
10-
var NewAgentClientFactory = modelv1.NewAgentClientFactory
11-
var NewAgentClientProtocol = modelv1.NewAgentClientProtocol
12-
var NewAgentClient = modelv1.NewAgentClient
13+
14+
var (
15+
NewAgentClientFactory = modelv1.NewAgentClientFactory
16+
NewAgentClientProtocol = modelv1.NewAgentClientProtocol
17+
NewAgentClient = modelv1.NewAgentClient
18+
)
1319

1420
type AgentProcessor = modelv1.AgentProcessor
21+
1522
var NewAgentProcessor = modelv1.NewAgentProcessor
1623

1724
type AgentEmitZipkinBatchArgs = modelv1.AgentEmitZipkinBatchArgs
25+
1826
var NewAgentEmitZipkinBatchArgs = modelv1.NewAgentEmitZipkinBatchArgs
1927

2028
type AgentEmitBatchArgs = modelv1.AgentEmitBatchArgs
21-
var NewAgentEmitBatchArgs = modelv1.NewAgentEmitBatchArgs
29+
30+
var NewAgentEmitBatchArgs = modelv1.NewAgentEmitBatchArgs

thrift-gen/baggage/GoUnusedProtection__.go

-6
This file was deleted.

thrift-gen/baggage/baggage-consts.go

-30
This file was deleted.

0 commit comments

Comments
 (0)