fix: remove attributes from OTLPExporterConfigBase

Remove the optional attributes property from OTLPExporterConfigBase because it's not part of the spec and it's actually not exported at all.
open-telemetry · May 24, 2022 · be3df87 · be3df87
1 parent 610808d
commit be3df87
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 20 deletions.
diff --git a/experimental/packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts
@@ -57,7 +57,6 @@ describe('OTLPTraceExporter - web', () => {
       onInitSpy = sinon.stub(OTLPTraceExporter.prototype, 'onInit');
       collectorExporterConfig = {
         hostname: 'foo',
-        attributes: {},
         url: 'http://foo.bar.com',
       };
       collectorTraceExporter = new OTLPTraceExporter(collectorExporterConfig);
@@ -86,7 +85,6 @@ describe('OTLPTraceExporter - web', () => {
     beforeEach(() => {
       collectorExporterConfig = {
         hostname: 'foo',
-        attributes: {},
         url: 'http://foo.bar.com',
       };
     });

diff --git a/experimental/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts
@@ -195,7 +195,6 @@ describe('OTLPTraceExporter - node with json over http', () => {
           foo: 'bar',
         },
         hostname: 'foo',
-        attributes: {},
         url: 'http://foo.bar.com',
         keepAlive: true,
         httpAgentOptions: { keepAliveMsecs: 2000 },
@@ -394,7 +393,6 @@ describe('OTLPTraceExporter - node with json over http', () => {
           foo: 'bar',
         },
         hostname: 'foo',
-        attributes: {},
         url: 'http://foo.bar.com',
         keepAlive: true,
         compression: CompressionAlgorithm.GZIP,
@@ -469,7 +467,6 @@ describe('OTLPTraceExporter - node with json over http', () => {
           foo: 'bar',
         },
         hostname: 'foo',
-        attributes: {},
         url: 'http://foo.bar.com',
         keepAlive: true,
         httpAgentOptions: { keepAliveMsecs: 2000 },

diff --git a/experimental/packages/exporter-trace-otlp-proto/test/OTLPTraceExporter.test.ts b/experimental/packages/exporter-trace-otlp-proto/test/OTLPTraceExporter.test.ts
@@ -145,7 +145,6 @@ describe('OTLPTraceExporter - node with proto over http', () => {
           foo: 'bar',
         },
         hostname: 'foo',
-        attributes: {},
         url: 'http://foo.bar.com',
         keepAlive: true,
         httpAgentOptions: { keepAliveMsecs: 2000 },
@@ -273,7 +272,6 @@ describe('OTLPTraceExporter - node with proto over http', () => {
           foo: 'bar',
         },
         hostname: 'foo',
-        attributes: {},
         url: 'http://foo.bar.com',
         keepAlive: true,
         compression: CompressionAlgorithm.GZIP,

diff --git a/...ages/opentelemetry-exporter-metrics-otlp-http/test/common/CollectorMetricExporter.test.ts b/...ages/opentelemetry-exporter-metrics-otlp-http/test/common/CollectorMetricExporter.test.ts
@@ -62,7 +62,6 @@ describe('OTLPMetricExporter - common', () => {
       onInitSpy = sinon.stub(OTLPMetricExporter.prototype, 'onInit');
       collectorExporterConfig = {
         hostname: 'foo',
-        attributes: {},
         url: 'http://foo.bar.com',
       };
       collectorExporter = new OTLPMetricExporter(collectorExporterConfig);
@@ -182,7 +181,6 @@ describe('OTLPMetricExporter - common', () => {
       );
       collectorExporterConfig = {
         hostname: 'foo',
-        attributes: {},
         url: 'http://foo.bar.com',
       };
       collectorExporter = new OTLPMetricExporter(collectorExporterConfig);

diff --git a/...ckages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts b/...ckages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts
@@ -197,7 +197,6 @@ describe('OTLPMetricExporter - node with json over http', () => {
           foo: 'bar',
         },
         hostname: 'foo',
-        attributes: {},
         url: 'http://foo.bar.com',
         keepAlive: true,
         httpAgentOptions: { keepAliveMsecs: 2000 },

diff --git a/...mental/packages/opentelemetry-exporter-metrics-otlp-proto/test/OTLPMetricExporter.test.ts b/...mental/packages/opentelemetry-exporter-metrics-otlp-proto/test/OTLPMetricExporter.test.ts
@@ -150,7 +150,6 @@ describe('OTLPMetricExporter - node with proto over http', () => {
           foo: 'bar',
         },
         hostname: 'foo',
-        attributes: {},
         url: 'http://foo.bar.com',
         keepAlive: true,
         httpAgentOptions: { keepAliveMsecs: 2000 },

diff --git a/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts b/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { SpanAttributes, diag } from '@opentelemetry/api';
+import { diag } from '@opentelemetry/api';
 import { ExportResult, ExportResultCode, BindOnceFuture } from '@opentelemetry/core';
 import {
   OTLPExporterError,
@@ -33,7 +33,6 @@ export abstract class OTLPExporterBase<
   > {
   public readonly url: string;
   public readonly hostname: string | undefined;
-  public readonly attributes?: SpanAttributes;
   public readonly timeoutMillis: number;
   protected _concurrencyLimit: number;
   protected _sendingPromises: Promise<unknown>[] = [];
@@ -48,8 +47,6 @@ export abstract class OTLPExporterBase<
       this.hostname = config.hostname;
     }
 
-    this.attributes = config.attributes;
-
     this.shutdown = this.shutdown.bind(this);
     this._shutdownOnce = new BindOnceFuture(this._shutdown, this);
 

diff --git a/experimental/packages/otlp-exporter-base/src/types.ts b/experimental/packages/otlp-exporter-base/src/types.ts
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import { SpanAttributes } from '@opentelemetry/api';
-
 /**
  * Interface for handling error
  */
@@ -49,7 +47,6 @@ export interface ExportServiceError {
 export interface OTLPExporterConfigBase {
   headers?: Partial<Record<string, unknown>>;
   hostname?: string;
-  attributes?: SpanAttributes;
   url?: string;
   concurrencyLimit?: number;
   /** Maximum time the OTLP exporter will wait for each batch export.

diff --git a/experimental/packages/otlp-exporter-base/test/common/CollectorExporter.test.ts b/experimental/packages/otlp-exporter-base/test/common/CollectorExporter.test.ts
@@ -73,7 +73,6 @@ describe('OTLPTraceExporter - common', () => {
       onInitSpy = sinon.stub(OTLPTraceExporter.prototype, 'onInit');
       collectorExporterConfig = {
         hostname: 'foo',
-        attributes: {},
         url: 'http://foo.bar.com',
       };
       collectorExporter = new OTLPTraceExporter(collectorExporterConfig);
@@ -207,7 +206,6 @@ describe('OTLPTraceExporter - common', () => {
       );
       collectorExporterConfig = {
         hostname: 'foo',
-        attributes: {},
         url: 'http://foo.bar.com',
       };
       collectorExporter = new OTLPTraceExporter(collectorExporterConfig);