Skip to content

Commit a4ba943

Browse files
committed
Aligning tests with spec
1 parent 9579400 commit a4ba943

30 files changed

+697
-73
lines changed

source/open-telemetry/tests/operation/aggregate.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@
6767
"db.collection.name": "test",
6868
"db.command.name": "aggregate",
6969
"network.transport": "tcp",
70-
"db.mongodb.cursor_id": {
71-
"$$exists": false
72-
},
7370
"db.response.status_code": {
7471
"$$exists": false
7572
},

source/open-telemetry/tests/operation/aggregate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ tests:
3535
db.collection.name: test
3636
db.operation.name: aggregate
3737
db.operation.summary: aggregate operation-aggregate.test
38+
3839
nested:
3940
- name: aggregate
4041
attributes:
@@ -43,7 +44,6 @@ tests:
4344
db.collection.name: *collectionName0
4445
db.command.name: aggregate
4546
network.transport: tcp
46-
db.mongodb.cursor_id: { $$exists: false }
4747
db.response.status_code: { $$exists: false }
4848
exception.message: { $$exists: false }
4949
exception.type: { $$exists: false }

source/open-telemetry/tests/operation/atlas_search.json

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,36 @@
113113
"attributes": {
114114
"db.system": "mongodb",
115115
"db.namespace": "operation-atlas-search",
116+
"db.command.name": "createSearchIndexes",
116117
"db.collection.name": "test",
118+
"db.mongodb.cursor_id": {
119+
"$$exists": false
120+
},
121+
"db.response.status_code": {
122+
"$$exists": false
123+
},
124+
"network.transport": "tcp",
125+
"db.mongodb.server_connection_id": {
126+
"$$type": [
127+
"int",
128+
"long"
129+
]
130+
},
131+
"db.mongodb.driver_connection_id": {
132+
"$$type": [
133+
"int",
134+
"long"
135+
]
136+
},
137+
"exception.message": {
138+
"$$exists": false
139+
},
140+
"exception.type": {
141+
"$$exists": false
142+
},
143+
"exception.stacktrace": {
144+
"$$exists": false
145+
},
117146
"server.address": {
118147
"$$type": "string"
119148
},
@@ -160,6 +189,7 @@
160189
"attributes": {
161190
"db.system": "mongodb",
162191
"db.namespace": "operation-atlas-search",
192+
"db.command.name": "updateSearchIndex",
163193
"db.collection.name": "test",
164194
"server.address": {
165195
"$$type": "string"
@@ -170,6 +200,34 @@
170200
"string"
171201
]
172202
},
203+
"db.mongodb.cursor_id": {
204+
"$$exists": false
205+
},
206+
"db.response.status_code": {
207+
"$$exists": false
208+
},
209+
"exception.message": {
210+
"$$exists": false
211+
},
212+
"exception.type": {
213+
"$$exists": false
214+
},
215+
"exception.stacktrace": {
216+
"$$exists": false
217+
},
218+
"network.transport": "tcp",
219+
"db.mongodb.server_connection_id": {
220+
"$$type": [
221+
"int",
222+
"long"
223+
]
224+
},
225+
"db.mongodb.driver_connection_id": {
226+
"$$type": [
227+
"int",
228+
"long"
229+
]
230+
},
173231
"db.query.summary": "updateSearchIndex operation-atlas-search.test",
174232
"db.query.text": {
175233
"$$matchAsDocument": {
@@ -199,6 +257,7 @@
199257
"attributes": {
200258
"db.system": "mongodb",
201259
"db.namespace": "operation-atlas-search",
260+
"db.command.name": "dropSearchIndex",
202261
"db.collection.name": "test",
203262
"server.address": {
204263
"$$type": "string"
@@ -209,6 +268,34 @@
209268
"string"
210269
]
211270
},
271+
"db.mongodb.cursor_id": {
272+
"$$exists": false
273+
},
274+
"db.response.status_code": {
275+
"$$exists": false
276+
},
277+
"exception.message": {
278+
"$$exists": false
279+
},
280+
"exception.type": {
281+
"$$exists": false
282+
},
283+
"exception.stacktrace": {
284+
"$$exists": false
285+
},
286+
"network.transport": "tcp",
287+
"db.mongodb.server_connection_id": {
288+
"$$type": [
289+
"int",
290+
"long"
291+
]
292+
},
293+
"db.mongodb.driver_connection_id": {
294+
"$$type": [
295+
"int",
296+
"long"
297+
]
298+
},
212299
"db.query.summary": "dropSearchIndex operation-atlas-search.test",
213300
"db.query.text": {
214301
"$$matchAsDocument": {

source/open-telemetry/tests/operation/atlas_search.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,18 @@ tests:
8080
attributes:
8181
db.system: mongodb
8282
db.namespace: operation-atlas-search
83+
db.command.name: createSearchIndexes
8384
db.collection.name: test
85+
db.mongodb.cursor_id: { $$exists: false }
86+
db.response.status_code: { $$exists: false }
87+
network.transport: tcp
88+
db.mongodb.server_connection_id:
89+
$$type: [ int, long ]
90+
db.mongodb.driver_connection_id:
91+
$$type: [ int, long ]
92+
exception.message: { $$exists: false }
93+
exception.type: { $$exists: false }
94+
exception.stacktrace: { $$exists: false }
8495
server.address: { $$type: string }
8596
server.port: { $$type: [ long, string ] }
8697
db.query.summary: createSearchIndexes operation-atlas-search.test
@@ -97,14 +108,26 @@ tests:
97108
db.collection.name: test
98109
db.operation.name: updateSearchIndex
99110
db.operation.summary: updateSearchIndex operation-atlas-search.test
111+
100112
nested:
101113
- name: updateSearchIndex
102114
attributes:
103115
db.system: mongodb
104116
db.namespace: operation-atlas-search
117+
db.command.name: updateSearchIndex
105118
db.collection.name: test
106119
server.address: { $$type: string }
107120
server.port: { $$type: [ long, string ] }
121+
db.mongodb.cursor_id: { $$exists: false }
122+
db.response.status_code: { $$exists: false }
123+
exception.message: { $$exists: false }
124+
exception.type: { $$exists: false }
125+
exception.stacktrace: { $$exists: false }
126+
network.transport: tcp
127+
db.mongodb.server_connection_id:
128+
$$type: [ int, long ]
129+
db.mongodb.driver_connection_id:
130+
$$type: [ int, long ]
108131
db.query.summary: updateSearchIndex operation-atlas-search.test
109132
db.query.text:
110133
$$matchAsDocument:
@@ -125,9 +148,20 @@ tests:
125148
attributes:
126149
db.system: mongodb
127150
db.namespace: operation-atlas-search
151+
db.command.name: dropSearchIndex
128152
db.collection.name: test
129153
server.address: { $$type: string }
130154
server.port: { $$type: [ long, string ] }
155+
db.mongodb.cursor_id: { $$exists: false }
156+
db.response.status_code: { $$exists: false }
157+
exception.message: { $$exists: false }
158+
exception.type: { $$exists: false }
159+
exception.stacktrace: { $$exists: false }
160+
network.transport: tcp
161+
db.mongodb.server_connection_id:
162+
$$type: [ int, long ]
163+
db.mongodb.driver_connection_id:
164+
$$type: [ int, long ]
131165
db.query.summary: dropSearchIndex operation-atlas-search.test
132166
db.query.text:
133167
$$matchAsDocument:

source/open-telemetry/tests/operation/delete.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"name": "delete",
6262
"attributes": {
6363
"db.system": "mongodb",
64+
"db.command.name": "delete",
6465
"db.namespace": "operation-delete",
6566
"db.collection.name": "test",
6667
"server.address": {
@@ -72,6 +73,34 @@
7273
"string"
7374
]
7475
},
76+
"db.mongodb.cursor_id": {
77+
"$$exists": false
78+
},
79+
"db.response.status_code": {
80+
"$$exists": false
81+
},
82+
"exception.message": {
83+
"$$exists": false
84+
},
85+
"exception.type": {
86+
"$$exists": false
87+
},
88+
"exception.stacktrace": {
89+
"$$exists": false
90+
},
91+
"network.transport": "tcp",
92+
"db.mongodb.server_connection_id": {
93+
"$$type": [
94+
"int",
95+
"long"
96+
]
97+
},
98+
"db.mongodb.driver_connection_id": {
99+
"$$type": [
100+
"int",
101+
"long"
102+
]
103+
},
75104
"db.query.summary": "delete operation-delete.test",
76105
"db.query.text": {
77106
"$$matchAsDocument": {

source/open-telemetry/tests/operation/delete.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,21 @@ tests:
3838
- name: delete
3939
attributes:
4040
db.system: mongodb
41+
db.command.name: delete
4142
db.namespace: operation-delete
4243
db.collection.name: test
4344
server.address: { $$type: string }
4445
server.port: { $$type: [ long, string ] }
46+
db.mongodb.cursor_id: { $$exists: false }
47+
db.response.status_code: { $$exists: false }
48+
exception.message: { $$exists: false }
49+
exception.type: { $$exists: false }
50+
exception.stacktrace: { $$exists: false }
51+
network.transport: tcp
52+
db.mongodb.server_connection_id:
53+
$$type: [ int, long ]
54+
db.mongodb.driver_connection_id:
55+
$$type: [ int, long ]
4556
db.query.summary: delete operation-delete.test
4657
db.query.text:
4758
$$matchAsDocument:

source/open-telemetry/tests/operation/drop_collection.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ tests:
3838
db.collection.name: test
3939
db.operation.name: dropCollection
4040
db.operation.summary: dropCollection operation-drop-collection.test
41+
4142
nested:
4243
- name: drop
4344
attributes:

source/open-telemetry/tests/operation/find.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@
7070
"db.collection.name": "test",
7171
"db.command.name": "find",
7272
"network.transport": "tcp",
73-
"db.mongodb.cursor_id": {
74-
"$$exists": false
75-
},
7673
"db.response.status_code": {
7774
"$$exists": false
7875
},
@@ -238,9 +235,6 @@
238235
"db.collection.name": "test",
239236
"db.command.name": "find",
240237
"network.transport": "tcp",
241-
"db.mongodb.cursor_id": {
242-
"$$exists": false
243-
},
244238
"db.response.status_code": {
245239
"$$exists": false
246240
},

source/open-telemetry/tests/operation/find.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ tests:
4444
db.collection.name: test
4545
db.command.name: find
4646
network.transport: tcp
47-
db.mongodb.cursor_id: { $$exists: false }
4847
db.response.status_code: { $$exists: false }
4948
exception.message: { $$exists: false }
5049
exception.type: { $$exists: false }
@@ -125,7 +124,6 @@ tests:
125124
db.collection.name: test
126125
db.command.name: find
127126
network.transport: tcp
128-
db.mongodb.cursor_id: { $$exists: false }
129127
db.response.status_code: { $$exists: false }
130128
exception.message: { $$exists: false }
131129
exception.type: { $$exists: false }

source/open-telemetry/tests/operation/find_and_modify.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"database": {
1616
"id": "database0",
1717
"client": "client0",
18-
"databaseName": "operation-aggregate"
18+
"databaseName": "operation-find-one-and-update"
1919
}
2020
},
2121
{
@@ -59,20 +59,20 @@
5959
"ignoreExtraSpans": false,
6060
"spans": [
6161
{
62-
"name": "findAndModify operation-aggregate.test",
62+
"name": "findAndModify operation-find-one-and-update.test",
6363
"attributes": {
6464
"db.system": "mongodb",
65-
"db.namespace": "operation-aggregate",
65+
"db.namespace": "operation-find-one-and-update",
6666
"db.collection.name": "test",
6767
"db.operation.name": "findAndModify",
68-
"db.operation.summary": "findAndModify operation-aggregate.test"
68+
"db.operation.summary": "findAndModify operation-find-one-and-update.test"
6969
},
7070
"nested": [
7171
{
7272
"name": "findAndModify",
7373
"attributes": {
7474
"db.system": "mongodb",
75-
"db.namespace": "operation-aggregate",
75+
"db.namespace": "operation-find-one-and-update",
7676
"db.collection.name": "test",
7777
"db.command.name": "findAndModify",
7878
"network.transport": "tcp",
@@ -100,7 +100,7 @@
100100
"long"
101101
]
102102
},
103-
"db.query.summary": "findAndModify operation-aggregate.test",
103+
"db.query.summary": "findAndModify operation-find-one-and-update.test",
104104
"db.query.text": {
105105
"$$matchAsDocument": {
106106
"$$matchAsRoot": {

0 commit comments

Comments
 (0)