Skip to content

Updated thrift version. #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gareth-robinson wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated thrift version. #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15402b2
Updated thrift version. Older version had 'nodeunit' as a dependency …
gareth-robinson Jan 10, 2019
629d130
Latest version of thrift uses a version of 'ws' that needs Buffer.all…
gareth-robinson Jan 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
language: node_js

node_js:
- 5.2
- 4.2
- 0.12
- 0.10
- 0.8
- 0.6

before_install:
- '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28'
- '[ "${TRAVIS_NODE_VERSION}" != "0.6" ] || npm install -g npm@1.3.26'
- '[ "${TRAVIS_NODE_VERSION}" != "0.1*" ] || npm install -g npm@latest'
- 6
- 8
- 10
- 11

before_script: npm run-script lint
script: npm test
21 changes: 0 additions & 21 deletions bin/tester
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions lib/formatters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
if (trace.parentSpanId !== undefined) {
restkinTrace.parent_span_id = trace.parentSpanId;
}

if (trace.debug !== undefined) {
restkinTrace.debug = trace.debug;
}
Expand Down Expand Up @@ -114,7 +114,7 @@

/**
* Formats the trace and annotation to be accepted by Zipkin Query Collector Service API
*
*
* @param {Trace} trace Trace to format
* @param {Annotation[]} annotations Annotations to format
* @param {Function} callback Callback called with (err, formattedResult).
Expand Down Expand Up @@ -281,8 +281,8 @@
if (typeof module !== 'undefined' && module.exports) {
thrift = require('thrift');
zipkinCore_types = require('./_thrift/zipkinCore/zipkinCore_types');
ttransport = require('thrift/lib/thrift/transport');
tprotocol = require('thrift/lib/thrift/protocol');
ttransport = require('thrift/lib/nodejs/lib/thrift/transport');
tprotocol = require('thrift/lib/nodejs/lib/thrift/protocol');
Int64 = require('node-int64');
module.exports = {
_hexStringify: hexStringify,
Expand Down
Loading