From 367db524be652ea765669011b036637e0ab29aec Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 28 May 2019 17:31:22 -0700 Subject: [PATCH] Update dependency jaeger-client to ~3.15.0 (#550) * Update dependency jaeger-client to ~3.15.0 * Fix build - https://github.com/jaegertracing/jaeger-client-node/pull/340 --- packages/opencensus-exporter-jaeger/package-lock.json | 6 +++--- packages/opencensus-exporter-jaeger/package.json | 2 +- packages/opencensus-exporter-jaeger/src/jaeger.ts | 2 +- packages/opencensus-exporter-jaeger/test/test-jaeger.ts | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/opencensus-exporter-jaeger/package-lock.json b/packages/opencensus-exporter-jaeger/package-lock.json index 2d9310ddc..617a71b10 100644 --- a/packages/opencensus-exporter-jaeger/package-lock.json +++ b/packages/opencensus-exporter-jaeger/package-lock.json @@ -1392,9 +1392,9 @@ } }, "jaeger-client": { - "version": "3.14.4", - "resolved": "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.14.4.tgz", - "integrity": "sha512-+AEI0z3ppLkqOKxUvN6n+qmjDj7O8R+Qr3lO9AXRtuEKxX4p0bfMwqcFiTQPr80twVVdF3wCrZVkcpJysZUL5w==", + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.15.0.tgz", + "integrity": "sha512-0SfuEE7E6XVLhu8th5JG/ACtnIWq4Tad0iSst3+De9HOMSz1RI0Tl1MLXzetudI670rqfCs4m37XCTMRgu8oxg==", "requires": { "node-int64": "^0.4.0", "opentracing": "^0.13.0", diff --git a/packages/opencensus-exporter-jaeger/package.json b/packages/opencensus-exporter-jaeger/package.json index d41e56627..f9b6af46a 100644 --- a/packages/opencensus-exporter-jaeger/package.json +++ b/packages/opencensus-exporter-jaeger/package.json @@ -64,6 +64,6 @@ }, "dependencies": { "@opencensus/core": "^0.0.13", - "jaeger-client": "~3.14.0" + "jaeger-client": "~3.15.0" } } diff --git a/packages/opencensus-exporter-jaeger/src/jaeger.ts b/packages/opencensus-exporter-jaeger/src/jaeger.ts index 5af581f8c..1a4aeaa18 100644 --- a/packages/opencensus-exporter-jaeger/src/jaeger.ts +++ b/packages/opencensus-exporter-jaeger/src/jaeger.ts @@ -82,7 +82,7 @@ export class JaegerTraceExporter implements Exporter { .JAEGER_OPENCENSUS_EXPORTER_VERSION_TAG_KEY] = `opencensus-exporter-jaeger-${pjsonVersion}`; defaultTags[JaegerTraceExporter.TRACER_HOSTNAME_TAG_KEY] = os.hostname(); - defaultTags[JaegerTraceExporter.PROCESS_IP] = Utils.ipToInt(Utils.myIp()); + defaultTags[JaegerTraceExporter.PROCESS_IP] = Utils.myIp(); // Merge the user given tags and the default tags const _tags: Tag[] = [...tags, ...Utils.convertObjectToTags(defaultTags)]; diff --git a/packages/opencensus-exporter-jaeger/test/test-jaeger.ts b/packages/opencensus-exporter-jaeger/test/test-jaeger.ts index e35681bcc..486af0baf 100644 --- a/packages/opencensus-exporter-jaeger/test/test-jaeger.ts +++ b/packages/opencensus-exporter-jaeger/test/test-jaeger.ts @@ -93,7 +93,8 @@ describe('Jaeger Exporter', () => { testHostnameSeen = true; return; } - if (tag.key === JaegerTraceExporter.PROCESS_IP) { + if (tag.key === JaegerTraceExporter.PROCESS_IP && + tag.vType === 'STRING') { testProcessIpSeen = true; return; }