Skip to content

Sync up command monitoring specs #1538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 31, 2024
Merged

Sync up command monitoring specs #1538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4874a4
Sync up command monitoring specs
NathanQingyangXu Oct 29, 2024
2cce0c9
Change the ticket id for the skipped case
NathanQingyangXu Oct 29, 2024
685f1ea
change as per code review comments
NathanQingyangXu Oct 29, 2024
b94d366
revert back changes in find.json for outdated spec
NathanQingyangXu Oct 30, 2024
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
172 changes: 20 additions & 152 deletions driver-core/src/test/resources/unified-test-format/command-monitoring/command.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
{
"description": "command-logging",
"schemaVersion": "1.13",
"description": "command",
"schemaVersion": "1.0",
"createEntities": [
{
"client": {
"id": "client",
"observeLogMessages": {
"command": "debug"
}
"observeEvents": [
"commandStartedEvent",
"commandSucceededEvent",
"commandFailedEvent"
]
}
},
{
"database": {
"id": "database",
"client": "client",
"databaseName": "logging-tests"
"databaseName": "command-monitoring-tests"
}
},
{
"collection": {
"id": "collection",
"database": "database",
"collectionName": "logging-tests-collection"
"collectionName": "test"
}
}
],
"initialData": [
{
"collectionName": "logging-tests-collection",
"databaseName": "logging-tests",
"collectionName": "test",
"databaseName": "command-monitoring-tests",
"documents": [
{
"_id": 1,
Expand All @@ -52,159 +54,25 @@
}
}
],
"expectLogMessages": [
"expectEvents": [
{
"client": "client",
"messages": [
"events": [
{
"level": "debug",
"component": "command",
"data": {
"message": "Command started",
"databaseName": "logging-tests",
"commandName": "ping",
"commandStartedEvent": {
"command": {
"$$matchAsDocument": {
"$$matchAsRoot": {
"ping": 1,
"$db": "logging-tests"
}
}
},
"requestId": {
"$$type": [
"int",
"long"
]
"ping": 1
},
"serverHost": {
"$$type": "string"
},
"serverPort": {
"$$type": [
"int",
"long"
]
}
}
},
{
"level": "debug",
"component": "command",
"data": {
"message": "Command succeeded",
"databaseName": "logging-tests",
"commandName": "ping",
"reply": {
"$$type": "string"
},
"requestId": {
"$$type": [
"int",
"long"
]
},
"serverHost": {
"$$type": "string"
},
"serverPort": {
"$$type": [
"int",
"long"
]
},
"durationMS": {
"$$type": [
"double",
"int",
"long"
]
}
}
}
]
}
]
},
{
"description": "A failed command",
"operations": [
{
"name": "find",
"object": "collection",
"arguments": {
"filter": {
"$or": true
}
},
"expectError": {
"isClientError": false
}
}
],
"expectLogMessages": [
{
"client": "client",
"messages": [
{
"level": "debug",
"component": "command",
"data": {
"message": "Command started",
"databaseName": "logging-tests",
"commandName": "find",
"command": {
"$$type": "string"
},
"requestId": {
"$$type": [
"int",
"long"
]
},
"serverHost": {
"$$type": "string"
},
"serverPort": {
"$$type": [
"int",
"long"
]
}
"databaseName": "command-monitoring-tests"
}
},
{
"level": "debug",
"component": "command",
"data": {
"message": "Command failed",
"databaseName": "logging-tests",
"commandName": "find",
"failure": {
"$$exists": true
},
"requestId": {
"$$type": [
"int",
"long"
]
},
"serverHost": {
"$$type": "string"
},
"serverPort": {
"$$type": [
"int",
"long"
]
"commandSucceededEvent": {
"reply": {
"ok": 1
},
"durationMS": {
"$$type": [
"double",
"int",
"long"
]
}
"commandName": "ping"
}
}
]
Expand Down
12 changes: 1 addition & 11 deletions ...re/src/test/resources/unified-test-format/command-monitoring/unacknowledgedBulkWrite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,7 @@
"object": "collection",
"arguments": {
"filter": {}
},
"expectResult": [
{
"_id": 1,
"x": 11
},
{
"_id": "unorderedBulkWriteInsertW0",
"x": 44
}
]
}
}
],
"expectEvents": [
Expand Down
20 changes: 10 additions & 10 deletions driver-core/src/test/resources/unified-test-format/command-monitoring/writeConcernError.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"description": "writeConcernError",
"schemaVersion": "1.13",
"schemaVersion": "1.4",
"runOnRequirements": [
{
"minServerVersion": "4.1.0",
"minServerVersion": "4.3.1",
"topologies": [
"replicaset"
],
Expand Down Expand Up @@ -66,11 +66,11 @@
"failCommands": [
"insert"
],
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 91,
"errorLabels": [
"RetryableWriteError"
]
"code": 91
}
}
}
Expand Down Expand Up @@ -112,11 +112,11 @@
"reply": {
"ok": 1,
"n": 1,
"errorLabels": [
"RetryableWriteError"
],
"writeConcernError": {
"code": 91,
"errorLabels": [
"RetryableWriteError"
]
"code": 91
}
},
"commandName": "insert"
Expand Down