Add script to fix import paths in gen files (#99)

jaegertracing · Nov 24, 2017 · c4908a4 · c4908a4
1 parent 2f780af
commit c4908a4
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -83,6 +83,8 @@ thrift: idl-submodule thrift-image
 	${THRIFT} -o /data --gen py:${THRIFT_PY_ARGS} -out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/zipkinCore.thrift
 	${THRIFT} -o /data --gen py:${THRIFT_PY_ARGS} -out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/agent.thrift
 	${THRIFT} -o /data --gen py:${THRIFT_PY_ARGS} -out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/sampling.thrift
+	find jaeger_client/thrift_gen -iname '*.py' -exec sed -i.bak 's/from ttype/from .ttype/g' {} \;
+	rm jaeger_client/thrift_gen/{**/*.bak,*.bak}
 	rm -rf ${THRIFT_GEN_DIR}/*/*-remote
 
 update-license:

diff --git a/crossdock/thrift_gen/tracetest/TracedService.py b/crossdock/thrift_gen/tracetest/TracedService.py
diff --git a/crossdock/thrift_gen/tracetest/constants.py b/crossdock/thrift_gen/tracetest/constants.py
diff --git a/jaeger_client/thrift.py b/jaeger_client/thrift.py
@@ -58,6 +58,8 @@ def port_to_int(port):
 
 
 def id_to_int(big_id):
+    if big_id is None:
+        return None
     # zipkincore.thrift defines ID fields as i64, which is signed,
     # therefore we convert large IDs (> 2^63) to negative longs
     if big_id > _max_signed_id:

diff --git a/jaeger_client/thrift_gen/agent/Agent.py b/jaeger_client/thrift_gen/agent/Agent.py
diff --git a/jaeger_client/thrift_gen/agent/constants.py b/jaeger_client/thrift_gen/agent/constants.py
diff --git a/jaeger_client/thrift_gen/sampling/SamplingManager.py b/jaeger_client/thrift_gen/sampling/SamplingManager.py
diff --git a/jaeger_client/thrift_gen/sampling/constants.py b/jaeger_client/thrift_gen/sampling/constants.py
diff --git a/jaeger_client/thrift_gen/zipkincore/ZipkinCollector.py b/jaeger_client/thrift_gen/zipkincore/ZipkinCollector.py
diff --git a/jaeger_client/thrift_gen/zipkincore/constants.py b/jaeger_client/thrift_gen/zipkincore/constants.py