append prefix

Microsoft.Azure.Cosmos.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.10.35201.131
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29123.88
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Cosmos", "Microsoft.Azure.Cosmos\src\Microsoft.Azure.Cosmos.csproj", "{36F6F6A8-CEC8-4261-9948-903495BC3C25}"
 EndProject
@@ -164,18 +164,6 @@ Global
 		{B5B3631D-AC2F-4257-855D-D6FE12F20B60}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B5B3631D-AC2F-4257-855D-D6FE12F20B60}.Release|x64.ActiveCfg = Release|Any CPU
 		{B5B3631D-AC2F-4257-855D-D6FE12F20B60}.Release|x64.Build.0 = Release|Any CPU
-		{021DDC27-02EF-42C4-9A9E-AA600833C2EE}.Cover|Any CPU.ActiveCfg = Debug|Any CPU
-		{021DDC27-02EF-42C4-9A9E-AA600833C2EE}.Cover|Any CPU.Build.0 = Debug|Any CPU
-		{021DDC27-02EF-42C4-9A9E-AA600833C2EE}.Cover|x64.ActiveCfg = Debug|Any CPU
-		{021DDC27-02EF-42C4-9A9E-AA600833C2EE}.Cover|x64.Build.0 = Debug|Any CPU
-		{021DDC27-02EF-42C4-9A9E-AA600833C2EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{021DDC27-02EF-42C4-9A9E-AA600833C2EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{021DDC27-02EF-42C4-9A9E-AA600833C2EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{021DDC27-02EF-42C4-9A9E-AA600833C2EE}.Debug|x64.Build.0 = Debug|Any CPU
-		{021DDC27-02EF-42C4-9A9E-AA600833C2EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{021DDC27-02EF-42C4-9A9E-AA600833C2EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{021DDC27-02EF-42C4-9A9E-AA600833C2EE}.Release|x64.ActiveCfg = Release|Any CPU
-		{021DDC27-02EF-42C4-9A9E-AA600833C2EE}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

@@ -212,6 +212,7 @@ internal override Task<TResult>
             RequestOptions requestOptions,
             Func<ITrace, Task<TResult>> task,
             Func<TResult, OpenTelemetryAttributes> openTelemetry,
+            ResourceType? resourceType = null,
             TraceComponent traceComponent = TraceComponent.Transport,
             Tracing.TraceLevel traceLevel = Tracing.TraceLevel.Info)
         {
@@ -224,7 +225,8 @@ internal override Task<TResult>
                                                        task,
                                                        openTelemetry,
                                                        traceComponent,
-                                                       traceLevel) :
+                                                       traceLevel,
+                                                       resourceType) :
                 this.OperationHelperWithRootTraceWithSynchronizationContextAsync(
                                                                   operationName,
                                                                   containerName,
@@ -234,7 +236,8 @@ internal override Task<TResult>
                                                                   task,
                                                                   openTelemetry,
                                                                   traceComponent,
-                                                                  traceLevel);
+                                                                  traceLevel,
+                                                                  resourceType);
         }
 
         private async Task<TResult> OperationHelperWithRootTraceAsync<TResult>(
@@ -246,7 +249,8 @@ private async Task<TResult> OperationHelperWithRootTraceAsync<TResult>(
             Func<ITrace, Task<TResult>> task,
             Func<TResult, OpenTelemetryAttributes> openTelemetry,
             TraceComponent traceComponent,
-            Tracing.TraceLevel traceLevel)
+            Tracing.TraceLevel traceLevel,
+            ResourceType? resourceType)
         {
             bool disableDiagnostics = requestOptions != null && requestOptions.DisablePointOperationDiagnostics;
 
@@ -262,7 +266,8 @@ private async Task<TResult> OperationHelperWithRootTraceAsync<TResult>(
                     task,
                     openTelemetry,
                     operationName,
-                    requestOptions);
+                    requestOptions,
+                    resourceType);
             }
         }
 
@@ -275,7 +280,8 @@ private Task<TResult> OperationHelperWithRootTraceWithSynchronizationContextAsyn
             Func<ITrace, Task<TResult>> task,
             Func<TResult, OpenTelemetryAttributes> openTelemetry,
             TraceComponent traceComponent,
-            Tracing.TraceLevel traceLevel)
+            Tracing.TraceLevel traceLevel,
+            ResourceType? resourceType)
         {
             Debug.Assert(SynchronizationContext.Current != null, "This should only be used when a SynchronizationContext is specified");
 
@@ -299,7 +305,8 @@ private Task<TResult> OperationHelperWithRootTraceWithSynchronizationContextAsyn
                         task,
                         openTelemetry,
                         operationName,
-                        requestOptions);
+                        requestOptions,
+                        resourceType);
                 }
             });
         }
