Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix merge conflict
  • Loading branch information
sourabh1007 committed Oct 31, 2024
commit b04873756e1e3b939daca02a15caee4b54a38ce9
Original file line number Diff line number Diff line change
Expand Up @@ -1391,15 +1391,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
Expand All @@ -1425,15 +1421,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
Expand All @@ -1459,15 +1451,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
Expand All @@ -1493,15 +1481,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
</ACTIVITY>
<EVENT name="ThresholdViolation" />
<EVENT name="ThresholdViolation" />
Expand Down Expand Up @@ -2903,15 +2887,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c WHERE c.id != @customIdentifier</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c WHERE c.id != @customIdentifier</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
Expand All @@ -2937,15 +2917,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c WHERE c.id != @customIdentifier</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c WHERE c.id != @customIdentifier</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
Expand All @@ -2971,15 +2947,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c WHERE c.id != @customIdentifier</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c WHERE c.id != @customIdentifier</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
Expand All @@ -3005,15 +2977,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c WHERE c.id != @customIdentifier</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c WHERE c.id != @customIdentifier</ATTRIBUTE>
</ACTIVITY>
<EVENT name="ThresholdViolation" />
<EVENT name="ThresholdViolation" />
Expand Down Expand Up @@ -3751,15 +3719,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
Expand All @@ -3785,15 +3749,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
Expand All @@ -3819,15 +3779,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
Expand All @@ -3853,15 +3809,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
</ACTIVITY>
<EVENT name="ThresholdViolation" />
<EVENT name="ThresholdViolation" />
Expand Down Expand Up @@ -5281,15 +5233,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
Expand All @@ -5315,15 +5263,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
Expand All @@ -5349,15 +5293,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
</ACTIVITY>
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
<ATTRIBUTE key="az.namespace">Microsoft.DocumentDB</ATTRIBUTE>
Expand All @@ -5383,15 +5323,11 @@
<ATTRIBUTE key="db.cosmosdb.request_charge">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
<<<<<<< HEAD
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
=======
>>>>>>> 226ace122 (update contracts)
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
<ATTRIBUTE key="db.response.status_code">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.row_count">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
</ACTIVITY>
<EVENT name="ThresholdViolation" />
<EVENT name="ThresholdViolation" />
Expand Down