Skip to content

Commit eb0160e

Browse files
sourabh1007sourabh1007
authored
Open telemetry: Fixes Populating Query text for non-stream Iterator (#4860)
## Description Ref. #4851 for detailed explanation ## Type of change - [] Bug fix (non-breaking change which fixes an issue) - ## Closing issues To automatically close an issue: closes #4851
1 parent 018dd20 commit eb0160e

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

‎Microsoft.Azure.Cosmos/src/Resource/FeedIterators/FeedIteratorCore.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@ internal FeedIteratorCore(
218218

219219
this.operationName = feedIterator.operationName;
220220
this.operationType = feedIterator.operationType;
221+
222+
this.querySpec = feedIterator.querySpec;
221223
}
222224

223225
public override bool HasMoreResults => this.feedIterator.HasMoreResults;

‎Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/EndToEndTraceWriterBaselineTests.QueryAsync.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,6 +1354,7 @@
13541354
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
13551355
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
13561356
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
1357+
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
13571358
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
13581359
</ACTIVITY>
13591360
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
@@ -1375,6 +1376,7 @@
13751376
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
13761377
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
13771378
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
1379+
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
13781380
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
13791381
</ACTIVITY>
13801382
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
@@ -1396,6 +1398,7 @@
13961398
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
13971399
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
13981400
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
1401+
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
13991402
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
14001403
</ACTIVITY>
14011404
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
@@ -1417,6 +1420,7 @@
14171420
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
14181421
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
14191422
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
1423+
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
14201424
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
14211425
</ACTIVITY>
14221426
<EVENT name="ThresholdViolation" />
@@ -2782,6 +2786,7 @@
27822786
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
27832787
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
27842788
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
2789+
<ATTRIBUTE key="db.query.text">SELECT * FROM c WHERE c.id != @customIdentifier</ATTRIBUTE>
27852790
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
27862791
</ACTIVITY>
27872792
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
@@ -2803,6 +2808,7 @@
28032808
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
28042809
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
28052810
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
2811+
<ATTRIBUTE key="db.query.text">SELECT * FROM c WHERE c.id != @customIdentifier</ATTRIBUTE>
28062812
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
28072813
</ACTIVITY>
28082814
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
@@ -2824,6 +2830,7 @@
28242830
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
28252831
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
28262832
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
2833+
<ATTRIBUTE key="db.query.text">SELECT * FROM c WHERE c.id != @customIdentifier</ATTRIBUTE>
28272834
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
28282835
</ACTIVITY>
28292836
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
@@ -2845,6 +2852,7 @@
28452852
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
28462853
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
28472854
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
2855+
<ATTRIBUTE key="db.query.text">SELECT * FROM c WHERE c.id != @customIdentifier</ATTRIBUTE>
28482856
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
28492857
</ACTIVITY>
28502858
<EVENT name="ThresholdViolation" />
@@ -3578,6 +3586,7 @@
35783586
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
35793587
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
35803588
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
3589+
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
35813590
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
35823591
</ACTIVITY>
35833592
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
@@ -3599,6 +3608,7 @@
35993608
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
36003609
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
36013610
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
3611+
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
36023612
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
36033613
</ACTIVITY>
36043614
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
@@ -3620,6 +3630,7 @@
36203630
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
36213631
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
36223632
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
3633+
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
36233634
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
36243635
</ACTIVITY>
36253636
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
@@ -3641,6 +3652,7 @@
36413652
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
36423653
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
36433654
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
3655+
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
36443656
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
36453657
</ACTIVITY>
36463658
<EVENT name="ThresholdViolation" />
@@ -5024,6 +5036,7 @@
50245036
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
50255037
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
50265038
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
5039+
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
50275040
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
50285041
</ACTIVITY>
50295042
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
@@ -5045,6 +5058,7 @@
50455058
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
50465059
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
50475060
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
5061+
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
50485062
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
50495063
</ACTIVITY>
50505064
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
@@ -5066,6 +5080,7 @@
50665080
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
50675081
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
50685082
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
5083+
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
50695084
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
50705085
</ACTIVITY>
50715086
<ACTIVITY source="Azure.Cosmos.Operation" operationName="Operation.query_items" displayName="query_items containerName">
@@ -5087,6 +5102,7 @@
50875102
<ATTRIBUTE key="db.cosmosdb.item_count">Some Value</ATTRIBUTE>
50885103
<ATTRIBUTE key="db.cosmosdb.activity_id">Some Value</ATTRIBUTE>
50895104
<ATTRIBUTE key="db.cosmosdb.correlated_activity_id">Some Value</ATTRIBUTE>
5105+
<ATTRIBUTE key="db.query.text">SELECT * FROM c</ATTRIBUTE>
50905106
<ATTRIBUTE key="db.cosmosdb.regions_contacted">South Central US</ATTRIBUTE>
50915107
</ACTIVITY>
50925108
<EVENT name="ThresholdViolation" />

0 commit comments

Comments
 (0)