feat(otlp-transformer): revert to only publishing scopeMetrics.

experimental/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts

@@ -42,7 +42,7 @@ export class OTLPTraceExporter
     );
   }
   convert(spans: ReadableSpan[]): IExportTraceServiceRequest {
-    return createExportTraceServiceRequest(spans, true, true);
+    return createExportTraceServiceRequest(spans, true);
   }
 
   getDefaultUrl(config: OTLPExporterConfigBase): string {

experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts

@@ -44,7 +44,7 @@ export class OTLPTraceExporter
   }
 
   convert(spans: ReadableSpan[]): IExportTraceServiceRequest {
-    return createExportTraceServiceRequest(spans, true, true);
+    return createExportTraceServiceRequest(spans, true);
   }
 
   getDefaultUrl(config: OTLPExporterNodeConfigBase): string {

experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts

@@ -56,8 +56,7 @@ class OTLPExporterBrowserProxy extends OTLPExporterBrowserBase<ResourceMetrics,
   convert(metrics: ResourceMetrics[]): IExportMetricsServiceRequest {
     return createExportMetricsServiceRequest(
       metrics,
-      this._aggregationTemporality,
-      true
+      this._aggregationTemporality
     );
   }
 }

experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts

@@ -46,8 +46,7 @@ class OTLPExporterNodeProxy extends OTLPExporterNodeBase<ResourceMetrics,
   convert(metrics: ResourceMetrics[]): IExportMetricsServiceRequest {
     return createExportMetricsServiceRequest(
       metrics,
-      this._aggregationTemporality,
-      true
+      this._aggregationTemporality
     );
   }
 

experimental/packages/otlp-transformer/src/metrics/index.ts

@@ -19,9 +19,8 @@ import { AggregationTemporality } from '@opentelemetry/sdk-metrics-base';
 import { toResourceMetrics } from './internal';
 
 export function createExportMetricsServiceRequest(resourceMetrics: ResourceMetrics[],
-  aggregationTemporality: AggregationTemporality,
-  json?: boolean): IExportMetricsServiceRequest {
+  aggregationTemporality: AggregationTemporality): IExportMetricsServiceRequest {
   return {
-    resourceMetrics: resourceMetrics.map(metrics => toResourceMetrics(metrics, aggregationTemporality, json))
+    resourceMetrics: resourceMetrics.map(metrics => toResourceMetrics(metrics, aggregationTemporality))
   };
 }

experimental/packages/otlp-transformer/src/metrics/internal.ts

@@ -28,31 +28,23 @@ import {
 import { toAttributes } from '../common/internal';
 import {
   EAggregationTemporality,
-  IHistogramDataPoint, IInstrumentationLibraryMetrics,
+  IHistogramDataPoint,
   IMetric,
   INumberDataPoint,
   IResourceMetrics,
   IScopeMetrics
 } from './types';
 
 export function toResourceMetrics(resourceMetrics: ResourceMetrics,
-  aggregationTemporality: AggregationTemporality,
-  json?: boolean): IResourceMetrics {
-  const transformedMetrics: IResourceMetrics = {
+  aggregationTemporality: AggregationTemporality): IResourceMetrics {
+  return {
     resource: {
       attributes: toAttributes(resourceMetrics.resource.attributes),
       droppedAttributesCount: 0
     },
     schemaUrl: undefined, // TODO: Schema Url does not exist yet in the SDK.
     scopeMetrics: toScopeMetrics(resourceMetrics.instrumentationLibraryMetrics, aggregationTemporality)
   };
-
-  if (json) {
-    transformedMetrics.instrumentationLibraryMetrics =
-      toInstrumentationLibraryMetrics(resourceMetrics.instrumentationLibraryMetrics, aggregationTemporality);
-  }
-
-  return transformedMetrics;
 }
 
 export function toScopeMetrics(instrumentationLibraryMetrics: InstrumentationLibraryMetrics[],
@@ -70,21 +62,6 @@ export function toScopeMetrics(instrumentationLibraryMetrics: InstrumentationLib
   }));
 }
 
