fix bugs

Microsoft.Azure.Cosmos/src/Resource/ClientContextCore.cs

@@ -265,7 +265,6 @@ private async Task<TResult> OperationHelperWithRootTraceAsync<TResult>(
                     trace,
                     task,
                     openTelemetry,
-                    operationName,
                     requestOptions,
                     resourceType);
             }
@@ -304,7 +303,6 @@ private Task<TResult> OperationHelperWithRootTraceWithSynchronizationContextAsyn
                         trace,
                         task,
                         openTelemetry,
-                        operationName,
                         requestOptions,
                         resourceType);
                 }
@@ -497,7 +495,6 @@ private async Task<TResult> RunWithDiagnosticsHelperAsync<TResult>(
             ITrace trace,
             Func<ITrace, Task<TResult>> task,
             Tuple<string, Func<TResult, OpenTelemetryAttributes>> openTelemetry,
-            string operationName,
             RequestOptions requestOptions,
             ResourceType? resourceType = null)
         {
@@ -513,7 +510,7 @@ private async Task<TResult> RunWithDiagnosticsHelperAsync<TResult>(
 
                                         if (resourceType is not null && this.IsBulkOperationSupported(resourceType.Value, operationType))
                                         {
-                                            operationName = OpenTelemetryConstants.Operations.ExecuteBulkPrefix + openTelemetry.Item1;
+                                            return OpenTelemetryConstants.Operations.ExecuteBulkPrefix + openTelemetry.Item1;
                                         }
                                         return openTelemetry.Item1;
                                     },

Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryAttributes.cs

@@ -4,7 +4,9 @@
 
 namespace Microsoft.Azure.Cosmos.Telemetry
 {
+    using System;
     using System.Net;
+    using System.Security.AccessControl;
 
     internal class OpenTelemetryAttributes
     {
@@ -18,6 +20,15 @@ internal OpenTelemetryAttributes()
         internal OpenTelemetryAttributes(RequestMessage requestMessage)
         {
             this.RequestContentLength = requestMessage?.Headers?.ContentLength;
+            if (requestMessage != null)
+            {
+                this.OperationType = requestMessage.OperationType;
+                this.ResourceType = requestMessage.ResourceType;
+            }
+            else
+            {
+                this.OperationType = Documents.OperationType.Invalid;
+            }
         }
 
         /// <summary>

Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryResponse.cs

@@ -37,8 +37,7 @@ internal OpenTelemetryResponse(ResponseMessage responseMessage)
                   requestMessage: responseMessage.RequestMessage,
                   subStatusCode: OpenTelemetryResponse.GetHeader(responseMessage)?.SubStatusCode,
                   activityId: OpenTelemetryResponse.GetHeader(responseMessage)?.ActivityId,
-                  correlationId: OpenTelemetryResponse.GetHeader(responseMessage)?.CorrelatedActivityId,
-                  operationType: responseMessage is QueryResponse ? Documents.OperationType.Query : Documents.OperationType.Invalid)
+                  correlationId: OpenTelemetryResponse.GetHeader(responseMessage)?.CorrelatedActivityId)
         {
         }
 
@@ -52,7 +51,6 @@ private OpenTelemetryResponse(
             Documents.SubStatusCodes? subStatusCode,
             string activityId,
             string correlationId,
-            Documents.OperationType operationType = Documents.OperationType.Invalid,
             int? batchSize = null)
             : base(requestMessage)
         {
@@ -64,7 +62,6 @@ private OpenTelemetryResponse(
             this.SubStatusCode = (int)(subStatusCode ?? Documents.SubStatusCodes.Unknown);
             this.ActivityId = activityId;
             this.CorrelatedActivityId = correlationId;
-            this.OperationType = operationType;
             this.BatchSize = batchSize;
         }
 

Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryResponse{T}.cs

@@ -22,8 +22,7 @@ internal OpenTelemetryResponse(FeedResponse<T> responseMessage)
                requestMessage: responseMessage.RequestMessage,
                subStatusCode: OpenTelemetryResponse<T>.GetHeader(responseMessage)?.SubStatusCode,
                activityId: OpenTelemetryResponse<T>.GetHeader(responseMessage)?.ActivityId,
-               correlatedActivityId: OpenTelemetryResponse<T>.GetHeader(responseMessage)?.CorrelatedActivityId,
-               operationType: responseMessage is QueryResponse<T> ? Documents.OperationType.Query : Documents.OperationType.Invalid)
+               correlatedActivityId: OpenTelemetryResponse<T>.GetHeader(responseMessage)?.CorrelatedActivityId)
         {
         }
 
@@ -37,22 +36,10 @@ internal OpenTelemetryResponse(Response<T> responseMessage)
                   requestMessage: responseMessage.RequestMessage,
                   subStatusCode: OpenTelemetryResponse<T>.GetHeader(responseMessage)?.SubStatusCode,
                   activityId: OpenTelemetryResponse<T>.GetHeader(responseMessage)?.ActivityId,
-                  correlatedActivityId: OpenTelemetryResponse<T>.GetHeader(responseMessage)?.CorrelatedActivityId,
-                  operationType: GetOperationType(responseMessage),
-                  resourceType: GetResourceType(responseMessage))
+                  correlatedActivityId: OpenTelemetryResponse<T>.GetHeader(responseMessage)?.CorrelatedActivityId)
         {
         }
 
-        private static OperationType GetOperationType(Response<T> responseMessage)
-        {
-            return responseMessage is QueryResponse ? Documents.OperationType.Query : Documents.OperationType.Invalid;
-        }
-
-        private static ResourceType? GetResourceType(Response<T> responseMessage)
-        {
-            return responseMessage is ItemResponse<T> ? Documents.ResourceType.Document : null;
-        }
-
         private OpenTelemetryResponse(
            HttpStatusCode statusCode,
            double? requestCharge,
@@ -62,9 +49,7 @@ private OpenTelemetryResponse(
            RequestMessage requestMessage,
            Documents.SubStatusCodes? subStatusCode,
            string activityId,
-           string correlatedActivityId,
-           Documents.OperationType operationType,
-           Documents.ResourceType? resourceType = null)
+           string correlatedActivityId)
            : base(requestMessage)
         {
             this.StatusCode = statusCode;
@@ -75,8 +60,6 @@ private OpenTelemetryResponse(
             this.SubStatusCode = (int)(subStatusCode ?? Documents.SubStatusCodes.Unknown);
             this.ActivityId = activityId;
             this.CorrelatedActivityId = correlatedActivityId;
-            this.OperationType = operationType;
-            this.ResourceType = resourceType;
         }
 
         private static Headers GetHeader(FeedResponse<T> responseMessage)