OpenTelemetry Exporter updating to latest dependencies (Azure#13854)

* Updated OT dependencies to 0.17.0

* Lint

* Not set log level on exporter side

* Lint

Author: hectorhdzg

common/config/rush/common-versions.json

@@ -45,7 +45,6 @@
     // when there is a new beta version which is being maintained in the repo.
     // Comment this out when the storage-blob releases a stable version.
     "@azure/storage-blob": ["^12.4.1"],
-
     "@azure/ms-rest-js": ["^2.0.0"],
     /**
      * For example, allow some projects to use an older TypeScript compiler
@@ -56,11 +55,10 @@
     // ]
     // Following is required to allow for backward compatibility with Event Processor Host Track 1
     "@azure/event-hubs": ["^2.1.4"],
-    "@opentelemetry/api": ["^0.16.0"],
+    "@opentelemetry/api": ["^0.17.0"],
     // Monitor: Allow node 10 types until Timeout / Timer conflict is resolved in OpenTelemetry repo
     // TODO: remove when released https://github.com/open-telemetry/opentelemetry-js/pull/1352
     "@types/node": ["^10.0.0"],
-
     // @azure/test-utils-perfstress should depend on lowest version of @azure/core-http for maximum compatibility, allowing test
     // projects to choose a higher version if desired.
     "@azure/core-http": ["^1.0.0"]

common/config/rush/pnpm-lock.yaml

@@ -2,6 +2,7 @@
 
 ## 1.0.0-beta.4 (Unreleased)
 
+- Open Telemetry dependency updates
 
 ## 1.0.0-beta.3 (2021-02-10)
 

sdk/monitor/monitor-opentelemetry-exporter/CHANGELOG.md

@@ -84,11 +84,11 @@
   },
   "dependencies": {
     "@azure/core-http": "^1.2.0",
-    "@opentelemetry/api": "^0.16.0",
-    "@opentelemetry/core": "^0.16.0",
-    "@opentelemetry/resources": "^0.16.0",
-    "@opentelemetry/semantic-conventions": "^0.16.0",
-    "@opentelemetry/tracing": "^0.16.0",
+    "@opentelemetry/api": "^0.17.0",
+    "@opentelemetry/core": "^0.17.0",
+    "@opentelemetry/resources": "^0.17.0",
+    "@opentelemetry/semantic-conventions": "^0.17.0",
+    "@opentelemetry/tracing": "^0.17.0",
     "tslib": "^2.0.0"
   },
   "sideEffects": false,

sdk/monitor/monitor-opentelemetry-exporter/package.json

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Logger } from "@opentelemetry/api";
 import {
   DEFAULT_BREEZE_API_VERSION,
   DEFAULT_BREEZE_ENDPOINT,
@@ -20,18 +19,9 @@ export interface AzureExporterConfig {
 
 export interface AzureExporterInternalConfig {
   instrumentationKey: string;
-
-  // Exporter
-  logger?: Logger;
-
-  // Channel
   batchSendRetryIntervalMs: number;
-
-  // Sender
   maxConsecutiveFailuresBeforeWarning: number;
-
   endpointUrl: string;
-
   apiVersion: ServiceApiVersion;
 }
 

sdk/monitor/monitor-opentelemetry-exporter/src/config.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { Logger } from "@opentelemetry/api";
-import { ConsoleLogger, LogLevel, ExportResult, ExportResultCode } from "@opentelemetry/core";
+import { diag } from "@opentelemetry/api";
+import { ExportResult, ExportResultCode } from "@opentelemetry/core";
 import { ReadableSpan, SpanExporter } from "@opentelemetry/tracing";
 import { RestError } from "@azure/core-http";
 import { ConnectionStringParser } from "../utils/connectionStringParser";
@@ -21,8 +21,6 @@ import { readableSpanToEnvelope } from "../utils/spanUtils";
 export class AzureMonitorTraceExporter implements SpanExporter {
   private readonly _persister: PersistentStorage;
 
-  private readonly _logger: Logger;
-
   private readonly _sender: Sender;
 
   private _retryTimer: NodeJS.Timer | null;
@@ -31,14 +29,13 @@ export class AzureMonitorTraceExporter implements SpanExporter {
 
   constructor(options: AzureExporterConfig = {}) {
     const connectionString = options.connectionString || process.env[ENV_CONNECTION_STRING];
-    this._logger = new ConsoleLogger(LogLevel.ERROR);
     this._options = {
       ...DEFAULT_EXPORTER_CONFIG
     };
     this._options.apiVersion = options.apiVersion ?? this._options.apiVersion;
 
     if (connectionString) {
-      const parsedConnectionString = ConnectionStringParser.parse(connectionString, this._logger);
+      const parsedConnectionString = ConnectionStringParser.parse(connectionString);
       this._options.instrumentationKey =
         parsedConnectionString.instrumentationkey ?? this._options.instrumentationKey;
       this._options.endpointUrl =
@@ -48,14 +45,14 @@ export class AzureMonitorTraceExporter implements SpanExporter {
     if (!this._options.instrumentationKey) {
       const message =
         "No instrumentation key or connection string was provided to the Azure Monitor Exporter";
-      this._logger.error(message);
+      diag.error(message);
       throw new Error(message);
     }
 
     this._sender = new HttpSender(this._options);
     this._persister = new FileSystemPersist(this._options);
     this._retryTimer = null;
-    this._logger.debug("AzureMonitorTraceExporter was successfully setup");
+    diag.debug("AzureMonitorTraceExporter was successfully setup");
   }
 
   private async _persist(envelopes: unknown[]): Promise<ExportResult> {
@@ -73,7 +70,7 @@ export class AzureMonitorTraceExporter implements SpanExporter {
   }
 
   private async exportEnvelopes(envelopes: Envelope[]): Promise<ExportResult> {
-    this._logger.info(`Exporting ${envelopes.length} envelope(s)`);
+    diag.info(`Exporting ${envelopes.length} envelope(s)`);
 
     try {
       const { result, statusCode } = await this._sender.send(envelopes);
@@ -90,7 +87,7 @@ export class AzureMonitorTraceExporter implements SpanExporter {
       } else if (statusCode && isRetriable(statusCode)) {
         // Failed -- persist failed data
         if (result) {
-          this._logger.info(result);
+          diag.info(result);
           const breezeResponse = JSON.parse(result) as BreezeResponse;
           const filteredEnvelopes = breezeResponse.errors.reduce(
             (acc, v) => [...acc, envelopes[v.index]],
@@ -110,13 +107,13 @@ export class AzureMonitorTraceExporter implements SpanExporter {
       }
     } catch (senderErr) {
       if (this._isNetworkError(senderErr)) {
-        this._logger.error(
+        diag.error(
           "Retrying due to transient client side error. Error message:",
           senderErr.message
         );
         return await this._persist(envelopes);
       } else {
-        this._logger.error(
+        diag.error(
           "Envelopes could not be exported and are not retriable. Error message:",
           senderErr.message
         );
@@ -129,15 +126,15 @@ export class AzureMonitorTraceExporter implements SpanExporter {
     spans: ReadableSpan[],
     resultCallback: (result: ExportResult) => void
   ): Promise<void> {
-    this._logger.info(`Exporting ${spans.length} span(s). Converting to envelopes...`);
+    diag.info(`Exporting ${spans.length} span(s). Converting to envelopes...`);
     const envelopes = spans.map((span) =>
-      readableSpanToEnvelope(span, this._options.instrumentationKey, this._logger)
+      readableSpanToEnvelope(span, this._options.instrumentationKey)
     );
     resultCallback(await this.exportEnvelopes(envelopes));
   }
 
   async shutdown(): Promise<void> {
-    this._logger.info("Azure Monitor Trace Exporter shutting down");
+    diag.info("Azure Monitor Trace Exporter shutting down");
     return this._sender.shutdown();
   }
 
@@ -148,7 +145,7 @@ export class AzureMonitorTraceExporter implements SpanExporter {
         await this._sender.send(envelopes);
       }
     } catch (err) {
-      this._logger.warn(`Failed to fetch persisted file`, err);
+      diag.warn(`Failed to fetch persisted file`, err);
     }
   }