Generate and commit Go code for zipkincore.thrift

.codecov.yml

@@ -6,6 +6,7 @@ codecov:
 ignore:
   - "model/v1/model.pb.go"
   - "proto-gen/*/*"
+  - "thrift-gen/*/*"
 
 coverage:
   precision: 2

.github/workflows/ci-lint-test.yml

@@ -31,4 +31,7 @@ jobs:
           submodules: recursive
 
       - name: Verify Protobuf types are up to date
-        run: make proto && git diff --name-status --exit-code
+        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 }

.github/workflows/ci-unit-tests.yml

@@ -53,3 +53,4 @@ jobs:
 
     - name: Test code gen
       run: make test-code-gen
+

Makefile

@@ -27,9 +27,10 @@ THRIFT_CMD=$(THRIFT) -o /data $(THRIFT_GEN)
 
 THRIFT_FILES=agent.thrift jaeger.thrift sampling.thrift zipkincore.thrift crossdock/tracetest.thrift \
 	baggage.thrift dependency.thrift aggregation_validator.thrift
+THRIFT_GEN_DIR=thrift-gen
 
 .PHONY: test-code-gen
-test-code-gen: thrift swagger-validate protocompile proto proto-zipkin
+test-code-gen: thrift-all swagger-validate protocompile proto-all proto-zipkin
 	git diff --exit-code ./swagger/api_v3/query_service.swagger.json
 
 .PHONY: swagger-validate
@@ -43,7 +44,13 @@ clean:
 	rm -rf coverage.txt
 
 .PHONY: thrift
-thrift:	thrift-image clean $(THRIFT_FILES)
+thrift:
+	[ -d $(THRIFT_GEN_DIR) ] || mkdir $(THRIFT_GEN_DIR)
+	$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) -out /data/$(THRIFT_GEN_DIR) /data/thrift/zipkincore.thrift
+	rm -rf thrift-gen/*/*-remote thrift-gen/*/*.bak
+
+.PHONY: thrift-all
+thrift-all: thrift-image clean $(THRIFT_FILES)
 
 $(THRIFT_FILES):
 	@echo Compiling $@

README.md

@@ -16,7 +16,7 @@ This repository does not publish the generated code, but it does run Thrift and
 
 To generate the stubs for your own purposes:
   * clone the repository
-  * run `make proto` or `make thrift`
+  * run `make proto-all` or `make thrift-all`
   * the stubs will be generated under `gen-{lang}` for Thrift and `proto-gen-{lang}` for Protobuf
 
 

go.mod

@@ -14,6 +14,7 @@ require (
 )
 
 require (
+	github.com/apache/thrift v0.21.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect

go.sum

@@ -1,3 +1,5 @@
+github.com/apache/thrift v0.21.0 h1:tdPmh/ptjE1IJnhbhrcl2++TauVjy242rkV/UzJChnE=
+github.com/apache/thrift v0.21.0/go.mod h1:W1H8aR/QRtYNvrPeFXBtobyRkd0/YVhTc6i07XIAgDw=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=