Skip to content

Commit d959697

Browse files
committed
fix
Signed-off-by: Yuri Shkuro <[email protected]>
1 parent 826d658 commit d959697

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright (c) 2023 The Jaeger Authors.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
JAEGER_IMPORT_PATH = github.com/jaegertracing/jaeger-idl
5+
46
THRIFT_VER?=0.19
57
THRIFT_IMG?=jaegertracing/thrift:$(THRIFT_VER)
68
THRIFT=docker run --rm -u $(shell id -u) -v "${PWD}:/data" $(THRIFT_IMG) thrift
@@ -46,9 +48,11 @@ clean:
4648
.PHONY: thrift
4749
thrift:
4850
[ -d $(THRIFT_GEN_DIR) ] || mkdir $(THRIFT_GEN_DIR)
49-
$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) -out /data/$(THRIFT_GEN_DIR) /data/thrift/agent.thrift
5051
$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) -out /data/$(THRIFT_GEN_DIR) /data/thrift/jaeger.thrift
5152
$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) -out /data/$(THRIFT_GEN_DIR) /data/thrift/zipkincore.thrift
53+
$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) -out /data/$(THRIFT_GEN_DIR) /data/thrift/agent.thrift
54+
$(SED) -i.bak 's|"zipkincore"|"$(JAEGER_IMPORT_PATH)/thrift-gen/zipkincore"|g' $(THRIFT_GEN_DIR)/agent/*.go
55+
$(SED) -i.bak 's|"jaeger"|"$(JAEGER_IMPORT_PATH)/thrift-gen/jaeger"|g' $(THRIFT_GEN_DIR)/agent/*.go
5256
rm -rf thrift-gen/*/*-remote thrift-gen/*/*.bak
5357

5458
.PHONY: thrift-all

thrift-gen/agent/agent-consts.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

thrift-gen/agent/agent.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)