@@ -491,17 +498,23 @@ private async Task<TResult> RunWithDiagnosticsHelperAsync<TResult>(
             Func<ITrace, Task<TResult>> task,
             Func<TResult, OpenTelemetryAttributes> openTelemetry,
             string operationName,
-            RequestOptions requestOptions)
+            RequestOptions requestOptions,
+            ResourceType? resourceType = null)
         {
+            if (resourceType is not null && this.IsBulkOperationSupported(resourceType.Value, operationType))
+            {
+                operationName = OpenTelemetryConstants.Operations.ExecuteBulkPrefix + operationName;
+            }
+
             using (OpenTelemetryCoreRecorder recorder = 
-                                OpenTelemetryRecorderFactory.CreateRecorder(
-                                    operationName: operationName,
-                                    containerName: containerName,
-                                    databaseName: databaseName,
-                                    operationType: operationType,
-                                    requestOptions: requestOptions,
-                                    trace: trace,
-                                    clientContext: this.isDisposed ? null : this))
+                            OpenTelemetryRecorderFactory.CreateRecorder(
+                                operationName: operationName,
+                                containerName: containerName,
+                                databaseName: databaseName,
+                                operationType: operationType,
+                                requestOptions: requestOptions,
+                                trace: trace,
+                                clientContext: this.isDisposed ? null : this))
             using (new ActivityScope(Guid.NewGuid()))
             {
                 try
@@ -587,12 +600,8 @@ private bool IsBulkOperationSupported(
             OperationType operationType)
         {
             this.ThrowIfDisposed();
-            return IsBulk(this.ClientOptions.AllowBulkExecution, resourceType, operationType);
-        }
 
-        public static bool IsBulk(bool isBulkConfigured, ResourceType resourceType, OperationType operationType)
-        {
-            if (!isBulkConfigured)
+            if (!this.ClientOptions.AllowBulkExecution)
             {
                 return false;
             }

Microsoft.Azure.Cosmos/src/Resource/Container/ContainerInlineCore.cs

@@ -220,7 +220,8 @@ Task<ResponseMessage> func(ITrace trace)
                 operationType: Documents.OperationType.Create,
                 requestOptions: requestOptions,
                 task: func,
-                openTelemetry: (response) => new OpenTelemetryResponse(response));
+                openTelemetry: (response) => new OpenTelemetryResponse(response),
+                resourceType: Documents.ResourceType.Document);
         }
 
         public override Task<ItemResponse<T>> CreateItemAsync<T>(T item,
@@ -235,7 +236,8 @@ public override Task<ItemResponse<T>> CreateItemAsync<T>(T item,
                 operationType: Documents.OperationType.Create,
                 requestOptions: requestOptions,
                 task: (trace) => base.CreateItemAsync<T>(item, trace, partitionKey, requestOptions, cancellationToken),
-                openTelemetry: (response) => new OpenTelemetryResponse<T>(response));
+                openTelemetry: (response) => new OpenTelemetryResponse<T>(response),
+                resourceType: Documents.ResourceType.Document);
         }
 
         public override Task<ResponseMessage> ReadItemStreamAsync(
@@ -251,7 +253,8 @@ public override Task<ResponseMessage> ReadItemStreamAsync(
                 operationType: Documents.OperationType.Read,
                 requestOptions: requestOptions,
                 task: (trace) => base.ReadItemStreamAsync(id, partitionKey, trace, requestOptions, cancellationToken),
-                openTelemetry: (response) => new OpenTelemetryResponse(response));
+                openTelemetry: (response) => new OpenTelemetryResponse(response),
+                resourceType: Documents.ResourceType.Document);
         }
 
         public override Task<ItemResponse<T>> ReadItemAsync<T>(
@@ -267,7 +270,8 @@ public override Task<ItemResponse<T>> ReadItemAsync<T>(
                 operationType: Documents.OperationType.Read,
                 requestOptions,
                 (trace) => base.ReadItemAsync<T>(id, partitionKey, trace, requestOptions, cancellationToken),
-                (response) => new OpenTelemetryResponse<T>(response));
+                (response) => new OpenTelemetryResponse<T>(response),
+                resourceType: Documents.ResourceType.Document);
         }
 
         public override Task<ResponseMessage> UpsertItemStreamAsync(
@@ -283,7 +287,8 @@ public override Task<ResponseMessage> UpsertItemStreamAsync(
                 operationType: Documents.OperationType.Upsert,
                 requestOptions: requestOptions,
                 task: (trace) => base.UpsertItemStreamAsync(streamPayload, partitionKey, trace, requestOptions, cancellationToken),
-                openTelemetry: (response) => new OpenTelemetryResponse(response));
+                openTelemetry: (response) => new OpenTelemetryResponse(response),
+                resourceType: Documents.ResourceType.Document);
         }
 
         public override Task<ItemResponse<T>> UpsertItemAsync<T>(
@@ -299,7 +304,8 @@ public override Task<ItemResponse<T>> UpsertItemAsync<T>(
                 operationType: Documents.OperationType.Upsert,
                 requestOptions: requestOptions,
                 task: (trace) => base.UpsertItemAsync<T>(item, trace, partitionKey, requestOptions, cancellationToken),
-                openTelemetry: (response) => new OpenTelemetryResponse<T>(response));
+                openTelemetry: (response) => new OpenTelemetryResponse<T>(response),
+                resourceType: Documents.ResourceType.Document);
         }
 
         public override Task<ResponseMessage> ReplaceItemStreamAsync(
@@ -316,7 +322,8 @@ public override Task<ResponseMessage> ReplaceItemStreamAsync(
                 operationType: Documents.OperationType.Replace,
                 requestOptions: requestOptions,
                 task: (trace) => base.ReplaceItemStreamAsync(streamPayload, id, partitionKey, trace, requestOptions, cancellationToken),
-                openTelemetry: (response) => new OpenTelemetryResponse(response));
+                openTelemetry: (response) => new OpenTelemetryResponse(response),
+                resourceType: Documents.ResourceType.Document);
         }
 
         public override Task<ItemResponse<T>> ReplaceItemAsync<T>(
@@ -333,7 +340,8 @@ public override Task<ItemResponse<T>> ReplaceItemAsync<T>(
                 operationType: Documents.OperationType.Replace,
                 requestOptions: requestOptions,
                 task: (trace) => base.ReplaceItemAsync<T>(item, id, trace, partitionKey, requestOptions, cancellationToken),
-                openTelemetry: (response) => new OpenTelemetryResponse<T>(response));
+                openTelemetry: (response) => new OpenTelemetryResponse<T>(response),
+                resourceType: Documents.ResourceType.Document);
         }
 
         public override Task<ResponseMessage> DeleteItemStreamAsync(
@@ -349,7 +357,8 @@ public override Task<ResponseMessage> DeleteItemStreamAsync(
                 operationType: Documents.OperationType.Delete,
                 requestOptions: requestOptions,
                 task: (trace) => base.DeleteItemStreamAsync(id, partitionKey, trace, requestOptions, cancellationToken),
-                openTelemetry: (response) => new OpenTelemetryResponse(response));
+                openTelemetry: (response) => new OpenTelemetryResponse(response),
+                resourceType: Documents.ResourceType.Document);
         }
 
         public override Task<ItemResponse<T>> DeleteItemAsync<T>(
@@ -365,7 +374,8 @@ public override Task<ItemResponse<T>> DeleteItemAsync<T>(
                 operationType: Documents.OperationType.Delete,
                 requestOptions: requestOptions,
                 task: (trace) => base.DeleteItemAsync<T>(id, partitionKey, trace, requestOptions, cancellationToken),
-                openTelemetry: (response) => new OpenTelemetryResponse<T>(response));
+                openTelemetry: (response) => new OpenTelemetryResponse<T>(response),
+                resourceType: Documents.ResourceType.Document);
         }
 
         public override Task<ResponseMessage> PatchItemStreamAsync(
@@ -382,7 +392,8 @@ public override Task<ResponseMessage> PatchItemStreamAsync(
                 operationType: Documents.OperationType.Patch,
                 requestOptions: requestOptions,
                 task: (trace) => base.PatchItemStreamAsync(id, partitionKey, patchOperations, trace, requestOptions, cancellationToken),
-                openTelemetry: (response) => new OpenTelemetryResponse(response));
+                openTelemetry: (response) => new OpenTelemetryResponse(response),
+                resourceType: Documents.ResourceType.Document);
         }
 
         public override Task<ResponseMessage> PatchItemStreamAsync(
@@ -399,7 +410,8 @@ public override Task<ResponseMessage> PatchItemStreamAsync(
                 operationType: Documents.OperationType.Patch,
                 requestOptions: requestOptions,
                 task: (trace) => base.PatchItemStreamAsync(id, partitionKey, streamPayload, trace, requestOptions, cancellationToken),
-                openTelemetry: (response) => new OpenTelemetryResponse(response));
+                openTelemetry: (response) => new OpenTelemetryResponse(response),
+                resourceType: Documents.ResourceType.Document);
         }
 
         public override Task<ItemResponse<T>> PatchItemAsync<T>(
@@ -416,7 +428,8 @@ public override Task<ItemResponse<T>> PatchItemAsync<T>(
                 operationType: Documents.OperationType.Patch,
                 requestOptions: requestOptions,
                 task: (trace) => base.PatchItemAsync<T>(id, partitionKey, patchOperations, trace, requestOptions, cancellationToken),
-                openTelemetry: (response) => new OpenTelemetryResponse<T>(response));
+                openTelemetry: (response) => new OpenTelemetryResponse<T>(response),
+                resourceType: Documents.ResourceType.Document);
         }
 
         public override Task<ResponseMessage> ReadManyItemsStreamAsync(

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

@@ -66,6 +66,7 @@ internal abstract Task<TResult> OperationHelperAsync<TResult>(
             RequestOptions requestOptions,
             Func<ITrace, Task<TResult>> task,
             Func<TResult, OpenTelemetryAttributes> openTelemetry = null,
+            ResourceType? resourceType = null,
             TraceComponent traceComponent = TraceComponent.Transport,
             TraceLevel traceLevel = TraceLevel.Info);
 

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

@@ -9,7 +9,6 @@ namespace Microsoft.Azure.Cosmos.Telemetry
     using System.Diagnostics;
     using global::Azure.Core;
     using Microsoft.Azure.Cosmos.Telemetry.Diagnostics;
-    using Microsoft.Azure.Cosmos.Telemetry.OpenTelemetry;
     using Microsoft.Azure.Documents;
 
     /// <summary>
@@ -27,12 +26,8 @@ internal struct OpenTelemetryCoreRecorder : IDisposable
         private readonly OperationType operationType = OperationType.Invalid;
         private readonly string connectionModeCache = null;
 
-        private readonly bool isBulkEnabled = false;
-
         private OpenTelemetryAttributes response = null;
 
-        private string operationName = null;
-
         /// <summary>
         /// Maps exception types to actions that record their OpenTelemetry attributes.
         /// </summary>
@@ -69,16 +64,15 @@ private OpenTelemetryCoreRecorder(
             this.scope = scope;
             this.config = config;
 
-            this.operationName = operationName;
             this.operationType = operationType;
             this.connectionModeCache = Enum.GetName(typeof(ConnectionMode), clientContext.ClientOptions.ConnectionMode);
-            this.isBulkEnabled = clientContext.ClientOptions.AllowBulkExecution;
 
             if (scope.IsEnabled)
             {
                 this.scope.Start();
 
                 this.Record(
+                        operationName: operationName,
                         containerName: containerName,
                         databaseName: databaseName,
                         clientContext: clientContext);
@@ -138,16 +132,19 @@ public void Record(string key, string value)
         /// <summary>
         /// Recording information
         /// </summary>
+        /// <param name="operationName"></param>
         /// <param name="containerName"></param>
         /// <param name="databaseName"></param>
         /// <param name="clientContext"></param>
         public void Record(
+            string operationName,
             string containerName,
             string databaseName,
             CosmosClientContext clientContext)
         {
             if (this.IsEnabled)
             {
+                this.scope.AddAttribute(OpenTelemetryAttributeKeys.DbOperation, operationName);
                 this.scope.AddAttribute(OpenTelemetryAttributeKeys.DbName, databaseName);
                 this.scope.AddAttribute(OpenTelemetryAttributeKeys.ContainerName, containerName);
 
@@ -230,17 +227,11 @@ public void Dispose()
                 OperationType operationType
                     = (this.response == null || this.response?.OperationType == OperationType.Invalid) ? this.operationType : this.response.OperationType;
 
-                string operationTypeName = Enum.GetName(typeof(OperationType), operationType);
-                this.scope.AddAttribute(OpenTelemetryAttributeKeys.OperationType, operationTypeName);
+                string operationName = Enum.GetName(typeof(OperationType), operationType);
+                this.scope.AddAttribute(OpenTelemetryAttributeKeys.OperationType, operationName);
 
                 if (this.response != null)
                 {
-                    if (this.response.ResourceType is not null && ClientContextCore.IsBulk(this.isBulkEnabled, this.response.ResourceType.Value, this.operationType))
-                    {
-                        this.operationName = OpenTelemetryConstants.Operations.ExecuteBulkPrefix + this.operationName;
-                    }
-                    this.scope.AddAttribute(OpenTelemetryAttributeKeys.DbOperation, this.operationName);
-
                     if (this.response.BatchSize is not null)
                     {
                         this.scope.AddIntegerAttribute(OpenTelemetryAttributeKeys.BatchSize, (int)this.response.BatchSize);