fix collector resource

open-telemetry · Mar 12, 2020 · b7c7dc0 · b7c7dc0
1 parent 2c50036
commit b7c7dc0
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 26 deletions.
diff --git a/packages/opentelemetry-exporter-collector/src/CollectorExporter.ts b/packages/opentelemetry-exporter-collector/src/CollectorExporter.ts
@@ -19,7 +19,7 @@ import { NoopLogger } from '@opentelemetry/core';
 import { ReadableSpan, SpanExporter } from '@opentelemetry/tracing';
 import { Attributes, Logger } from '@opentelemetry/api';
 import * as collectorTypes from './types';
-import { toCollectorSpan } from './transform';
+import { toCollectorSpan, toCollectorResource } from './transform';
 import { onInit, onShutdown, sendSpans } from './platform/index';
 import { Resource } from '@opentelemetry/resources';
 
@@ -101,8 +101,9 @@ export class CollectorExporter implements SpanExporter {
           toCollectorSpan(span)
         );
         this.logger.debug('spans to be sent', spansToBeSent);
-        const resource =
-          spansToBeSent.length > 0 ? spans[0].resource : Resource.empty();
+        const resource = toCollectorResource(
+          spansToBeSent.length > 0 ? spans[0].resource : Resource.empty()
+        );
 
         // Send spans to [opentelemetry collector]{@link https://github.com/open-telemetry/opentelemetry-collector}
         // it will use the appropriate transport layer automatically depends on platform

diff --git a/packages/opentelemetry-exporter-collector/src/platform/browser/sendSpans.ts b/packages/opentelemetry-exporter-collector/src/platform/browser/sendSpans.ts
@@ -19,7 +19,6 @@ import { Logger } from '@opentelemetry/api';
 import { CollectorExporter } from '../../CollectorExporter';
 import * as collectorTypes from '../../types';
 import { VERSION } from '../../version';
-import { Resource } from '@opentelemetry/resources';
 
 /**
  * function that is called once when {@link ExporterCollector} is initialised
@@ -51,7 +50,7 @@ export function sendSpans(
   onSuccess: () => void,
   onError: (status?: number) => void,
   collectorExporter: CollectorExporter,
-  resource: Resource
+  resource: collectorTypes.Resource
 ) {
   const exportTraceServiceRequest: collectorTypes.ExportTraceServiceRequest = {
     node: {
@@ -69,7 +68,7 @@ export function sendSpans(
       },
       attributes: collectorExporter.attributes,
     },
-    resource: resource.labels,
+    resource,
     spans,
   };
 

diff --git a/packages/opentelemetry-exporter-collector/src/platform/node/sendSpans.ts b/packages/opentelemetry-exporter-collector/src/platform/node/sendSpans.ts
@@ -55,27 +55,13 @@ export function sendSpans(
   onSuccess: () => void,
   onError: (status?: number) => void,
   collectorExporter: CollectorExporter,
-  resource: Resource
+  resource: collectorTypes.Resource
 ) {
-  const exportTraceServiceRequest: collectorTypes.ExportTraceServiceRequest = {
-    node: {
-      identifier: {
-        hostName: collectorExporter.hostName,
-        startTimestamp: core.hrTimeToTimeStamp(core.hrTime()),
-      },
-      libraryInfo: {
-        language: collectorTypes.LibraryInfoLanguage.NODE_JS,
-        coreLibraryVersion: core.VERSION,
-        exporterVersion: VERSION,
-      },
-      serviceInfo: {
-        name: collectorExporter.serviceName,
-      },
-      attributes: collectorExporter.attributes,
-    },
-    resource: resource.labels,
+  const exportTraceServiceRequest = toCollectorTraceServiceRequest(
     spans,
-  };
+    collectorExporter,
+    resource
+  );
   const body = JSON.stringify(exportTraceServiceRequest);
   const parsedUrl = url.parse(collectorExporter.url);
 
@@ -108,3 +94,29 @@ export function sendSpans(
   req.write(body);
   req.end();
 }
+
+export function toCollectorTraceServiceRequest(
+  spans: collectorTypes.Span[],
+  collectorExporter: CollectorExporter,
+  resource: collectorTypes.Resource
+): collectorTypes.ExportTraceServiceRequest {
+  return {
+    node: {
+      identifier: {
+        hostName: collectorExporter.hostName,
+        startTimestamp: core.hrTimeToTimeStamp(core.hrTime()),
+      },
+      libraryInfo: {
+        language: collectorTypes.LibraryInfoLanguage.NODE_JS,
+        coreLibraryVersion: core.VERSION,
+        exporterVersion: VERSION,
+      },
+      serviceInfo: {
+        name: collectorExporter.serviceName,
+      },
+      attributes: collectorExporter.attributes,
+    },
+    resource,
+    spans,
+  };
+}
diff --git a/packages/opentelemetry-exporter-collector/src/transform.ts b/packages/opentelemetry-exporter-collector/src/transform.ts
@@ -18,6 +18,7 @@ import { hexToBase64, hrTimeToTimeStamp } from '@opentelemetry/core';
 import { ReadableSpan } from '@opentelemetry/tracing';
 import { Attributes, Link, TimedEvent, TraceState } from '@opentelemetry/api';
 import * as collectorTypes from './types';
+import { Resource } from '@opentelemetry/resources';
 
 const OT_MAX_STRING_LENGTH = 128;
 
@@ -201,6 +202,21 @@ export function toCollectorSpan(span: ReadableSpan): collectorTypes.Span {
   };
 }
 
+/**
+ * converts span resource
+ * @param resource
+ */
+export function toCollectorResource(
+  resource: Resource
+): collectorTypes.Resource {
+  const labels: { [key: string]: string } = {};
+  Object.keys(resource.labels).forEach(
+    name => (labels[name] = String(resource.labels[name]))
+  );
+  // @TODO: add type support
+  return { labels };
+}
+
 /**
  * @param traceState
  */

diff --git a/packages/opentelemetry-exporter-collector/test/common/transform.test.ts b/packages/opentelemetry-exporter-collector/test/common/transform.test.ts
@@ -18,6 +18,7 @@ import { Attributes, TimedEvent } from '@opentelemetry/api';
 import * as assert from 'assert';
 import * as transform from '../../src/transform';
 import { ensureSpanIsCorrect, mockedReadableSpan } from '../helper';
+import { Resource } from '@opentelemetry/resources';
 
 describe('transform', () => {
   describe('toCollectorTruncatableString', () => {
@@ -149,4 +150,23 @@ describe('transform', () => {
       ensureSpanIsCorrect(transform.toCollectorSpan(mockedReadableSpan));
     });
   });
+
+  describe('toCollectorResource', () => {
+    it('should convert resource', () => {
+      const resource = transform.toCollectorResource(
+        new Resource({
+          service: 'ui',
+          version: 1.0,
+          success: true,
+        })
+      );
+      assert.deepStrictEqual(resource, {
+        labels: {
+          service: 'ui',
+          version: '1',
+          success: 'true',
+        },
+      });
+    });
+  });
 });
diff --git a/packages/opentelemetry-exporter-collector/test/helper.ts b/packages/opentelemetry-exporter-collector/test/helper.ts
@@ -69,7 +69,11 @@ export const mockedReadableSpan: ReadableSpan = {
     },
   ],
   duration: [0, 8885000],
-  resource: Resource.empty(),
+  resource: new Resource({
+    service: 'ui',
+    version: 1,
+    cost: 112.12,
+  }),
 };
 
 export function ensureSpanIsCorrect(span: collectorTypes.Span) {