Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

add generated thrift file for agent.thrift and jaeger.thrift #130

Closed
wants to merge 1 commit into from
Closed

add generated thrift file for agent.thrift and jaeger.thrift #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion .github/workflows/ci-lint-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,6 @@ jobs:
submodules: recursive

- name: Verify Protobuf types are up to date
run: make proto && git diff --name-status --exit-code
run: make proto && git diff --name-status --exit-code
- name: Verify Thrift types are up to date
run: make thrift && git diff --name-status --exit-code
10 changes: 9 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,15 @@ clean:
rm -rf .*gen-* || true

.PHONY: thrift
thrift: thrift-image clean $(THRIFT_FILES)
thrift: thrift/zipkincore.thrift thrift/jaeger.thrift thrift/agent.thrift thrift-image
[ -d $(THRIFT_GEN_DIR) ] || mkdir $(THRIFT_GEN_DIR)
$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) --out /data/thrift-gen /data/thrift/zipkincore.thrift
$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) --out /data/thrift-gen /data/thrift/jaeger.thrift
$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) --out /data/thrift-gen /data/thrift/agent.thrift
$(SED) -i.bak 's|"zipkincore"|"$(JAEGER_IMPORT_PATH)/thrift-gen/zipkincore"|g' thrift-gen/agent/*.go
$(SED) -i.bak 's|"jaeger"|"$(JAEGER_IMPORT_PATH)/thrift-gen/jaeger"|g' thrift-gen/agent/*.go
rm -rf thrift-gen/*/*-remote thrift-gen/*/*.bak


$(THRIFT_FILES):
@echo Compiling $@
Expand Down
6 changes: 6 additions & 0 deletions thrift-gen/agent/GoUnusedProtection__.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading