Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Alias samping.thrift and clean thrift files #6630

Merged
merged 10 commits into from
Jan 29, 2025
Merged

Alias samping.thrift and clean thrift files #6630

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b992ecd
refactor: alias samping.thrift and clean thrift
Nabil-Salah Jan 29, 2025
e16991a
chore: remove Thrift types verification from CI lint checks
Nabil-Salah Jan 29, 2025
81a0db6
refactor: use jaeger-idl thrift imports and update thrift/proto folde…
Nabil-Salah Jan 29, 2025
ed1ccb1
refactor: exclude alias directories from ALL_PKGS in Makefile
Nabil-Salah Jan 29, 2025
e575c85
refactor: remove auto generated comment
Nabil-Salah Jan 29, 2025
64379db
undo mistake thrift-0.9.2/ changes
Nabil-Salah Jan 29, 2025
0c8d187
undo mistake thrift-0.9.2/ changes whitespace
Nabil-Salah Jan 29, 2025
8f9b141
refactor: revert thrift imports
Nabil-Salah Jan 29, 2025
c0d8482
refactor: revert thrift imports
Nabil-Salah Jan 29, 2025
7a03949
refactor: rebase with main
Nabil-Salah Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/ci-lint-checks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,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

Expand Down
22 changes: 0 additions & 22 deletions Makefile.Thrift.mk
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
6 changes: 0 additions & 6 deletions thrift-gen/baggage/GoUnusedProtection__.go
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions thrift-gen/baggage/baggage-consts.go
View file
Open in desktop

This file was deleted.

Loading
Loading