Skip to content
This repository was archived by the owner on Jul 11, 2022. It is now read-only.

Commit c4908a4

Browse files
dudymasyurishkuro
authored andcommitted
Add script to fix import paths in gen files (#99)
1 parent 2f780af commit c4908a4

File tree

10 files changed

+12
-8
lines changed

10 files changed

+12
-8
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ thrift: idl-submodule thrift-image
8383
${THRIFT} -o /data --gen py:${THRIFT_PY_ARGS} -out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/zipkinCore.thrift
8484
${THRIFT} -o /data --gen py:${THRIFT_PY_ARGS} -out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/agent.thrift
8585
${THRIFT} -o /data --gen py:${THRIFT_PY_ARGS} -out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/sampling.thrift
86+
find jaeger_client/thrift_gen -iname '*.py' -exec sed -i.bak 's/from ttype/from .ttype/g' {} \;
87+
rm jaeger_client/thrift_gen/{**/*.bak,*.bak}
8688
rm -rf ${THRIFT_GEN_DIR}/*/*-remote
8789

8890
update-license:

crossdock/thrift_gen/tracetest/TracedService.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crossdock/thrift_gen/tracetest/constants.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ def port_to_int(port):
5858

5959

6060
def id_to_int(big_id):
61+
if big_id is None:
62+
return None
6163
# zipkincore.thrift defines ID fields as i64, which is signed,
6264
# therefore we convert large IDs (> 2^63) to negative longs
6365
if big_id > _max_signed_id:

jaeger_client/thrift_gen/agent/Agent.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/agent/constants.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/sampling/SamplingManager.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/sampling/constants.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/zipkincore/ZipkinCollector.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jaeger_client/thrift_gen/zipkincore/constants.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)