Skip to content

Commit dc086aa

Browse files
authored
Merge pull request #9 from andrew-demb/latest-thrift
Allow to use latest thrift. Regenerate jaeger code from latest thrift contracts
2 parents 6128d16 + fbfebde commit dc086aa

File tree

65 files changed

+5738
-4793
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+5738
-4793
lines changed

bin/thrift-gen.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
set -e
33

44
cd "$(dirname "$0")/.."
55

6-
git clone https://github.com/uber/jaeger-idl
6+
git clone https://github.com/jaegertracing/jaeger-idl
77
pushd jaeger-idl
88

99
rm -rf ../src/Thrift

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"require": {
1010
"php": ">=7.1",
1111
"ext-sockets": "*",
12-
"apache/thrift": "0.11.*"
12+
"apache/thrift": ">=0.11, <0.16"
1313
},
1414
"require-dev": {
1515
"phpunit/phpunit": "@stable"

src/Thrift/Agent/AgentClient.php

Lines changed: 56 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Thrift/Agent/AgentIf.php

Lines changed: 12 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Thrift/Agent/Agent_emitBatch_args.php

Lines changed: 71 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)