[Monitor Exporter] Move the Monitor package to use core-rest-pipeline (…

…#16513) * fix pipeline * init commit : update to use core-rest-pipeline * remove 307 handling * address comments * format * use custom redirect policy * format * udpate
Azure · Jul 29, 2021 · e402e50 · e402e50
1 parent 95487e0
commit e402e50
Show file tree

Hide file tree

Showing 13 changed files with 616 additions and 745 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/sdk/monitor/monitor-opentelemetry-exporter/package.json b/sdk/monitor/monitor-opentelemetry-exporter/package.json
@@ -108,7 +108,8 @@
     "typescript": "~4.2.0"
   },
   "dependencies": {
-    "@azure/core-http": "^2.0.0",
+    "@azure/core-client": "^1.0.0",
+    "@azure/core-rest-pipeline": "^1.1.0",
     "@opentelemetry/api": "^1.0.1",
     "@opentelemetry/core": "^0.22.0",
     "@opentelemetry/resources": "^0.22.0",

diff --git a/sdk/monitor/monitor-opentelemetry-exporter/src/export/trace.ts b/sdk/monitor/monitor-opentelemetry-exporter/src/export/trace.ts
@@ -4,7 +4,7 @@
 import { diag } from "@opentelemetry/api";
 import { ExportResult, ExportResultCode } from "@opentelemetry/core";
 import { ReadableSpan, SpanExporter } from "@opentelemetry/tracing";
-import { RestError } from "@azure/core-http";
+import { RestError } from "@azure/core-rest-pipeline";
 import { ConnectionStringParser } from "../utils/connectionStringParser";
 import { HttpSender, FileSystemPersist } from "../platform";
 import {

diff --git a/sdk/monitor/monitor-opentelemetry-exporter/src/generated/applicationInsightsClient.ts b/sdk/monitor/monitor-opentelemetry-exporter/src/generated/applicationInsightsClient.ts
@@ -6,13 +6,14 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import * as coreHttp from "@azure/core-http";
+import * as coreClient from "@azure/core-client";
 import * as Parameters from "./models/parameters";
 import * as Mappers from "./models/mappers";
 import { ApplicationInsightsClientContext } from "./applicationInsightsClientContext";
 import {
   ApplicationInsightsClientOptionalParams,
   TelemetryItem,
+  ApplicationInsightsClientTrackOptionalParams,
   ApplicationInsightsClientTrackResponse
 } from "./models";
 
@@ -32,22 +33,15 @@ export class ApplicationInsightsClient extends ApplicationInsightsClientContext
    */
   track(
     body: TelemetryItem[],
-    options?: coreHttp.OperationOptions
+    options?: ApplicationInsightsClientTrackOptionalParams
   ): Promise<ApplicationInsightsClientTrackResponse> {
-    const operationOptions: coreHttp.RequestOptionsBase = coreHttp.operationOptionsToRequestOptionsBase(
-      options || {}
-    );
-    return this.sendOperationRequest(
-      { body, options: operationOptions },
-      trackOperationSpec
-    ) as Promise<ApplicationInsightsClientTrackResponse>;
+    return this.sendOperationRequest({ body, options }, trackOperationSpec);
   }
 }
 // Operation Specifications
+const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
 
-const serializer = new coreHttp.Serializer(Mappers, /* isXml */ false);
-
-const trackOperationSpec: coreHttp.OperationSpec = {
+const trackOperationSpec: coreClient.OperationSpec = {
   path: "/track",
   httpMethod: "POST",
   responses: {
@@ -58,19 +52,24 @@ const trackOperationSpec: coreHttp.OperationSpec = {
       bodyMapper: Mappers.TrackResponse
     },
     400: {
-      bodyMapper: Mappers.TrackResponse
+      bodyMapper: Mappers.TrackResponse,
+      isError: true
     },
     402: {
-      bodyMapper: Mappers.TrackResponse
+      bodyMapper: Mappers.TrackResponse,
+      isError: true
     },
     429: {
-      bodyMapper: Mappers.TrackResponse
+      bodyMapper: Mappers.TrackResponse,
+      isError: true
     },
     500: {
-      bodyMapper: Mappers.TrackResponse
+      bodyMapper: Mappers.TrackResponse,
+      isError: true
     },
     503: {
-      bodyMapper: Mappers.TrackResponse
+      bodyMapper: Mappers.TrackResponse,
+      isError: true
     }
   },
   requestBody: Parameters.body,

diff --git a/sdk/monitor/monitor-opentelemetry-exporter/src/generated/applicationInsightsClientContext.ts b/sdk/monitor/monitor-opentelemetry-exporter/src/generated/applicationInsightsClientContext.ts
@@ -6,13 +6,10 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import * as coreHttp from "@azure/core-http";
+import * as coreClient from "@azure/core-client";
 import { ApplicationInsightsClientOptionalParams } from "./models";
 
-const packageName = "@azure/monitor-opentelemetry-exporter";
-const packageVersion = "1.0.0-beta.2";
-
-export class ApplicationInsightsClientContext extends coreHttp.ServiceClient {
+export class ApplicationInsightsClientContext extends coreClient.ServiceClient {
   host: string;
 
   /**
@@ -24,17 +21,25 @@ export class ApplicationInsightsClientContext extends coreHttp.ServiceClient {
     if (!options) {
       options = {};
     }
-
-    if (!options.userAgent) {
-      const defaultUserAgent = coreHttp.getDefaultUserAgentValue();
-      options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
-    }
-
-    super(undefined, options);
-
-    this.requestContentType = "application/json; charset=utf-8";
-
-    this.baseUri = options.endpoint || "{Host}/v2";
+    const defaults: ApplicationInsightsClientOptionalParams = {
+      requestContentType: "application/json; charset=utf-8"
+    };
+
+    const packageDetails = `azsdk-js-monitor-opentelemetry-exporter/1.0.0-beta.4`;
+    const userAgentPrefix =
+      options.userAgentOptions && options.userAgentOptions.userAgentPrefix
+        ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
+        : `${packageDetails}`;
+
+    const optionsWithDefaults = {
+      ...defaults,
+      ...options,
+      userAgentOptions: {
+        userAgentPrefix
+      },
+      baseUri: options.endpoint || "{Host}/v2"
+    };
+    super(optionsWithDefaults);
 
     // Assigning values to Constant parameters
     this.host = options.host || "https://dc.services.visualstudio.com";