From e11d30883827eae973290ad7a33203ba62a58377 Mon Sep 17 00:00:00 2001
From: Georg Pirklbauer <georg.pirklbauer@dynatrace.com>
Date: Fri, 29 Oct 2021 10:15:04 +0200
Subject: [PATCH] feat(opentelemetry-exporter-otlp-http): fix otlp http
 exporter

hold off on updating labels to attributes until the proto is updated
---
 .../src/transformMetrics.ts                               | 8 ++++----
 .../test/common/transformMetrics.test.ts                  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/src/transformMetrics.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/transformMetrics.ts
index 97a0e1ec3e4..df72505ad21 100644
--- a/experimental/packages/opentelemetry-exporter-otlp-http/src/transformMetrics.ts
+++ b/experimental/packages/opentelemetry-exporter-otlp-http/src/transformMetrics.ts
@@ -15,7 +15,7 @@
  */
 
 import { SpanAttributes, HrTime } from '@opentelemetry/api';
-import { Labels, ValueType } from '@opentelemetry/api-metrics';
+import { Attributes as Labels, ValueType } from '@opentelemetry/api-metrics';
 import * as core from '@opentelemetry/core';
 import {
   AggregatorKind,
@@ -56,7 +56,7 @@ export function toAggregationTemporality(
 }
 
 /**
- * Returns an DataPoint which can have integers or doublle values
+ * Returns an DataPoint which can have integers or double values
  * @param metric
  * @param startTime
  */
@@ -65,7 +65,7 @@ export function toDataPoint(
   startTime: number
 ): opentelemetryProto.metrics.v1.DataPoint {
   return {
-    labels: toCollectorLabels(metric.labels),
+    labels: toCollectorLabels(metric.attributes),
     value: metric.aggregator.toPoint().value as number,
     startTimeUnixNano: startTime,
     timeUnixNano: core.hrTimeToNanoseconds(
@@ -88,7 +88,7 @@ export function toHistogramPoint(
     timestamp: HrTime;
   };
   return {
-    labels: toCollectorLabels(metric.labels),
+    labels: toCollectorLabels(metric.attributes),
     sum: value.sum,
     count: value.count,
     startTimeUnixNano: startTime,
diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts
index 71ce5ab274e..f0747978fc6 100644
--- a/experimental/packages/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts
+++ b/experimental/packages/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts
@@ -158,7 +158,7 @@ describe('transformMetrics', () => {
       );
     });
 
-    it('should convert metric labels value to string', () => {
+    it('should convert metric attributes value to string', () => {
       const metric = transform.toCollectorMetric(
         {
           descriptor: {
@@ -168,7 +168,7 @@ describe('transformMetrics', () => {
             metricKind: 0,
             valueType: 0,
           },
-          labels: { foo: (1 as unknown) as string },
+          attributes: { foo: (1 as unknown) as string },
           aggregator: new SumAggregator(),
           resource: new Resource({}),
           aggregationTemporality: 0,