updated generated php thrift classes (#43)

- the thrift-gen script now uses a thrift docker image to generate the files
- The ThriftGen folder was renamed to Thrift (nsglobal option doesn't work)
- fixes the paths to the zipkin classes

Author: tommyseus

scripts/thrift-gen.sh

@@ -4,18 +4,24 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-git clone https://github.com/uber/jaeger-idl
-pushd jaeger-idl
+# checkout jaeger thrift files
+rm -rf jaeger-idl
+git clone https://github.com/jaegertracing/jaeger-idl
 
-rm -rf ../src/Jaeger/ThriftGen
+# define thrift cmd
+THRIFT="docker run -u $(id -u) -v '${PWD}:/data' thrift:0.11.0 thrift -o /data/jaeger-idl"
+THRIFT_CMD="${THRIFT} --gen php:psr4,oop"
 
-FILES=thrift/*.thrift
+# generate php files
+FILES=$(find jaeger-idl/thrift -type f -name \*.thrift)
 for f in ${FILES}; do
-  thrift -r --gen php:psr4,nsglobal=Jaeger\\ThriftGen ${f}
+    echo "${THRIFT_CMD} "/data/${f}""
+  eval $THRIFT_CMD "/data/${f}"
 done
 
-rm -rf ../src/Jaeger/ThriftGen/
-mv gen-php/Jaeger/ThriftGen ../src/Jaeger/ThriftGen
+# move generated files
+rm -rf src/Jaeger/Thrift
+mv jaeger-idl/gen-php/Jaeger/Thrift src/Jaeger/Thrift
 
-popd
+# remove thrift files
 rm -rf jaeger-idl

src/Jaeger/Config.php

@@ -17,7 +17,7 @@
 use Thrift\Transport\TTransport;
 use Thrift\Protocol\TCompactProtocol;
 use Thrift\Transport\TBufferedTransport;
-use Jaeger\ThriftGen\AgentClient;
+use Jaeger\Thrift\Agent\AgentClient;
 use Jaeger\Sender\UdpSender;
 
 class Config

src/Jaeger/Sender/UdpSender.php

@@ -3,11 +3,11 @@
 namespace Jaeger\Sender;
 
 use Exception;
-use Jaeger\ThriftGen\AgentClient;
-use Jaeger\ThriftGen\AnnotationType;
-use Jaeger\ThriftGen\BinaryAnnotation;
-use Jaeger\ThriftGen\Endpoint;
-use Jaeger\ThriftGen\Span as ThriftSpan;
+use Jaeger\Thrift\Agent\AgentClient;
+use Jaeger\Thrift\Agent\Zipkin\AnnotationType;
+use Jaeger\Thrift\Agent\Zipkin\BinaryAnnotation;
+use Jaeger\Thrift\Agent\Zipkin\Endpoint;
+use Jaeger\Thrift\Agent\Zipkin\Span as ThriftSpan;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Thrift\Exception\TTransportException;

src/Jaeger/Span.php

@@ -2,8 +2,8 @@
 
 namespace Jaeger;
 
-use Jaeger\ThriftGen\AnnotationType;
-use Jaeger\ThriftGen\BinaryAnnotation;
+use Jaeger\Thrift\Agent\Zipkin\AnnotationType;
+use Jaeger\Thrift\Agent\Zipkin\BinaryAnnotation;
 use OpenTracing\Span as OTSpan;
 use DateTime;
 use DateTimeInterface;