From 0caaf6a82980f3838d460b4dde9acf01b0348150 Mon Sep 17 00:00:00 2001
From: Bartlomiej Obecny <bobecny@gmail.com>
Date: Fri, 6 Nov 2020 14:02:04 +0100
Subject: [PATCH] chore: fixing the error in web about promise (#1641)

---
 examples/tracer-web/examples/user-interaction/index.js | 10 +++++-----
 .../src/CollectorExporterNodeBase.ts                   |  2 +-
 .../src/CollectorExporterNodeBase.ts                   |  2 +-
 .../platform/browser/CollectorExporterBrowserBase.ts   |  2 +-
 .../src/platform/node/CollectorExporterNodeBase.ts     |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/tracer-web/examples/user-interaction/index.js b/examples/tracer-web/examples/user-interaction/index.js
index a193a7d17b..816a2465c7 100644
--- a/examples/tracer-web/examples/user-interaction/index.js
+++ b/examples/tracer-web/examples/user-interaction/index.js
@@ -4,7 +4,7 @@ import { XMLHttpRequestPlugin } from '@opentelemetry/plugin-xml-http-request';
 import { UserInteractionPlugin } from '@opentelemetry/plugin-user-interaction';
 import { ZoneContextManager } from '@opentelemetry/context-zone';
 import { CollectorTraceExporter } from '@opentelemetry/exporter-collector';
-import { B3Propagator } from '@opentelemetry/core';
+import { B3Propagator } from '@opentelemetry/propagator-b3';
 
 const providerWithZone = new WebTracerProvider({
   plugins: [
@@ -12,10 +12,10 @@ const providerWithZone = new WebTracerProvider({
     new XMLHttpRequestPlugin({
       ignoreUrls: [/localhost/],
       propagateTraceHeaderCorsUrls: [
-        'http://localhost:8090'
-      ]
-    })
-  ]
+        'http://localhost:8090',
+      ],
+    }),
+  ],
 });
 
 providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
diff --git a/packages/opentelemetry-exporter-collector-grpc/src/CollectorExporterNodeBase.ts b/packages/opentelemetry-exporter-collector-grpc/src/CollectorExporterNodeBase.ts
index 5e6bf58291..6959600d9e 100644
--- a/packages/opentelemetry-exporter-collector-grpc/src/CollectorExporterNodeBase.ts
+++ b/packages/opentelemetry-exporter-collector-grpc/src/CollectorExporterNodeBase.ts
@@ -64,9 +64,9 @@ export abstract class CollectorExporterNodeBase<
         _onFinish();
       };
       const _onFinish = () => {
+        resolve();
         const index = this._sendingPromises.indexOf(promise);
         this._sendingPromises.splice(index, 1);
-        resolve();
       };
 
       this._send(this, objects, _onSuccess, _onError);
diff --git a/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts b/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts
index 5a4b3ce65d..ea6701ae78 100644
--- a/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts
+++ b/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts
@@ -44,9 +44,9 @@ export abstract class CollectorExporterNodeBase<
         _onFinish();
       };
       const _onFinish = () => {
+        resolve();
         const index = this._sendingPromises.indexOf(promise);
         this._sendingPromises.splice(index, 1);
-        resolve();
       };
 
       this._send(this, objects, _onSuccess, _onError);
diff --git a/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorExporterBrowserBase.ts b/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorExporterBrowserBase.ts
index 43349b79fc..180ddddf2f 100644
--- a/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorExporterBrowserBase.ts
+++ b/packages/opentelemetry-exporter-collector/src/platform/browser/CollectorExporterBrowserBase.ts
@@ -78,9 +78,9 @@ export abstract class CollectorExporterBrowserBase<
         _onFinish();
       };
       const _onFinish = () => {
+        resolve();
         const index = this._sendingPromises.indexOf(promise);
         this._sendingPromises.splice(index, 1);
-        resolve();
       };
 
       if (this._useXHR) {
diff --git a/packages/opentelemetry-exporter-collector/src/platform/node/CollectorExporterNodeBase.ts b/packages/opentelemetry-exporter-collector/src/platform/node/CollectorExporterNodeBase.ts
index e1f2831f6c..c086210850 100644
--- a/packages/opentelemetry-exporter-collector/src/platform/node/CollectorExporterNodeBase.ts
+++ b/packages/opentelemetry-exporter-collector/src/platform/node/CollectorExporterNodeBase.ts
@@ -67,9 +67,9 @@ export abstract class CollectorExporterNodeBase<
         _onFinish();
       };
       const _onFinish = () => {
+        resolve();
         const index = this._sendingPromises.indexOf(promise);
         this._sendingPromises.splice(index, 1);
-        resolve();
       };
       sendWithHttp(
         this,