chore: fixing the error in web about promise (#1641)

open-telemetry · Nov 6, 2020 · 0caaf6a · 0caaf6a
1 parent dec432d
commit 0caaf6a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/examples/tracer-web/examples/user-interaction/index.js b/examples/tracer-web/examples/user-interaction/index.js
@@ -4,18 +4,18 @@ 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: [
     new UserInteractionPlugin(),
     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
@@ -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
@@ -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/...ges/opentelemetry-exporter-collector/src/platform/browser/CollectorExporterBrowserBase.ts b/...ges/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
@@ -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,