[keyvault] Change over to using core-tracing (Azure#13949)

Removing the createSpan from keyvault-common (each package now has a simple version derived from core-tracing).

Author: richardpark-msft

sdk/keyvault/keyvault-admin/src/accessControlClient.ts

@@ -42,7 +42,7 @@ import {
 } from "./accessControlModels";
 
 import { SDK_VERSION, LATEST_API_VERSION } from "./constants";
-import { createSpan, setParentSpan } from "../../keyvault-common/src";
+import { createSpan } from "./tracing";
 import { mappings } from "./mappings";
 import { logger } from "./log";
 
@@ -146,7 +146,7 @@ export class KeyVaultAccessControlClient {
     principalId: string,
     options?: CreateRoleAssignmentOptions
   ): Promise<KeyVaultRoleAssignment> {
-    const span = createSpan("createRoleAssignment", options);
+    const { span, updatedOptions } = createSpan("createRoleAssignment", options);
 
     if (!(roleScope && name && roleDefinitionId && principalId)) {
       throw new Error(
@@ -166,7 +166,7 @@ export class KeyVaultAccessControlClient {
             principalId
           }
         },
-        setParentSpan(span, options)
+        updatedOptions
       );
     } finally {
       span.end();
@@ -195,15 +195,15 @@ export class KeyVaultAccessControlClient {
     name: string,
     options?: DeleteRoleAssignmentOptions
   ): Promise<KeyVaultRoleAssignment> {
-    const span = createSpan("deleteRoleAssignment", options);
+    const { span, updatedOptions } = createSpan("deleteRoleAssignment", options);
 
     let response: RoleAssignmentsDeleteResponse;
     try {
       response = await this.client.roleAssignments.delete(
         this.vaultUrl,
         roleScope,
         name,
-        setParentSpan(span, options)
+        updatedOptions
       );
     } finally {
       span.end();
@@ -232,15 +232,15 @@ export class KeyVaultAccessControlClient {
     name: string,
     options?: GetRoleAssignmentOptions
   ): Promise<KeyVaultRoleAssignment> {
-    const span = createSpan("getRoleAssignment", options);
+    const { span, updatedOptions } = createSpan("getRoleAssignment", options);
 
     let response: RoleAssignmentsDeleteResponse;
     try {
       response = await this.client.roleAssignments.get(
         this.vaultUrl,
         roleScope,
         name,
-        setParentSpan(span, options)
+        updatedOptions
       );
     } finally {
       span.end();
@@ -322,11 +322,7 @@ export class KeyVaultAccessControlClient {
     roleScope: KeyVaultRoleScope,
     options: ListRoleAssignmentsOptions = {}
   ): PagedAsyncIterableIterator<KeyVaultRoleAssignment> {
-    const span = createSpan("listRoleAssignments", options);
-    const updatedOptions: ListRoleAssignmentsOptions = {
-      ...options,
-      ...setParentSpan(span, options)
-    };
+    const { span, updatedOptions } = createSpan("listRoleAssignments", options);
 
     const iter = this.listRoleAssignmentsAll(roleScope, updatedOptions);
 
@@ -416,11 +412,7 @@ export class KeyVaultAccessControlClient {
     roleScope: KeyVaultRoleScope,
     options: ListRoleDefinitionsOptions = {}
   ): PagedAsyncIterableIterator<KeyVaultRoleDefinition> {
-    const span = createSpan("listRoleDefinitions", options);
-    const updatedOptions: ListRoleDefinitionsOptions = {
-      ...options,
-      ...setParentSpan(span, options)
-    };
+    const { span, updatedOptions } = createSpan("listRoleDefinitions", options);
 
     const iter = this.listRoleDefinitionsAll(roleScope, updatedOptions);
 
@@ -455,15 +447,15 @@ export class KeyVaultAccessControlClient {
     name: string,
     options: GetRoleDefinitionOptions = {}
   ): Promise<KeyVaultRoleDefinition> {
-    const span = createSpan("getRoleDefinition", options);
+    const { span, updatedOptions } = createSpan("getRoleDefinition", options);
 
     let response: RoleDefinitionsGetResponse;
     try {
       response = await this.client.roleDefinitions.get(
         this.vaultUrl,
         roleScope,
         name,
-        setParentSpan(span, options)
+        updatedOptions
       );
     } finally {
       span.end();
@@ -495,7 +487,7 @@ export class KeyVaultAccessControlClient {
     description?: string,
     options: UpsertRoleDefinitionOptions = {}
   ): Promise<KeyVaultRoleDefinition> {
-    const span = createSpan("upsertRoleDefinition", options);
+    const { span, updatedOptions } = createSpan("upsertRoleDefinition", options);
 
     let response: RoleDefinitionsCreateOrUpdateResponse;
     try {
@@ -512,7 +504,7 @@ export class KeyVaultAccessControlClient {
             roleType: "CustomRole"
           }
         },
-        setParentSpan(span, options)
+        updatedOptions
       );
     } finally {
       span.end();
@@ -540,15 +532,15 @@ export class KeyVaultAccessControlClient {
     name: string,
     options: DeleteRoleDefinitionOptions = {}
   ): Promise<KeyVaultRoleDefinition> {
-    const span = createSpan("deleteRoleDefinition", options);
+    const { span, updatedOptions } = createSpan("deleteRoleDefinition", options);
 
     let response: RoleDefinitionsDeleteResponse;
     try {
       response = await this.client.roleDefinitions.delete(
         this.vaultUrl,
         roleScope,
         name,
-        setParentSpan(span, options)
+        updatedOptions
       );
     } finally {
       span.end();

sdk/keyvault/keyvault-admin/src/lro/backup/operation.ts

@@ -10,7 +10,7 @@ import {
   KeyVaultClientFullBackupResponse,
   KeyVaultClientFullBackupStatusResponse
 } from "../../generated/models";
-import { createSpan, setParentSpan } from "../../../../keyvault-common/src";
+import { createSpan } from "../../tracing";
 import { BackupResult, BeginBackupOptions } from "../../backupClientModels";
 import {
   KeyVaultAdminPollOperation,
@@ -58,9 +58,9 @@ export class BackupPollOperation extends KeyVaultAdminPollOperation<
   private async fullBackup(
     options: KeyVaultClientFullBackupOptionalParams
   ): Promise<KeyVaultClientFullBackupResponse> {
-    const span = createSpan("generatedClient.fullBackup", options);
+    const { span, updatedOptions } = createSpan("generatedClient.fullBackup", options);
     try {
-      return await this.client.fullBackup(this.vaultUrl, setParentSpan(span, options));
+      return await this.client.fullBackup(this.vaultUrl, updatedOptions);
     } finally {
       span.end();
     }
@@ -73,9 +73,9 @@ export class BackupPollOperation extends KeyVaultAdminPollOperation<
     jobId: string,
     options: BeginBackupOptions
   ): Promise<KeyVaultClientFullBackupStatusResponse> {
-    const span = createSpan("generatedClient.fullBackupStatus", options);
+    const { span, updatedOptions } = createSpan("generatedClient.fullBackupStatus", options);
     try {
-      return await this.client.fullBackupStatus(this.vaultUrl, jobId, setParentSpan(span, options));
+      return await this.client.fullBackupStatus(this.vaultUrl, jobId, updatedOptions);
     } finally {
       span.end();
     }

sdk/keyvault/keyvault-admin/src/lro/restore/operation.ts

@@ -9,7 +9,7 @@ import {
   KeyVaultClientRestoreStatusResponse,
   RestoreOperation
 } from "../../generated/models";
-import { createSpan, setParentSpan } from "../../../../keyvault-common/src";
+import { createSpan } from "../../tracing";
 import { KeyVaultClientFullRestoreOperationResponse } from "../../generated/models";
 import {
   KeyVaultAdminPollOperation,
@@ -65,9 +65,9 @@ export class RestorePollOperation extends KeyVaultAdminPollOperation<
   private async fullRestore(
     options: KeyVaultClientFullRestoreOperationOptionalParams
   ): Promise<KeyVaultClientFullRestoreOperationResponse> {
-    const span = createSpan("generatedClient.fullRestore", options);
+    const { span, updatedOptions } = createSpan("generatedClient.fullRestore", options);
     try {
-      return await this.client.fullRestoreOperation(this.vaultUrl, setParentSpan(span, options));
+      return await this.client.fullRestoreOperation(this.vaultUrl, updatedOptions);
     } finally {
       span.end();
     }
@@ -80,9 +80,9 @@ export class RestorePollOperation extends KeyVaultAdminPollOperation<
     jobId: string,
     options: OperationOptions
   ): Promise<KeyVaultClientRestoreStatusResponse> {
-    const span = createSpan("generatedClient.restoreStatus", options);
+    const { span, updatedOptions } = createSpan("generatedClient.restoreStatus", options);
     try {
-      return await this.client.restoreStatus(this.vaultUrl, jobId, setParentSpan(span, options));
+      return await this.client.restoreStatus(this.vaultUrl, jobId, updatedOptions);
     } finally {
       span.end();
     }

sdk/keyvault/keyvault-admin/src/lro/selectiveRestore/operation.ts

@@ -2,19 +2,15 @@
 // Licensed under the MIT license.
 
 import { AbortSignalLike } from "@azure/abort-controller";
-import {
-  OperationOptions,
-  operationOptionsToRequestOptionsBase,
-  RequestOptionsBase
-} from "@azure/core-http";
+import { OperationOptions, RequestOptionsBase } from "@azure/core-http";
 import { KeyVaultClient } from "../../generated/keyVaultClient";
 import {
   KeyVaultClientRestoreStatusResponse,
   KeyVaultClientSelectiveKeyRestoreOperationOptionalParams,
   KeyVaultClientSelectiveKeyRestoreOperationResponse,
   RestoreOperation
 } from "../../generated/models";
-import { createSpan, setParentSpan } from "../../../../keyvault-common/src";
+import { createSpan } from "../../tracing";
 import {
   KeyVaultAdminPollOperation,
   KeyVaultAdminPollOperationState
@@ -73,14 +69,9 @@ export class SelectiveRestorePollOperation extends KeyVaultAdminPollOperation<
     keyName: string,
     options: KeyVaultClientSelectiveKeyRestoreOperationOptionalParams
   ): Promise<KeyVaultClientSelectiveKeyRestoreOperationResponse> {
-    const requestOptions = operationOptionsToRequestOptionsBase(options);
-    const span = createSpan("generatedClient.selectiveRestore", requestOptions);
+    const { span, updatedOptions } = createSpan("generatedClient.selectiveRestore", options);
     try {
-      return await this.client.selectiveKeyRestoreOperation(
-        this.vaultUrl,
-        keyName,
-        setParentSpan(span, requestOptions)
-      );
+      return await this.client.selectiveKeyRestoreOperation(this.vaultUrl, keyName, updatedOptions);
     } finally {
       span.end();
     }
@@ -93,10 +84,9 @@ export class SelectiveRestorePollOperation extends KeyVaultAdminPollOperation<
     jobId: string,
     options: OperationOptions
   ): Promise<KeyVaultClientRestoreStatusResponse> {
-    const requestOptions = operationOptionsToRequestOptionsBase(options);
-    const span = createSpan("generatedClient.restoreStatus", requestOptions);
+    const { span, updatedOptions } = createSpan("generatedClient.restoreStatus", options);
     try {
-      return await this.client.restoreStatus(this.vaultUrl, jobId, options);
+      return await this.client.restoreStatus(this.vaultUrl, jobId, updatedOptions);
     } finally {
       span.end();
     }

sdk/keyvault/keyvault-admin/src/tracing.ts

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { createSpanFunction, OperationTracingOptions } from "@azure/core-tracing";
+import { Span } from "@opentelemetry/api";
+
+/*
+ * @internal
+ */
+export const createSpan: <T extends {
+  tracingOptions?: OperationTracingOptions | undefined;
+}>(
+  operationName: string,
+  operationOptions: T | undefined
+) => {
+  span: Span;
+  updatedOptions: T;
+} = createSpanFunction({
+  packagePrefix: "AdminClient",
+  namespace: "Microsoft.KeyVault"
+});