rebase with open-telemetry#846

mayurkale22 · Mar 11, 2020 · 1fbb2ab · 1fbb2ab
1 parent 60ceed1
commit 1fbb2ab
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/packages/opentelemetry-exporter-collector/package.json b/packages/opentelemetry-exporter-collector/package.json
@@ -50,7 +50,6 @@
   },
   "devDependencies": {
     "@babel/core": "^7.6.0",
-    "@opentelemetry/resources": "^0.4.0",
     "@types/mocha": "^5.2.5",
     "@types/node": "^12.6.8",
     "@types/sinon": "^7.0.13",

diff --git a/packages/opentelemetry-exporter-stackdriver-trace/package.json b/packages/opentelemetry-exporter-stackdriver-trace/package.json
@@ -41,7 +41,6 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/resources": "^0.4.0",
     "@types/mocha": "^5.2.7",
     "@types/nock": "^11.1.0",
     "@types/node": "^12.6.9",

diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json
@@ -39,7 +39,6 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/resources": "^0.4.0",
     "@types/mocha": "^5.2.7",
     "@types/nock": "^10.0.3",
     "@types/node": "^12.6.9",

diff --git a/packages/opentelemetry-exporter-zipkin/test/transform.test.ts b/packages/opentelemetry-exporter-zipkin/test/transform.test.ts
@@ -21,6 +21,7 @@ import {
   NoopLogger,
   hrTimeToMicroseconds,
   hrTimeDuration,
+  VERSION,
 } from '@opentelemetry/core';
 import {
   toZipkinSpan,
@@ -48,7 +49,6 @@ const DUMMY_RESOUCE = new Resource({
   version: 1,
   cost: 112.12,
 });
-const EMPTY_RESOUCE = Resource.empty();
 
 describe('transform', () => {
   describe('toZipkinSpan', () => {
@@ -94,6 +94,9 @@ describe('transform', () => {
           key1: 'value1',
           key2: 'value2',
           [statusCodeTagName]: 'OK',
+          'telemetry.sdk.language': 'nodejs',
+          'telemetry.sdk.name': 'opentelemetry',
+          'telemetry.sdk.version': VERSION,
         },
         timestamp: hrTimeToMicroseconds(span.startTime),
         traceId: span.spanContext.traceId,
@@ -128,6 +131,9 @@ describe('transform', () => {
         parentId: undefined,
         tags: {
           [statusCodeTagName]: 'OK',
+          'telemetry.sdk.language': 'nodejs',
+          'telemetry.sdk.name': 'opentelemetry',
+          'telemetry.sdk.version': VERSION,
         },
         timestamp: hrTimeToMicroseconds(span.startTime),
         traceId: span.spanContext.traceId,
@@ -167,6 +173,9 @@ describe('transform', () => {
           parentId: undefined,
           tags: {
             [statusCodeTagName]: 'OK',
+            'telemetry.sdk.language': 'nodejs',
+            'telemetry.sdk.name': 'opentelemetry',
+            'telemetry.sdk.version': VERSION,
           },
           timestamp: hrTimeToMicroseconds(span.startTime),
           traceId: span.spanContext.traceId,
@@ -226,7 +235,7 @@ describe('transform', () => {
         span.status,
         statusCodeTagName,
         statusDescriptionTagName,
-        EMPTY_RESOUCE
+        Resource.empty()
       );
 
       assert.deepStrictEqual(tags, {

diff --git a/packages/opentelemetry-resources/src/Resource.ts b/packages/opentelemetry-resources/src/Resource.ts
@@ -66,10 +66,4 @@ export class Resource {
     const mergedLabels = Object.assign({}, other.labels, this.labels);
     return new Resource(mergedLabels);
   }
-
-  static empty(): Resource {
-    return EMPTY_RESOURCE;
-  }
 }
-
-const EMPTY_RESOURCE = new Resource({});