diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryAttributeKeys.cs b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryAttributeKeys.cs
index 14053761f4..9e71e5edbe 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryAttributeKeys.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryAttributeKeys.cs
@@ -16,7 +16,7 @@ internal sealed class OpenTelemetryAttributeKeys
public const string DbSystemName = "db.system";
public const string DbName = "db.name";
public const string DbOperation = "db.operation";
- public const string NetPeerName = "net.peer.name";
+ public const string ServerAddress = "server.address";
// Cosmos Db Specific
public const string ClientId = "db.cosmosdb.client_id";
diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryCoreRecorder.cs b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryCoreRecorder.cs
index 7679640709..8659286b3d 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryCoreRecorder.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryCoreRecorder.cs
@@ -146,7 +146,7 @@ public void Record(
// Other information
this.scope.AddAttribute(OpenTelemetryAttributeKeys.DbSystemName, OpenTelemetryCoreRecorder.CosmosDb);
this.scope.AddAttribute(OpenTelemetryAttributeKeys.MachineId, VmMetadataApiHandler.GetMachineId());
- this.scope.AddAttribute(OpenTelemetryAttributeKeys.NetPeerName, clientContext.Client?.Endpoint?.Host);
+ this.scope.AddAttribute(OpenTelemetryAttributeKeys.ServerAddress, clientContext.Client?.Endpoint?.Host);
// Client Information
this.scope.AddAttribute(OpenTelemetryAttributeKeys.ClientId, clientContext?.Client?.Id);
diff --git a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryRecorderFactory.cs b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryRecorderFactory.cs
index b88bb790ee..8117dda493 100644
--- a/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryRecorderFactory.cs
+++ b/Microsoft.Azure.Cosmos/src/Telemetry/OpenTelemetry/OpenTelemetryRecorderFactory.cs
@@ -22,7 +22,8 @@ internal static class OpenTelemetryRecorderFactory
clientNamespace: $"{OpenTelemetryAttributeKeys.DiagnosticNamespace}",
resourceProviderNamespace: OpenTelemetryAttributeKeys.ResourceProviderNamespace,
isActivityEnabled: true,
- suppressNestedClientActivities: true),
+ suppressNestedClientActivities: true,
+ isStable: false),
isThreadSafe: true);
public static OpenTelemetryCoreRecorder CreateRecorder(string operationName,
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.BatchOperationsAsync.xml b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.BatchOperationsAsync.xml
index fea625f80b..be3f14d016 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.BatchOperationsAsync.xml
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.BatchOperationsAsync.xml
@@ -147,13 +147,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Batch
- 400
- 1001
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.BulkOperationsAsync.xml b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.BulkOperationsAsync.xml
index ccbeb216c8..5de1a309d7 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.BulkOperationsAsync.xml
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.BulkOperationsAsync.xml
@@ -171,13 +171,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -189,13 +189,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -207,13 +207,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -225,13 +225,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -243,13 +243,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -261,13 +261,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -279,13 +279,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -297,13 +297,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -315,13 +315,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -333,13 +333,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -515,13 +515,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -533,13 +533,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -551,13 +551,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -569,13 +569,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -587,13 +587,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -605,13 +605,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -623,13 +623,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -641,13 +641,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -659,13 +659,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -677,13 +677,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -859,13 +859,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -877,13 +877,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -895,13 +895,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -913,13 +913,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -931,13 +931,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -949,13 +949,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -967,13 +967,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -985,13 +985,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1003,13 +1003,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1021,13 +1021,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1203,13 +1203,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1221,13 +1221,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1239,13 +1239,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1257,13 +1257,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1275,13 +1275,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1293,13 +1293,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1311,13 +1311,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1329,13 +1329,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1347,13 +1347,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1365,13 +1365,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1547,13 +1547,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1565,13 +1565,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1583,13 +1583,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1601,13 +1601,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1619,13 +1619,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1637,13 +1637,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1655,13 +1655,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1673,13 +1673,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1691,13 +1691,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1709,13 +1709,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1891,13 +1891,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1909,13 +1909,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1927,13 +1927,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1945,13 +1945,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1963,13 +1963,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1981,13 +1981,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -1999,13 +1999,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2017,13 +2017,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2035,13 +2035,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2053,13 +2053,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2235,13 +2235,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2253,13 +2253,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2271,13 +2271,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2289,13 +2289,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2307,13 +2307,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2325,13 +2325,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2343,13 +2343,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2361,13 +2361,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2379,13 +2379,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2397,13 +2397,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2579,13 +2579,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2597,13 +2597,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2615,13 +2615,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2633,13 +2633,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2651,13 +2651,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2669,13 +2669,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2687,13 +2687,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2705,13 +2705,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2723,13 +2723,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2741,13 +2741,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2923,13 +2923,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2941,13 +2941,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2959,13 +2959,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2977,13 +2977,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -2995,13 +2995,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3013,13 +3013,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3031,13 +3031,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3049,13 +3049,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3067,13 +3067,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3085,13 +3085,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3267,13 +3267,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3285,13 +3285,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3303,13 +3303,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3321,13 +3321,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3339,13 +3339,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3357,13 +3357,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3375,13 +3375,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3393,13 +3393,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3411,13 +3411,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -3429,13 +3429,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -4228,14 +4228,14 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Some Value
Some Value
- 429
- 3
+ Some Value
+ Some Value
Some Value
Some Value
Microsoft.Azure.Cosmos.CosmosException
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.ChangeFeedAsync.xml b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.ChangeFeedAsync.xml
index c19bdc3c47..42d0cb4f23 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.ChangeFeedAsync.xml
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.ChangeFeedAsync.xml
@@ -1031,13 +1031,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 304
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -1050,13 +1050,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -1069,13 +1069,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -1088,13 +1088,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -1107,13 +1107,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -1791,13 +1791,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 304
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -1810,13 +1810,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -1829,13 +1829,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -1848,13 +1848,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -1867,13 +1867,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -2532,13 +2532,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 304
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -2551,13 +2551,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -2570,13 +2570,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -2589,13 +2589,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -2608,13 +2608,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -3293,13 +3293,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 304
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -3312,13 +3312,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -3331,13 +3331,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -3350,13 +3350,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -3369,13 +3369,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -3708,13 +3708,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
South Central US
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.MiscellanousAsync.xml b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.MiscellanousAsync.xml
index cff19fd002..533473c213 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.MiscellanousAsync.xml
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.MiscellanousAsync.xml
@@ -124,13 +124,13 @@
miscdbcustonhandler
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Delete
- 204
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -141,13 +141,13 @@
miscdbcustonhandler
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -265,13 +265,13 @@
miscdbdataplane
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Delete
- 204
- 0
+ Some Value
+ Some Value
Some Value
Some Value
@@ -282,13 +282,13 @@
miscdbdataplane
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.PointOperationsExceptionsAsync.xml b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.PointOperationsExceptionsAsync.xml
index 15a3a7a1c2..365d96f2c5 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.PointOperationsExceptionsAsync.xml
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.PointOperationsExceptionsAsync.xml
@@ -166,14 +166,14 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Some Value
Some Value
- 408
- 0
+ Some Value
+ Some Value
Some Value
South Central US
Some Value
@@ -443,14 +443,14 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Some Value
Some Value
- 429
- 3
+ Some Value
+ Some Value
Some Value
South Central US
Some Value
@@ -698,14 +698,14 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Some Value
Some Value
- 408
- 0
+ Some Value
+ Some Value
Some Value
South Central US
Some Value
@@ -985,14 +985,14 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Some Value
Some Value
- 408
- 0
+ Some Value
+ Some Value
Some Value
South Central US
Some Value
@@ -1336,14 +1336,14 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Some Value
Some Value
- 408
- 0
+ Some Value
+ Some Value
Some Value
South Central US
Some Value
@@ -1520,14 +1520,14 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Some Value
Some Value
- 503
- 20006
+ Some Value
+ Some Value
Some Value
South Central US
Some Value
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.QueryAsync.xml b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.QueryAsync.xml
index 1bb21e8747..5a1d7b5c43 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.QueryAsync.xml
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.QueryAsync.xml
@@ -647,13 +647,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -668,13 +668,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -689,13 +689,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -710,13 +710,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -1404,13 +1404,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -1425,13 +1425,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -1446,13 +1446,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -1467,13 +1467,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -2142,13 +2142,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -2163,13 +2163,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -2184,13 +2184,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -2205,13 +2205,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -2900,13 +2900,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -2921,13 +2921,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -2942,13 +2942,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -2963,13 +2963,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -3732,13 +3732,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -3753,13 +3753,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -3774,13 +3774,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -3795,13 +3795,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -4493,13 +4493,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -4514,13 +4514,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -4535,13 +4535,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -4556,13 +4556,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -5274,13 +5274,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -5295,13 +5295,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -5316,13 +5316,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -5337,13 +5337,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Query
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.ReadFeedAsync.xml b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.ReadFeedAsync.xml
index 4c8984d3b8..78241c3050 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.ReadFeedAsync.xml
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.ReadFeedAsync.xml
@@ -584,13 +584,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -604,13 +604,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -624,13 +624,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -644,13 +644,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -1274,13 +1274,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -1294,13 +1294,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -1314,13 +1314,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -1334,13 +1334,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -1945,13 +1945,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -1965,13 +1965,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -1985,13 +1985,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -2005,13 +2005,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -2636,13 +2636,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -2656,13 +2656,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -2676,13 +2676,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
@@ -2696,13 +2696,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
ReadFeed
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
Some Value
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.ReadManyAsync.xml b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.ReadManyAsync.xml
index 9900ce054d..ad6be29190 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.ReadManyAsync.xml
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.ReadManyAsync.xml
@@ -481,13 +481,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Read
- 200
- 0
+ Some Value
+ Some Value
Some Value
South Central US
@@ -995,13 +995,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Read
- 200
- 0
+ Some Value
+ Some Value
Some Value
South Central US
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.StreamPointOperationsAsync.xml b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.StreamPointOperationsAsync.xml
index 34415a6ee4..6bf7447aad 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.StreamPointOperationsAsync.xml
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.StreamPointOperationsAsync.xml
@@ -107,13 +107,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -230,13 +230,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Read
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -361,13 +361,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Replace
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -487,13 +487,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Delete
- 204
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.TypedPointOperationsAsync.xml b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.TypedPointOperationsAsync.xml
index bb3576f9ed..c3ce1e8786 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.TypedPointOperationsAsync.xml
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.TypedPointOperationsAsync.xml
@@ -127,13 +127,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Create
- 201
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -255,13 +255,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Read
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -396,13 +396,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Replace
- 200
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
@@ -526,13 +526,13 @@
containerName
cosmosdb
Some Value
- 127.0.0.1
+ 127.0.0.1
Some Value
Some Value
Direct
Delete
- 204
- 0
+ Some Value
+ Some Value
Some Value
Some Value
South Central US
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Tracing/AssertActivity.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Tracing/AssertActivity.cs
index 9a44ec0a82..3bc5b1be3c 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Tracing/AssertActivity.cs
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Tracing/AssertActivity.cs
@@ -40,7 +40,7 @@ public static void IsValidOperationActivity(Activity activity)
"db.system",
"db.name",
"db.operation",
- "net.peer.name",
+ "server.address",
"db.cosmosdb.client_id",
"db.cosmosdb.machine_id",
"user_agent.original",
@@ -53,9 +53,7 @@ public static void IsValidOperationActivity(Activity activity)
"db.cosmosdb.sub_status_code",
"db.cosmosdb.request_charge",
"db.cosmosdb.regions_contacted",
- "db.cosmosdb.retry_count",
"db.cosmosdb.item_count",
- "db.cosmosdb.request_diagnostics",
"exception.type",
"exception.message",
"exception.stacktrace",
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Tracing/CustomListener.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Tracing/CustomListener.cs
index 1ce1597ffd..8d5e79a78f 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Tracing/CustomListener.cs
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Tracing/CustomListener.cs
@@ -34,14 +34,12 @@ internal class CustomListener :
"az.namespace",
"db.operation",
"db.system",
- "net.peer.name",
+ "server.address",
"db.name",
"db.cosmosdb.container",
"db.cosmosdb.connection_mode",
"db.cosmosdb.operation_type",
"db.cosmosdb.regions_contacted",
- "db.cosmosdb.status_code",
- "db.cosmosdb.sub_status_code",
"rntbd.sub_status_code",
"rntbd.status_code",
"error.type"