Skip to content

Commit

Permalink
Redefine thrift-gen types as aliases to jaeger-idl (jaegertracing#6619)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?
- jaegertracing#6617

## Description of the changes
- remove auto-generated code and replace its types / functions with
aliases to jaeger-idl hosted types

## How was this change tested?
- 

## Checklist
- [ ] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [ ] I have signed all commits
- [ ] I have added unit tests for the new functionality
- [ ] 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: danish9039 <danishsiddiqui040@gmail.com>
  • Loading branch information
danish9039 authored Jan 27, 2025
1 parent 852d9b6 commit 20bdd8d
Show file tree
Hide file tree
Showing 10 changed files with 89 additions and 5,122 deletions.
5 changes: 0 additions & 5 deletions Makefile.Thrift.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,8 @@ thrift-image:
.PHONY: thrift
thrift: idl/thrift/jaeger.thrift thrift-image
[ -d $(THRIFT_GEN_DIR) ] || mkdir $(THRIFT_GEN_DIR)
$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) --out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/agent.thrift
$(SED) -i.bak 's|"zipkincore"|"$(JAEGER_IMPORT_PATH)/thrift-gen/zipkincore"|g' $(THRIFT_GEN_DIR)/agent/*.go
$(SED) -i.bak 's|"jaeger"|"$(JAEGER_IMPORT_PATH)/thrift-gen/jaeger"|g' $(THRIFT_GEN_DIR)/agent/*.go
$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) --out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/jaeger.thrift
$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) --out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/sampling.thrift
$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) --out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/baggage.thrift
$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) --out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/zipkincore.thrift
rm -rf thrift-gen/*/*-remote thrift-gen/*/*.bak

idl/thrift/jaeger.thrift:
Expand Down
6 changes: 0 additions & 6 deletions thrift-gen/agent/GoUnusedProtection__.go

This file was deleted.

35 changes: 0 additions & 35 deletions thrift-gen/agent/agent-consts.go

This file was deleted.

Loading

0 comments on commit 20bdd8d

Please sign in to comment.