storage-queue: same story, just swapping to core-tracing's versions.

sdk/storage/storage-queue/src/QueueClient.ts

@@ -45,7 +45,7 @@ import {
 } from "./utils/utils.common";
 import { StorageSharedKeyCredential } from "./credentials/StorageSharedKeyCredential";
 import { AnonymousCredential } from "./credentials/AnonymousCredential";
-import { createSpan } from "./utils/tracing";
+import { convertTracingToRequestOptionsBase, createSpan } from "./utils/tracing";
 import { Metadata } from "./models";
 import { generateQueueSASQueryParameters } from "./QueueSASSignatureValues";
 import { SasIPRange } from "./SasIPRange";
@@ -584,12 +584,12 @@ export class QueueClient extends StorageClient {
    * ```
    */
   public async create(options: QueueCreateOptions = {}): Promise<QueueCreateResponse> {
-    const { span, spanOptions } = createSpan("QueueClient-create", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-create", options);
     try {
       return await this.queueContext.create({
         ...options,
         abortSignal: options.abortSignal,
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
     } catch (e) {
       span.setStatus({
@@ -612,15 +612,9 @@ export class QueueClient extends StorageClient {
   public async createIfNotExists(
     options: QueueCreateOptions = {}
   ): Promise<QueueCreateIfNotExistsResponse> {
-    const { span, spanOptions } = createSpan(
-      "QueueClient-createIfNotExists",
-      options.tracingOptions
-    );
+    const { span, updatedOptions } = createSpan("QueueClient-createIfNotExists", options);
     try {
-      const response = await this.create({
-        ...options,
-        tracingOptions: { ...options!.tracingOptions, spanOptions }
-      });
+      const response = await this.create(updatedOptions);
 
       // When a queue with the specified name already exists, the Queue service checks the metadata associated with the existing queue.
       // If the existing metadata is identical to the metadata specified on the Create Queue request, status code 204 (No Content) is returned.
@@ -667,12 +661,9 @@ export class QueueClient extends StorageClient {
   public async deleteIfExists(
     options: QueueDeleteOptions = {}
   ): Promise<QueueDeleteIfExistsResponse> {
-    const { span, spanOptions } = createSpan("QueueClient-deleteIfExists", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-deleteIfExists", options);
     try {
-      const res = await this.delete({
-        ...options,
-        tracingOptions: { ...options!.tracingOptions, spanOptions }
-      });
+      const res = await this.delete(updatedOptions);
       return {
         succeeded: true,
         ...res
@@ -716,11 +707,11 @@ export class QueueClient extends StorageClient {
    * ```
    */
   public async delete(options: QueueDeleteOptions = {}): Promise<QueueDeleteResponse> {
-    const { span, spanOptions } = createSpan("QueueClient-delete", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-delete", options);
     try {
       return await this.queueContext.deleteMethod({
         abortSignal: options.abortSignal,
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
     } catch (e) {
       span.setStatus({
@@ -743,11 +734,11 @@ export class QueueClient extends StorageClient {
    * @param options - options to Exists operation.
    */
   public async exists(options: QueueExistsOptions = {}): Promise<boolean> {
-    const { span, spanOptions } = createSpan("QueueClient-exists", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-exists", options);
     try {
       await this.getProperties({
         abortSignal: options.abortSignal,
-        tracingOptions: { ...options.tracingOptions, spanOptions }
+        tracingOptions: updatedOptions.tracingOptions
       });
       return true;
     } catch (e) {
@@ -784,11 +775,11 @@ export class QueueClient extends StorageClient {
   public async getProperties(
     options: QueueGetPropertiesOptions = {}
   ): Promise<QueueGetPropertiesResponse> {
-    const { span, spanOptions } = createSpan("QueueClient-getProperties", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-getProperties", options);
     try {
       return await this.queueContext.getProperties({
         abortSignal: options.abortSignal,
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
     } catch (e) {
       span.setStatus({
@@ -816,12 +807,12 @@ export class QueueClient extends StorageClient {
     metadata?: Metadata,
     options: QueueSetMetadataOptions = {}
   ): Promise<QueueSetMetadataResponse> {
-    const { span, spanOptions } = createSpan("QueueClient-setMetadata", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-setMetadata", options);
     try {
       return await this.queueContext.setMetadata({
         abortSignal: options.abortSignal,
         metadata,
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
     } catch (e) {
       span.setStatus({
@@ -848,11 +839,11 @@ export class QueueClient extends StorageClient {
   public async getAccessPolicy(
     options: QueueGetAccessPolicyOptions = {}
   ): Promise<QueueGetAccessPolicyResponse> {
-    const { span, spanOptions } = createSpan("QueueClient-getAccessPolicy", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-getAccessPolicy", options);
     try {
       const response = await this.queueContext.getAccessPolicy({
         abortSignal: options.abortSignal,
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
 
       const res: QueueGetAccessPolicyResponse = {
@@ -911,7 +902,7 @@ export class QueueClient extends StorageClient {
     queueAcl?: SignedIdentifier[],
     options: QueueSetAccessPolicyOptions = {}
   ): Promise<QueueSetAccessPolicyResponse> {
-    const { span, spanOptions } = createSpan("QueueClient-setAccessPolicy", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-setAccessPolicy", options);
     try {
       const acl: SignedIdentifierModel[] = [];
       for (const identifier of queueAcl || []) {
@@ -932,7 +923,7 @@ export class QueueClient extends StorageClient {
       return await this.queueContext.setAccessPolicy({
         abortSignal: options.abortSignal,
         queueAcl: acl,
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
     } catch (e) {
       span.setStatus({
@@ -955,11 +946,11 @@ export class QueueClient extends StorageClient {
   public async clearMessages(
     options: QueueClearMessagesOptions = {}
   ): Promise<QueueClearMessagesResponse> {
-    const { span, spanOptions } = createSpan("QueueClient-clearMessages", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-clearMessages", options);
     try {
       return await this.messagesContext.clear({
         abortSignal: options.abortSignal,
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
     } catch (e) {
       span.setStatus({
@@ -997,7 +988,7 @@ export class QueueClient extends StorageClient {
     messageText: string,
     options: QueueSendMessageOptions = {}
   ): Promise<QueueSendMessageResponse> {
-    const { span, spanOptions } = createSpan("QueueClient-sendMessage", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-sendMessage", options);
     try {
       const response = await this.messagesContext.enqueue(
         {
@@ -1006,7 +997,7 @@ export class QueueClient extends StorageClient {
         {
           abortSignal: options.abortSignal,
           ...options,
-          spanOptions
+          ...convertTracingToRequestOptionsBase(updatedOptions)
         }
       );
       const item = response[0];
@@ -1062,12 +1053,12 @@ export class QueueClient extends StorageClient {
   public async receiveMessages(
     options: QueueReceiveMessageOptions = {}
   ): Promise<QueueReceiveMessageResponse> {
-    const { span, spanOptions } = createSpan("QueueClient-receiveMessages", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-receiveMessages", options);
     try {
       const response = await this.messagesContext.dequeue({
         abortSignal: options.abortSignal,
         ...options,
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
 
       const res: QueueReceiveMessageResponse = {
@@ -1113,12 +1104,12 @@ export class QueueClient extends StorageClient {
   public async peekMessages(
     options: QueuePeekMessagesOptions = {}
   ): Promise<QueuePeekMessagesResponse> {
-    const { span, spanOptions } = createSpan("QueueClient-peekMessages", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-peekMessages", options);
     try {
       const response = await this.messagesContext.peek({
         abortSignal: options.abortSignal,
         ...options,
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
 
       const res: QueuePeekMessagesResponse = {
@@ -1161,11 +1152,11 @@ export class QueueClient extends StorageClient {
     popReceipt: string,
     options: QueueDeleteMessageOptions = {}
   ): Promise<QueueDeleteMessageResponse> {
-    const { span, spanOptions } = createSpan("QueueClient-deleteMessage", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-deleteMessage", options);
     try {
       return await this.getMessageIdContext(messageId).deleteMethod(popReceipt, {
         abortSignal: options.abortSignal,
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
     } catch (e) {
       span.setStatus({
@@ -1202,7 +1193,7 @@ export class QueueClient extends StorageClient {
     visibilityTimeout?: number,
     options: QueueUpdateMessageOptions = {}
   ): Promise<QueueUpdateMessageResponse> {
-    const { span, spanOptions } = createSpan("QueueClient-updateMessage", options.tracingOptions);
+    const { span, updatedOptions } = createSpan("QueueClient-updateMessage", options);
     let queueMessage = undefined;
     if (message !== undefined) {
       queueMessage = { messageText: message };
@@ -1211,7 +1202,7 @@ export class QueueClient extends StorageClient {
     try {
       return await this.getMessageIdContext(messageId).update(popReceipt, visibilityTimeout || 0, {
         abortSignal: options.abortSignal,
-        spanOptions,
+        ...convertTracingToRequestOptionsBase(updatedOptions),
         queueMessage
       });
     } catch (e) {

sdk/storage/storage-queue/src/QueueServiceClient.ts

@@ -32,7 +32,7 @@ import {
 } from "./utils/utils.common";
 import { StorageSharedKeyCredential } from "./credentials/StorageSharedKeyCredential";
 import { AnonymousCredential } from "./credentials/AnonymousCredential";
-import { createSpan } from "./utils/tracing";
+import { convertTracingToRequestOptionsBase, createSpan } from "./utils/tracing";
 import { QueueClient, QueueCreateOptions, QueueDeleteOptions } from "./QueueClient";
 import { AccountSASPermissions } from "./AccountSASPermissions";
 import { generateAccountSASQueryParameters } from "./AccountSASSignatureValues";
@@ -321,10 +321,7 @@ export class QueueServiceClient extends StorageClient {
     marker?: string,
     options: ServiceListQueuesSegmentOptions = {}
   ): Promise<ServiceListQueuesSegmentResponse> {
-    const { span, spanOptions } = createSpan(
-      "QueueServiceClient-listQueuesSegment",
-      options.tracingOptions
-    );
+    const { span, updatedOptions } = createSpan("QueueServiceClient-listQueuesSegment", options);
 
     if (options.prefix === "") {
       options.prefix = undefined;
@@ -337,7 +334,7 @@ export class QueueServiceClient extends StorageClient {
         maxPageSize: options.maxPageSize,
         prefix: options.prefix,
         include: options.include === undefined ? undefined : [options.include],
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
     } catch (e) {
       span.setStatus({
@@ -525,14 +522,11 @@ export class QueueServiceClient extends StorageClient {
   public async getProperties(
     options: ServiceGetPropertiesOptions = {}
   ): Promise<ServiceGetPropertiesResponse> {
-    const { span, spanOptions } = createSpan(
-      "QueueServiceClient-getProperties",
-      options.tracingOptions
-    );
+    const { span, updatedOptions } = createSpan("QueueServiceClient-getProperties", options);
     try {
       return await this.serviceContext.getProperties({
         abortSignal: options.abortSignal,
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
     } catch (e) {
       span.setStatus({
@@ -558,14 +552,11 @@ export class QueueServiceClient extends StorageClient {
     properties: QueueServiceProperties,
     options: ServiceGetPropertiesOptions = {}
   ): Promise<ServiceSetPropertiesResponse> {
-    const { span, spanOptions } = createSpan(
-      "QueueServiceClient-setProperties",
-      options.tracingOptions
-    );
+    const { span, updatedOptions } = createSpan("QueueServiceClient-setProperties", options);
     try {
       return await this.serviceContext.setProperties(properties, {
         abortSignal: options.abortSignal,
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
     } catch (e) {
       span.setStatus({
@@ -590,14 +581,11 @@ export class QueueServiceClient extends StorageClient {
   public async getStatistics(
     options: ServiceGetStatisticsOptions = {}
   ): Promise<ServiceGetStatisticsResponse> {
-    const { span, spanOptions } = createSpan(
-      "QueueServiceClient-getStatistics",
-      options.tracingOptions
-    );
+    const { span, updatedOptions } = createSpan("QueueServiceClient-getStatistics", options);
     try {
       return await this.serviceContext.getStatistics({
         abortSignal: options.abortSignal,
-        spanOptions
+        ...convertTracingToRequestOptionsBase(updatedOptions)
       });
     } catch (e) {
       span.setStatus({
@@ -622,15 +610,9 @@ export class QueueServiceClient extends StorageClient {
     queueName: string,
     options: QueueCreateOptions = {}
   ): Promise<QueueCreateResponse> {
-    const { span, spanOptions } = createSpan(
-      "QueueServiceClient-createQueue",
-      options.tracingOptions
-    );
+    const { span, updatedOptions } = createSpan("QueueServiceClient-createQueue", options);
     try {
-      return await this.getQueueClient(queueName).create({
-        ...options,
-        tracingOptions: { ...options!.tracingOptions, spanOptions }
-      });
+      return await this.getQueueClient(queueName).create(updatedOptions);
     } catch (e) {
       span.setStatus({
         code: CanonicalCode.UNKNOWN,
@@ -654,15 +636,9 @@ export class QueueServiceClient extends StorageClient {
     queueName: string,
     options: QueueDeleteOptions = {}
   ): Promise<QueueDeleteResponse> {
-    const { span, spanOptions } = createSpan(
-      "QueueServiceClient-deleteQueue",
-      options.tracingOptions
-    );
+    const { span, updatedOptions } = createSpan("QueueServiceClient-deleteQueue", options);
     try {
-      return await this.getQueueClient(queueName).delete({
-        ...options,
-        tracingOptions: { ...options!.tracingOptions, spanOptions }
-      });
+      return await this.getQueueClient(queueName).delete(updatedOptions);
     } catch (e) {
       span.setStatus({
         code: CanonicalCode.UNKNOWN,

sdk/storage/storage-queue/src/utils/tracing.ts

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+import { OperationOptions, RequestOptionsBase } from "@azure/core-http";
 import { createSpanFunction } from "@azure/core-tracing";
 
 /**
@@ -11,3 +12,18 @@ export const createSpan = createSpanFunction({
   packagePrefix: "Azure.Storage.Queue",
   namespace: "Microsoft.Storage"
 });
+
+/**
+ * @internal
+ *
+ * Adapt the tracing options from OperationOptions to what they need to be for
+ * RequestOptionsBase (when we update to later OpenTelemetry versions this is now
+ * two separate fields, not just one).
+ */
+export function convertTracingToRequestOptionsBase(
+  options?: OperationOptions
+): Pick<RequestOptionsBase, "spanOptions"> {
+  return {
+    spanOptions: options?.tracingOptions?.spanOptions
+  };
+}