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 8e464a9b6e..a659800720 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
@@ -2596,753 +2596,6 @@
   <EVENT name="ThresholdViolation" />
   <EVENT name="ThresholdViolation" />
   <EVENT name="ThresholdViolation" />
-</OTelActivities></Output>
-  </Result>
-  <Result>
-    <Input>
-      <Description>ChangeFeed API With Query</Description>
-      <Setup><![CDATA[
-    ContainerInternal containerInternal = (ContainerInternal)container;
-    FeedIterator<JToken> feedIterator = containerInternal.GetChangeFeedIterator<JToken>(
-        ChangeFeedStartFrom.Beginning(),
-        ChangeFeedMode.Incremental);
-
-    List<ITrace> traces = new List<ITrace>();
-
-    while (feedIterator.HasMoreResults)
-    {
-        FeedResponse<JToken> responseMessage = await feedIterator.ReadNextAsync(cancellationToken: default);
-        if (responseMessage.StatusCode == System.Net.HttpStatusCode.NotModified)
-        {
-            break;
-        }
-
-        ITrace trace = ((CosmosTraceDiagnostics)responseMessage.Diagnostics).Value;
-        traces.Add(trace);
-    }
-
-    ITrace traceForest = TraceJoiner.JoinTraces(traces);
-]]></Setup>
-    </Input>
-    <Output>
-      <Text><![CDATA[.
-└── Trace Forest(00000000-0000-0000-0000-000000000000)  Unknown-Component  00:00:00:000  0.00 milliseconds  
-    ├── Typed FeedIterator ReadNextAsync(00000000-0000-0000-0000-000000000000)  Transport-Component  00:00:00:000  0.00 milliseconds  
-    │   │   (
-    │   │       [Client Configuration]
-    │   │       Redacted To Not Change The Baselines From Run To Run
-    │   │       [DistributedTraceId]
-    │   │       Redacted To Not Change The Baselines From Run To Run
-    │   │   )
-    │   ├── ChangeFeed MoveNextAsync(00000000-0000-0000-0000-000000000000)  ChangeFeed-Component  00:00:00:000  0.00 milliseconds  
-    │   │   └── MoveNextAsync(00000000-0000-0000-0000-000000000000)  Pagination-Component  00:00:00:000  0.00 milliseconds  
-    │   │       ├── [,FF) move next(00000000-0000-0000-0000-000000000000)  Pagination-Component  00:00:00:000  0.00 milliseconds  
-    │   │       │   └── Prefetch(00000000-0000-0000-0000-000000000000)  Pagination-Component  00:00:00:000  0.00 milliseconds  
-    │   │       │       └── [,FF) move next(00000000-0000-0000-0000-000000000000)  Pagination-Component  00:00:00:000  0.00 milliseconds  
-    │   │       │           └── Microsoft.Azure.Cosmos.Handlers.RequestInvokerHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │       │               ├── Get Collection Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │       │               ├── Get Partition Key Range Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │       │               └── Try Get Overlapping Ranges(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │       ├── Get Container Properties(00000000-0000-0000-0000-000000000000)  Transport-Component  00:00:00:000  0.00 milliseconds  
-    │   │       │   └── Get Collection Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │       ├── Get RID(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │       ├── Get Collection Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │       ├── Get Overlapping Feed Ranges(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │       │   └── Get Partition Key Ranges(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │       │       └── Try Get Overlapping Ranges(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │       └── MoveNextAsync(00000000-0000-0000-0000-000000000000)  Pagination-Component  00:00:00:000  0.00 milliseconds  
-    │   │           └── [,05C1CFFFFFFFF8) move next(00000000-0000-0000-0000-000000000000)  Pagination-Component  00:00:00:000  0.00 milliseconds  
-    │   │               └── Microsoft.Azure.Cosmos.Handlers.RequestInvokerHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                   ├── Get Collection Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │                   ├── Get Partition Key Range Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │                   ├── Try Get Overlapping Ranges(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │                   └── Microsoft.Azure.Cosmos.Handlers.DiagnosticsHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                       │   (
-    │   │                       │       [System Info]
-    │   │                       │       Redacted To Not Change The Baselines From Run To Run
-    │   │                       │   )
-    │   │                       └── Microsoft.Azure.Cosmos.Handlers.TelemetryHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                           └── Microsoft.Azure.Cosmos.Handlers.RetryHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                               └── Microsoft.Azure.Cosmos.Handlers.RouterHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                                   └── Microsoft.Azure.Cosmos.Handlers.TransportHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                                       └── Microsoft.Azure.Documents.ServerStoreModel Transport Request(00000000-0000-0000-0000-000000000000)  Transport-Component  00:00:00:000  0.00 milliseconds  
-    │   │                                               (
-    │   │                                                   [Client Side Request Stats]
-    │   │                                                   Redacted To Not Change The Baselines From Run To Run
-    │   │                                               )
-    │   ├── Get RID(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   ├── Get Collection Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   └── ChangeFeed Response Serialization(00000000-0000-0000-0000-000000000000)  Transport-Component  00:00:00:000  0.00 milliseconds  
-    ├── Typed FeedIterator ReadNextAsync(00000000-0000-0000-0000-000000000000)  Transport-Component  00:00:00:000  0.00 milliseconds  
-    │   │   (
-    │   │       [Client Configuration]
-    │   │       Redacted To Not Change The Baselines From Run To Run
-    │   │       [DistributedTraceId]
-    │   │       Redacted To Not Change The Baselines From Run To Run
-    │   │   )
-    │   ├── ChangeFeed MoveNextAsync(00000000-0000-0000-0000-000000000000)  ChangeFeed-Component  00:00:00:000  0.00 milliseconds  
-    │   │   └── MoveNextAsync(00000000-0000-0000-0000-000000000000)  Pagination-Component  00:00:00:000  0.00 milliseconds  
-    │   │       └── [05C1CFFFFFFFF8,05C1DFFFFFFFF8) move next(00000000-0000-0000-0000-000000000000)  Pagination-Component  00:00:00:000  0.00 milliseconds  
-    │   │           └── Microsoft.Azure.Cosmos.Handlers.RequestInvokerHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │               ├── Get Collection Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │               ├── Get Partition Key Range Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │               ├── Try Get Overlapping Ranges(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │               └── Microsoft.Azure.Cosmos.Handlers.DiagnosticsHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                   │   (
-    │   │                   │       [System Info]
-    │   │                   │       Redacted To Not Change The Baselines From Run To Run
-    │   │                   │   )
-    │   │                   └── Microsoft.Azure.Cosmos.Handlers.TelemetryHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                       └── Microsoft.Azure.Cosmos.Handlers.RetryHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                           └── Microsoft.Azure.Cosmos.Handlers.RouterHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                               └── Microsoft.Azure.Cosmos.Handlers.TransportHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                                   └── Microsoft.Azure.Documents.ServerStoreModel Transport Request(00000000-0000-0000-0000-000000000000)  Transport-Component  00:00:00:000  0.00 milliseconds  
-    │   │                                           (
-    │   │                                               [Client Side Request Stats]
-    │   │                                               Redacted To Not Change The Baselines From Run To Run
-    │   │                                           )
-    │   ├── Get RID(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   ├── Get Collection Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   └── ChangeFeed Response Serialization(00000000-0000-0000-0000-000000000000)  Transport-Component  00:00:00:000  0.00 milliseconds  
-    ├── Typed FeedIterator ReadNextAsync(00000000-0000-0000-0000-000000000000)  Transport-Component  00:00:00:000  0.00 milliseconds  
-    │   │   (
-    │   │       [Client Configuration]
-    │   │       Redacted To Not Change The Baselines From Run To Run
-    │   │       [DistributedTraceId]
-    │   │       Redacted To Not Change The Baselines From Run To Run
-    │   │   )
-    │   ├── ChangeFeed MoveNextAsync(00000000-0000-0000-0000-000000000000)  ChangeFeed-Component  00:00:00:000  0.00 milliseconds  
-    │   │   └── MoveNextAsync(00000000-0000-0000-0000-000000000000)  Pagination-Component  00:00:00:000  0.00 milliseconds  
-    │   │       └── [05C1DFFFFFFFF8,05C1E7FFFFFFFA) move next(00000000-0000-0000-0000-000000000000)  Pagination-Component  00:00:00:000  0.00 milliseconds  
-    │   │           └── Microsoft.Azure.Cosmos.Handlers.RequestInvokerHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │               ├── Get Collection Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │               ├── Get Partition Key Range Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │               ├── Try Get Overlapping Ranges(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   │               └── Microsoft.Azure.Cosmos.Handlers.DiagnosticsHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                   │   (
-    │   │                   │       [System Info]
-    │   │                   │       Redacted To Not Change The Baselines From Run To Run
-    │   │                   │   )
-    │   │                   └── Microsoft.Azure.Cosmos.Handlers.TelemetryHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                       └── Microsoft.Azure.Cosmos.Handlers.RetryHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                           └── Microsoft.Azure.Cosmos.Handlers.RouterHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                               └── Microsoft.Azure.Cosmos.Handlers.TransportHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-    │   │                                   └── Microsoft.Azure.Documents.ServerStoreModel Transport Request(00000000-0000-0000-0000-000000000000)  Transport-Component  00:00:00:000  0.00 milliseconds  
-    │   │                                           (
-    │   │                                               [Client Side Request Stats]
-    │   │                                               Redacted To Not Change The Baselines From Run To Run
-    │   │                                           )
-    │   ├── Get RID(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   ├── Get Collection Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-    │   └── ChangeFeed Response Serialization(00000000-0000-0000-0000-000000000000)  Transport-Component  00:00:00:000  0.00 milliseconds  
-    └── Typed FeedIterator ReadNextAsync(00000000-0000-0000-0000-000000000000)  Transport-Component  00:00:00:000  0.00 milliseconds  
-        │   (
-        │       [Client Configuration]
-        │       Redacted To Not Change The Baselines From Run To Run
-        │       [DistributedTraceId]
-        │       Redacted To Not Change The Baselines From Run To Run
-        │   )
-        ├── ChangeFeed MoveNextAsync(00000000-0000-0000-0000-000000000000)  ChangeFeed-Component  00:00:00:000  0.00 milliseconds  
-        │   └── MoveNextAsync(00000000-0000-0000-0000-000000000000)  Pagination-Component  00:00:00:000  0.00 milliseconds  
-        │       └── [05C1E7FFFFFFFA,FF) move next(00000000-0000-0000-0000-000000000000)  Pagination-Component  00:00:00:000  0.00 milliseconds  
-        │           └── Microsoft.Azure.Cosmos.Handlers.RequestInvokerHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-        │               ├── Get Collection Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-        │               ├── Get Partition Key Range Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-        │               ├── Try Get Overlapping Ranges(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-        │               └── Microsoft.Azure.Cosmos.Handlers.DiagnosticsHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-        │                   │   (
-        │                   │       [System Info]
-        │                   │       Redacted To Not Change The Baselines From Run To Run
-        │                   │   )
-        │                   └── Microsoft.Azure.Cosmos.Handlers.TelemetryHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-        │                       └── Microsoft.Azure.Cosmos.Handlers.RetryHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-        │                           └── Microsoft.Azure.Cosmos.Handlers.RouterHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-        │                               └── Microsoft.Azure.Cosmos.Handlers.TransportHandler(00000000-0000-0000-0000-000000000000)  RequestHandler-Component  00:00:00:000  0.00 milliseconds  
-        │                                   └── Microsoft.Azure.Documents.ServerStoreModel Transport Request(00000000-0000-0000-0000-000000000000)  Transport-Component  00:00:00:000  0.00 milliseconds  
-        │                                           (
-        │                                               [Client Side Request Stats]
-        │                                               Redacted To Not Change The Baselines From Run To Run
-        │                                           )
-        ├── Get RID(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-        ├── Get Collection Cache(00000000-0000-0000-0000-000000000000)  Routing-Component  00:00:00:000  0.00 milliseconds  
-        └── ChangeFeed Response Serialization(00000000-0000-0000-0000-000000000000)  Transport-Component  00:00:00:000  0.00 milliseconds  
-]]></Text>
-      <Json><![CDATA[{
-  "Summary": {},
-  "name": "Trace Forest",
-  "start datetime": "0001-01-01T00:00:00Z",
-  "duration in milliseconds": 0,
-  "children": [
-    {
-      "name": "Typed FeedIterator ReadNextAsync",
-      "duration in milliseconds": 0,
-      "data": {
-        "Client Configuration": "Redacted To Not Change The Baselines From Run To Run",
-        "DistributedTraceId": "Redacted To Not Change The Baselines From Run To Run"
-      },
-      "children": [
-        {
-          "name": "ChangeFeed MoveNextAsync",
-          "duration in milliseconds": 0,
-          "children": [
-            {
-              "name": "MoveNextAsync",
-              "duration in milliseconds": 0,
-              "children": [
-                {
-                  "name": "[,FF) move next",
-                  "duration in milliseconds": 0,
-                  "children": [
-                    {
-                      "name": "Prefetch",
-                      "duration in milliseconds": 0,
-                      "children": [
-                        {
-                          "name": "[,FF) move next",
-                          "duration in milliseconds": 0,
-                          "children": [
-                            {
-                              "name": "Microsoft.Azure.Cosmos.Handlers.RequestInvokerHandler",
-                              "duration in milliseconds": 0,
-                              "children": [
-                                {
-                                  "name": "Get Collection Cache",
-                                  "duration in milliseconds": 0
-                                },
-                                {
-                                  "name": "Get Partition Key Range Cache",
-                                  "duration in milliseconds": 0
-                                },
-                                {
-                                  "name": "Try Get Overlapping Ranges",
-                                  "duration in milliseconds": 0
-                                }
-                              ]
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  ]
-                },
-                {
-                  "name": "Get Container Properties",
-                  "duration in milliseconds": 0,
-                  "children": [
-                    {
-                      "name": "Get Collection Cache",
-                      "duration in milliseconds": 0
-                    }
-                  ]
-                },
-                {
-                  "name": "Get RID",
-                  "duration in milliseconds": 0
-                },
-                {
-                  "name": "Get Collection Cache",
-                  "duration in milliseconds": 0
-                },
-                {
-                  "name": "Get Overlapping Feed Ranges",
-                  "duration in milliseconds": 0,
-                  "children": [
-                    {
-                      "name": "Get Partition Key Ranges",
-                      "duration in milliseconds": 0,
-                      "children": [
-                        {
-                          "name": "Try Get Overlapping Ranges",
-                          "duration in milliseconds": 0
-                        }
-                      ]
-                    }
-                  ]
-                },
-                {
-                  "name": "MoveNextAsync",
-                  "duration in milliseconds": 0,
-                  "children": [
-                    {
-                      "name": "[,05C1CFFFFFFFF8) move next",
-                      "duration in milliseconds": 0,
-                      "children": [
-                        {
-                          "name": "Microsoft.Azure.Cosmos.Handlers.RequestInvokerHandler",
-                          "duration in milliseconds": 0,
-                          "children": [
-                            {
-                              "name": "Get Collection Cache",
-                              "duration in milliseconds": 0
-                            },
-                            {
-                              "name": "Get Partition Key Range Cache",
-                              "duration in milliseconds": 0
-                            },
-                            {
-                              "name": "Try Get Overlapping Ranges",
-                              "duration in milliseconds": 0
-                            },
-                            {
-                              "name": "Microsoft.Azure.Cosmos.Handlers.DiagnosticsHandler",
-                              "duration in milliseconds": 0,
-                              "data": {
-                                "System Info": "Redacted To Not Change The Baselines From Run To Run"
-                              },
-                              "children": [
-                                {
-                                  "name": "Microsoft.Azure.Cosmos.Handlers.TelemetryHandler",
-                                  "duration in milliseconds": 0,
-                                  "children": [
-                                    {
-                                      "name": "Microsoft.Azure.Cosmos.Handlers.RetryHandler",
-                                      "duration in milliseconds": 0,
-                                      "children": [
-                                        {
-                                          "name": "Microsoft.Azure.Cosmos.Handlers.RouterHandler",
-                                          "duration in milliseconds": 0,
-                                          "children": [
-                                            {
-                                              "name": "Microsoft.Azure.Cosmos.Handlers.TransportHandler",
-                                              "duration in milliseconds": 0,
-                                              "children": [
-                                                {
-                                                  "name": "Microsoft.Azure.Documents.ServerStoreModel Transport Request",
-                                                  "duration in milliseconds": 0,
-                                                  "data": {
-                                                    "Client Side Request Stats": "Redacted To Not Change The Baselines From Run To Run"
-                                                  }
-                                                }
-                                              ]
-                                            }
-                                          ]
-                                        }
-                                      ]
-                                    }
-                                  ]
-                                }
-                              ]
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "Get RID",
-          "duration in milliseconds": 0
-        },
-        {
-          "name": "Get Collection Cache",
-          "duration in milliseconds": 0
-        },
-        {
-          "name": "ChangeFeed Response Serialization",
-          "duration in milliseconds": 0
-        }
-      ]
-    },
-    {
-      "name": "Typed FeedIterator ReadNextAsync",
-      "duration in milliseconds": 0,
-      "data": {
-        "Client Configuration": "Redacted To Not Change The Baselines From Run To Run",
-        "DistributedTraceId": "Redacted To Not Change The Baselines From Run To Run"
-      },
-      "children": [
-        {
-          "name": "ChangeFeed MoveNextAsync",
-          "duration in milliseconds": 0,
-          "children": [
-            {
-              "name": "MoveNextAsync",
-              "duration in milliseconds": 0,
-              "children": [
-                {
-                  "name": "[05C1CFFFFFFFF8,05C1DFFFFFFFF8) move next",
-                  "duration in milliseconds": 0,
-                  "children": [
-                    {
-                      "name": "Microsoft.Azure.Cosmos.Handlers.RequestInvokerHandler",
-                      "duration in milliseconds": 0,
-                      "children": [
-                        {
-                          "name": "Get Collection Cache",
-                          "duration in milliseconds": 0
-                        },
-                        {
-                          "name": "Get Partition Key Range Cache",
-                          "duration in milliseconds": 0
-                        },
-                        {
-                          "name": "Try Get Overlapping Ranges",
-                          "duration in milliseconds": 0
-                        },
-                        {
-                          "name": "Microsoft.Azure.Cosmos.Handlers.DiagnosticsHandler",
-                          "duration in milliseconds": 0,
-                          "data": {
-                            "System Info": "Redacted To Not Change The Baselines From Run To Run"
-                          },
-                          "children": [
-                            {
-                              "name": "Microsoft.Azure.Cosmos.Handlers.TelemetryHandler",
-                              "duration in milliseconds": 0,
-                              "children": [
-                                {
-                                  "name": "Microsoft.Azure.Cosmos.Handlers.RetryHandler",
-                                  "duration in milliseconds": 0,
-                                  "children": [
-                                    {
-                                      "name": "Microsoft.Azure.Cosmos.Handlers.RouterHandler",
-                                      "duration in milliseconds": 0,
-                                      "children": [
-                                        {
-                                          "name": "Microsoft.Azure.Cosmos.Handlers.TransportHandler",
-                                          "duration in milliseconds": 0,
-                                          "children": [
-                                            {
-                                              "name": "Microsoft.Azure.Documents.ServerStoreModel Transport Request",
-                                              "duration in milliseconds": 0,
-                                              "data": {
-                                                "Client Side Request Stats": "Redacted To Not Change The Baselines From Run To Run"
-                                              }
-                                            }
-                                          ]
-                                        }
-                                      ]
-                                    }
-                                  ]
-                                }
-                              ]
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "Get RID",
-          "duration in milliseconds": 0
-        },
-        {
-          "name": "Get Collection Cache",
-          "duration in milliseconds": 0
-        },
-        {
-          "name": "ChangeFeed Response Serialization",
-          "duration in milliseconds": 0
-        }
-      ]
-    },
-    {
-      "name": "Typed FeedIterator ReadNextAsync",
-      "duration in milliseconds": 0,
-      "data": {
-        "Client Configuration": "Redacted To Not Change The Baselines From Run To Run",
-        "DistributedTraceId": "Redacted To Not Change The Baselines From Run To Run"
-      },
-      "children": [
-        {
-          "name": "ChangeFeed MoveNextAsync",
-          "duration in milliseconds": 0,
-          "children": [
-            {
-              "name": "MoveNextAsync",
-              "duration in milliseconds": 0,
-              "children": [
-                {
-                  "name": "[05C1DFFFFFFFF8,05C1E7FFFFFFFA) move next",
-                  "duration in milliseconds": 0,
-                  "children": [
-                    {
-                      "name": "Microsoft.Azure.Cosmos.Handlers.RequestInvokerHandler",
-                      "duration in milliseconds": 0,
-                      "children": [
-                        {
-                          "name": "Get Collection Cache",
-                          "duration in milliseconds": 0
-                        },
-                        {
-                          "name": "Get Partition Key Range Cache",
-                          "duration in milliseconds": 0
-                        },
-                        {
-                          "name": "Try Get Overlapping Ranges",
-                          "duration in milliseconds": 0
-                        },
-                        {
-                          "name": "Microsoft.Azure.Cosmos.Handlers.DiagnosticsHandler",
-                          "duration in milliseconds": 0,
-                          "data": {
-                            "System Info": "Redacted To Not Change The Baselines From Run To Run"
-                          },
-                          "children": [
-                            {
-                              "name": "Microsoft.Azure.Cosmos.Handlers.TelemetryHandler",
-                              "duration in milliseconds": 0,
-                              "children": [
-                                {
-                                  "name": "Microsoft.Azure.Cosmos.Handlers.RetryHandler",
-                                  "duration in milliseconds": 0,
-                                  "children": [
-                                    {
-                                      "name": "Microsoft.Azure.Cosmos.Handlers.RouterHandler",
-                                      "duration in milliseconds": 0,
-                                      "children": [
-                                        {
-                                          "name": "Microsoft.Azure.Cosmos.Handlers.TransportHandler",
-                                          "duration in milliseconds": 0,
-                                          "children": [
-                                            {
-                                              "name": "Microsoft.Azure.Documents.ServerStoreModel Transport Request",
-                                              "duration in milliseconds": 0,
-                                              "data": {
-                                                "Client Side Request Stats": "Redacted To Not Change The Baselines From Run To Run"
-                                              }
-                                            }
-                                          ]
-                                        }
-                                      ]
-                                    }
-                                  ]
-                                }
-                              ]
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "Get RID",
-          "duration in milliseconds": 0
-        },
-        {
-          "name": "Get Collection Cache",
-          "duration in milliseconds": 0
-        },
-        {
-          "name": "ChangeFeed Response Serialization",
-          "duration in milliseconds": 0
-        }
-      ]
-    },
-    {
-      "name": "Typed FeedIterator ReadNextAsync",
-      "duration in milliseconds": 0,
-      "data": {
-        "Client Configuration": "Redacted To Not Change The Baselines From Run To Run",
-        "DistributedTraceId": "Redacted To Not Change The Baselines From Run To Run"
-      },
-      "children": [
-        {
-          "name": "ChangeFeed MoveNextAsync",
-          "duration in milliseconds": 0,
-          "children": [
-            {
-              "name": "MoveNextAsync",
-              "duration in milliseconds": 0,
-              "children": [
-                {
-                  "name": "[05C1E7FFFFFFFA,FF) move next",
-                  "duration in milliseconds": 0,
-                  "children": [
-                    {
-                      "name": "Microsoft.Azure.Cosmos.Handlers.RequestInvokerHandler",
-                      "duration in milliseconds": 0,
-                      "children": [
-                        {
-                          "name": "Get Collection Cache",
-                          "duration in milliseconds": 0
-                        },
-                        {
-                          "name": "Get Partition Key Range Cache",
-                          "duration in milliseconds": 0
-                        },
-                        {
-                          "name": "Try Get Overlapping Ranges",
-                          "duration in milliseconds": 0
-                        },
-                        {
-                          "name": "Microsoft.Azure.Cosmos.Handlers.DiagnosticsHandler",
-                          "duration in milliseconds": 0,
-                          "data": {
-                            "System Info": "Redacted To Not Change The Baselines From Run To Run"
-                          },
-                          "children": [
-                            {
-                              "name": "Microsoft.Azure.Cosmos.Handlers.TelemetryHandler",
-                              "duration in milliseconds": 0,
-                              "children": [
-                                {
-                                  "name": "Microsoft.Azure.Cosmos.Handlers.RetryHandler",
-                                  "duration in milliseconds": 0,
-                                  "children": [
-                                    {
-                                      "name": "Microsoft.Azure.Cosmos.Handlers.RouterHandler",
-                                      "duration in milliseconds": 0,
-                                      "children": [
-                                        {
-                                          "name": "Microsoft.Azure.Cosmos.Handlers.TransportHandler",
-                                          "duration in milliseconds": 0,
-                                          "children": [
-                                            {
-                                              "name": "Microsoft.Azure.Documents.ServerStoreModel Transport Request",
-                                              "duration in milliseconds": 0,
-                                              "data": {
-                                                "Client Side Request Stats": "Redacted To Not Change The Baselines From Run To Run"
-                                              }
-                                            }
-                                          ]
-                                        }
-                                      ]
-                                    }
-                                  ]
-                                }
-                              ]
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "Get RID",
-          "duration in milliseconds": 0
-        },
-        {
-          "name": "Get Collection Cache",
-          "duration in milliseconds": 0
-        },
-        {
-          "name": "ChangeFeed Response Serialization",
-          "duration in milliseconds": 0
-        }
-      ]
-    }
-  ]
-}]]></Json><OTelActivities>
-  <ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.Typed FeedIterator ReadNextAsync" displayName="Typed FeedIterator ReadNextAsync containerName">
-    <ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
-    <ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
-    <ATTRIBUTE key="db.operation.name">Typed FeedIterator ReadNextAsync</ATTRIBUTE>
-    <ATTRIBUTE key="db.namespace">databaseName</ATTRIBUTE>
-    <ATTRIBUTE key="db.collection.name">containerName</ATTRIBUTE>
-    <ATTRIBUTE key="db.system">cosmosdb</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.machine_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="server.address">127.0.0.1</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.client_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="user_agent.original">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.connection_mode">Direct</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.operation_type">ReadFeed</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.status_code">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.sub_status_code">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
-  </ACTIVITY>
-  <ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.Typed FeedIterator ReadNextAsync" displayName="Typed FeedIterator ReadNextAsync containerName">
-    <ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
-    <ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
-    <ATTRIBUTE key="db.operation.name">Typed FeedIterator ReadNextAsync</ATTRIBUTE>
-    <ATTRIBUTE key="db.namespace">databaseName</ATTRIBUTE>
-    <ATTRIBUTE key="db.collection.name">containerName</ATTRIBUTE>
-    <ATTRIBUTE key="db.system">cosmosdb</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.machine_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="server.address">127.0.0.1</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.client_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="user_agent.original">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.connection_mode">Direct</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.operation_type">ReadFeed</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.status_code">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.sub_status_code">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
-  </ACTIVITY>
-  <ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.Typed FeedIterator ReadNextAsync" displayName="Typed FeedIterator ReadNextAsync containerName">
-    <ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
-    <ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
-    <ATTRIBUTE key="db.operation.name">Typed FeedIterator ReadNextAsync</ATTRIBUTE>
-    <ATTRIBUTE key="db.namespace">databaseName</ATTRIBUTE>
-    <ATTRIBUTE key="db.collection.name">containerName</ATTRIBUTE>
-    <ATTRIBUTE key="db.system">cosmosdb</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.machine_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="server.address">127.0.0.1</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.client_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="user_agent.original">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.connection_mode">Direct</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.operation_type">ReadFeed</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.status_code">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.sub_status_code">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
-  </ACTIVITY>
-  <ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.Typed FeedIterator ReadNextAsync" displayName="Typed FeedIterator ReadNextAsync containerName">
-    <ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
-    <ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
-    <ATTRIBUTE key="db.operation.name">Typed FeedIterator ReadNextAsync</ATTRIBUTE>
-    <ATTRIBUTE key="db.namespace">databaseName</ATTRIBUTE>
-    <ATTRIBUTE key="db.collection.name">containerName</ATTRIBUTE>
-    <ATTRIBUTE key="db.system">cosmosdb</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.machine_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="server.address">127.0.0.1</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.client_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="user_agent.original">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.connection_mode">Direct</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.operation_type">ReadFeed</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.status_code">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.sub_status_code">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
-  </ACTIVITY>
-  <ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.Typed FeedIterator ReadNextAsync" displayName="Typed FeedIterator ReadNextAsync containerName">
-    <ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
-    <ATTRIBUTE key="az.schema_url">https://opentelemetry.io/schemas/1.23.0</ATTRIBUTE>
-    <ATTRIBUTE key="db.operation.name">Typed FeedIterator ReadNextAsync</ATTRIBUTE>
-    <ATTRIBUTE key="db.namespace">databaseName</ATTRIBUTE>
-    <ATTRIBUTE key="db.collection.name">containerName</ATTRIBUTE>
-    <ATTRIBUTE key="db.system">cosmosdb</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.machine_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="server.address">127.0.0.1</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.client_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="user_agent.original">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.connection_mode">Direct</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.operation_type">ReadFeed</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.status_code">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.sub_status_code">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
-    <ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
-  </ACTIVITY>
-  <EVENT name="ThresholdViolation" />
-  <EVENT name="ThresholdViolation" />
-  <EVENT name="ThresholdViolation" />
-  <EVENT name="ThresholdViolation" />
-  <EVENT name="ThresholdViolation" />
 </OTelActivities></Output>
   </Result>
   <Result>
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Tracing/EndToEndTraceWriterBaselineTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Tracing/EndToEndTraceWriterBaselineTests.cs
index 96fdea9f34..c666fea174 100644
--- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Tracing/EndToEndTraceWriterBaselineTests.cs
+++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Tracing/EndToEndTraceWriterBaselineTests.cs
@@ -387,42 +387,6 @@ public async Task ChangeFeedAsync()
             }
             //---------------------------------------------------------------- 
 
-            //----------------------------------------------------------------
-            //  ChangeFeed Public API Typed (With Query)
-            //----------------------------------------------------------------
-            {
-                ChangeFeedQuerySpec querySpec = new ChangeFeedQuerySpec("Select * from c");
-
-                startLineNumber = GetLineNumber();
-                ContainerInternal containerInternal = (ContainerInternal)container;
-                FeedIterator<JToken> feedIterator = containerInternal.GetChangeFeedIteratorWithQuery<JToken>(
-                    ChangeFeedStartFrom.Beginning(),
-                    ChangeFeedMode.Incremental,
-                    querySpec);
-
-                List<ITrace> traces = new List<ITrace>();
-
-                while (feedIterator.HasMoreResults)
-                {
-                    FeedResponse<JToken> responseMessage = await feedIterator.ReadNextAsync(cancellationToken: default);
-                    if (responseMessage.StatusCode == System.Net.HttpStatusCode.NotModified)
-                    {
-                        break;
-                    }
-
-                    ITrace trace = ((CosmosTraceDiagnostics)responseMessage.Diagnostics).Value;
-                    traces.Add(trace);
-                }
-
-                ITrace traceForest = TraceJoiner.JoinTraces(traces);
-                endLineNumber = GetLineNumber();
-
-                inputs.Add(new Input("ChangeFeed API With Query", traceForest, startLineNumber, endLineNumber, EndToEndTraceWriterBaselineTests.testListener?.GetRecordedAttributes()));
-
-                EndToEndTraceWriterBaselineTests.AssertAndResetActivityInformation();
-            }
-            //---------------------------------------------------------------- 
-
             //----------------------------------------------------------------
             //  ChangeFeed Public API Typed
             //----------------------------------------------------------------