-export function toInstrumentationLibraryMetrics(instrumentationLibraryMetrics: InstrumentationLibraryMetrics[],
-  aggregationTemporality: AggregationTemporality): IInstrumentationLibraryMetrics[]{
-  return Array.from(instrumentationLibraryMetrics.map(metrics => {
-    const resultMetrics : IInstrumentationLibraryMetrics = {
-      instrumentationLibrary: {
-        name: metrics.instrumentationLibrary.name,
-        version: metrics.instrumentationLibrary.version,
-      },
-      metrics: metrics.metrics.map(metricData => toMetric(metricData, aggregationTemporality)),
-      schemaUrl: metrics.instrumentationLibrary.schemaUrl
-    };
-    return resultMetrics;
-  }));
-}
-
 export function toMetric(metricData: MetricData, metricTemporality: AggregationTemporality): IMetric {
   const out: IMetric = {
     name: metricData.descriptor.name,

experimental/packages/otlp-transformer/src/metrics/types.ts

@@ -15,7 +15,6 @@
  */
 import { IInstrumentationScope, IKeyValue } from '../common/types';
 import { IResource } from '../resource/types';
-import { InstrumentationLibrary } from '@opentelemetry/core';
 
 /** Properties of an ExportMetricsServiceRequest. */
 export interface IExportMetricsServiceRequest {
@@ -24,25 +23,22 @@ export interface IExportMetricsServiceRequest {
   resourceMetrics: IResourceMetrics[]
 }
 
-
 /** Properties of a ResourceMetrics. */
 export interface IResourceMetrics {
+
   /** ResourceMetrics resource */
   resource?: IResource;
 
   /** ResourceMetrics scopeMetrics */
   scopeMetrics: IScopeMetrics[]
 
-  /** ResourceMetrics instrumentationLibraryMetrics */
-  instrumentationLibraryMetrics?: IInstrumentationLibraryMetrics[]
-
   /** ResourceMetrics schemaUrl */
   schemaUrl?: string;
 }
 
-
 /** Properties of an IScopeMetrics. */
 export interface IScopeMetrics {
+
   /** ScopeMetrics scope */
   scope?: IInstrumentationScope;
 
@@ -53,20 +49,6 @@ export interface IScopeMetrics {
   schemaUrl?: string;
 }
 
-/** Properties of an IInstrumentationLibraryMetrics. */
-export interface IInstrumentationLibraryMetrics {
-  /**
-   * InstrumentationLibraryMetrics instrumentationLibrary
-   */
-  instrumentationLibrary?: InstrumentationLibrary
-
-  /** InstrumentationLibraryMetrics metrics */
-  metrics: IMetric[];
-
-  /** InstrumentationLibraryMetrics schemaUrl */
-  schemaUrl?: string;
-}
-
 /** Properties of a Metric. */
 export interface IMetric {
 
@@ -299,8 +281,7 @@ export interface IExemplar {
  * AggregationTemporality defines how a metric aggregator reports aggregated
  * values. It describes how those values relate to the time interval over
  * which they are aggregated.
- */
-export const enum EAggregationTemporality {
+ */export const enum EAggregationTemporality {
   /* UNSPECIFIED is the default AggregationTemporality, it MUST not be used. */
   AGGREGATION_TEMPORALITY_UNSPECIFIED = 0,
 

experimental/packages/otlp-transformer/src/trace/index.ts

@@ -17,11 +17,11 @@ import type { Resource } from '@opentelemetry/resources';
 import type { ReadableSpan } from '@opentelemetry/sdk-trace-base';
 import { toAttributes } from '../common/internal';
 import { sdkSpanToOtlpSpan } from './internal';
-import { IExportTraceServiceRequest, IInstrumentationLibrarySpans, IResourceSpans, IScopeSpans } from './types';
+import { IExportTraceServiceRequest, IResourceSpans, IScopeSpans } from './types';
 
-export function createExportTraceServiceRequest(spans: ReadableSpan[], useHex?: boolean, json?: boolean): IExportTraceServiceRequest {
+export function createExportTraceServiceRequest(spans: ReadableSpan[], useHex?: boolean): IExportTraceServiceRequest {
   return {
-    resourceSpans: spanRecordsToResourceSpans(spans, useHex, json)
+    resourceSpans: spanRecordsToResourceSpans(spans, useHex)
   };
 }
 
@@ -50,7 +50,7 @@ function createResourceMap(readableSpans: ReadableSpan[]) {
   return resourceMap;
 }
 
-function spanRecordsToResourceSpans(readableSpans: ReadableSpan[], useHex?: boolean, json?: boolean): IResourceSpans[] {
+function spanRecordsToResourceSpans(readableSpans: ReadableSpan[], useHex?: boolean): IResourceSpans[] {
   const resourceMap = createResourceMap(readableSpans);
   const out: IResourceSpans[] = [];
 
@@ -59,7 +59,6 @@ function spanRecordsToResourceSpans(readableSpans: ReadableSpan[], useHex?: bool
   while (!entry.done) {
     const [resource, ilmMap] = entry.value;
     const scopeResourceSpans: IScopeSpans[] = [];
-    const instrumentationLibraryResourceSpans: IInstrumentationLibrarySpans[] = [];
     const ilmIterator = ilmMap.values();
     let ilmEntry = ilmIterator.next();
     while (!ilmEntry.done) {
@@ -73,14 +72,6 @@ function spanRecordsToResourceSpans(readableSpans: ReadableSpan[], useHex?: bool
           spans: spans,
           schemaUrl: schemaUrl
         });
-
-        if (json) {
-          instrumentationLibraryResourceSpans.push({
-            instrumentationLibrary: { name, version },
-            spans: spans,
-            schemaUrl: schemaUrl
-          });
-        }
       }
       ilmEntry = ilmIterator.next();
     }
@@ -94,10 +85,6 @@ function spanRecordsToResourceSpans(readableSpans: ReadableSpan[], useHex?: bool
       schemaUrl: undefined
     };
 
-    if (json) {
-      transformedSpans.instrumentationLibrarySpans = instrumentationLibraryResourceSpans;
-    }
-
     out.push(transformedSpans);
     entry = entryIterator.next();
   }

experimental/packages/otlp-transformer/src/trace/types.ts

@@ -33,9 +33,6 @@ export interface IResourceSpans {
   /** ResourceSpans scopeSpans */
   scopeSpans: IScopeSpans[];
 
-  /** ResourceSpans instrumentationLibrarySpans */
-  instrumentationLibrarySpans?: IScopeSpans[];
-
   /** ResourceSpans schemaUrl */
   schemaUrl?: string;
 }
@@ -53,19 +50,6 @@ export interface IScopeSpans {
   schemaUrl?: (string | null);
 }
 
-/** Properties of an InstrumentationLibrarySpans. */
-export interface IInstrumentationLibrarySpans {
-
-  /** InstrumentationLibrarySpans scope */
-  instrumentationLibrary?: IInstrumentationScope;
-
-  /** InstrumentationLibrarySpans spans */
-  spans?: ISpan[]
-
-  /** InstrumentationLibrarySpans schemaUrl */
-  schemaUrl?: (string | null);
-}
-
 /** Properties of a Span. */
 export interface ISpan {
   /** Span traceId */