PHPC-2699: Rename durationMicros properties (#1991)

alcaeus · web-flow · commit 065e58f961dd · 2026-04-16T12:23:07.000Z
diff --git a/src/MongoDB/Monitoring/CommandFailedEvent.c b/src/MongoDB/Monitoring/CommandFailedEvent.c
@@ -172,7 +172,7 @@ static void phongo_commandfailedevent_update_properties(phongo_commandfailedeven
 	zend_update_property_long(phongo_commandfailedevent_ce, &intern->std, ZEND_STRL("port"), intern->host.port);
 	zend_update_property_string(phongo_commandfailedevent_ce, &intern->std, ZEND_STRL("commandName"), intern->command_name);
 	zend_update_property_string(phongo_commandfailedevent_ce, &intern->std, ZEND_STRL("databaseName"), intern->database_name);
-	zend_update_property_long(phongo_commandfailedevent_ce, &intern->std, ZEND_STRL("durationMicros"), intern->duration_micros);
+	zend_update_property_long(phongo_commandfailedevent_ce, &intern->std, ZEND_STRL("duration"), intern->duration_micros);
 	zend_update_property(phongo_commandfailedevent_ce, &intern->std, ZEND_STRL("error"), &intern->z_error);
 
 	if (phongo_bson_to_zval_ex(intern->reply, &reply_state)) {
diff --git a/src/MongoDB/Monitoring/CommandFailedEvent.stub.php b/src/MongoDB/Monitoring/CommandFailedEvent.stub.php
@@ -14,7 +14,7 @@ final class CommandFailedEvent
     public readonly int $port;
     public readonly string $commandName;
     public readonly string $databaseName;
-    public readonly int $durationMicros;
+    public readonly int $duration;
     public readonly \Exception $error;
     public readonly object $reply;
     public readonly string $operationId;
diff --git a/src/MongoDB/Monitoring/CommandFailedEvent_arginfo.h b/src/MongoDB/Monitoring/CommandFailedEvent_arginfo.h
diff --git a/src/MongoDB/Monitoring/CommandSucceededEvent.c b/src/MongoDB/Monitoring/CommandSucceededEvent.c
@@ -162,7 +162,7 @@ static void phongo_commandsucceededevent_update_properties(phongo_commandsucceed
 	zend_update_property_long(phongo_commandsucceededevent_ce, &intern->std, ZEND_STRL("port"), intern->host.port);
 	zend_update_property_string(phongo_commandsucceededevent_ce, &intern->std, ZEND_STRL("commandName"), intern->command_name);
 	zend_update_property_string(phongo_commandsucceededevent_ce, &intern->std, ZEND_STRL("databaseName"), intern->database_name);
-	zend_update_property_long(phongo_commandsucceededevent_ce, &intern->std, ZEND_STRL("durationMicros"), intern->duration_micros);
+	zend_update_property_long(phongo_commandsucceededevent_ce, &intern->std, ZEND_STRL("duration"), intern->duration_micros);
 
 	if (phongo_bson_to_zval_ex(intern->reply, &reply_state)) {
 		zend_update_property(phongo_commandsucceededevent_ce, &intern->std, ZEND_STRL("reply"), &reply_state.zchild);
diff --git a/src/MongoDB/Monitoring/CommandSucceededEvent.stub.php b/src/MongoDB/Monitoring/CommandSucceededEvent.stub.php
@@ -14,7 +14,7 @@ final class CommandSucceededEvent
     public readonly int $port;
     public readonly string $commandName;
     public readonly string $databaseName;
-    public readonly int $durationMicros;
+    public readonly int $duration;
     public readonly object $reply;
     public readonly string $operationId;
     public readonly string $requestId;
diff --git a/src/MongoDB/Monitoring/CommandSucceededEvent_arginfo.h b/src/MongoDB/Monitoring/CommandSucceededEvent_arginfo.h
diff --git a/src/MongoDB/Monitoring/ServerHeartbeatFailedEvent.c b/src/MongoDB/Monitoring/ServerHeartbeatFailedEvent.c
@@ -81,7 +81,7 @@ static void phongo_serverheartbeatfailedevent_update_properties(phongo_serverhea
 	zend_update_property_string(phongo_serverheartbeatfailedevent_ce, &intern->std, ZEND_STRL("host"), intern->host.host);
 	zend_update_property_long(phongo_serverheartbeatfailedevent_ce, &intern->std, ZEND_STRL("port"), intern->host.port);
 	zend_update_property_bool(phongo_serverheartbeatfailedevent_ce, &intern->std, ZEND_STRL("awaited"), intern->awaited);
-	zend_update_property_long(phongo_serverheartbeatfailedevent_ce, &intern->std, ZEND_STRL("durationMicros"), intern->duration_micros);
+	zend_update_property_long(phongo_serverheartbeatfailedevent_ce, &intern->std, ZEND_STRL("duration"), intern->duration_micros);
 	zend_update_property(phongo_serverheartbeatfailedevent_ce, &intern->std, ZEND_STRL("error"), &intern->z_error);
 }
 
diff --git a/src/MongoDB/Monitoring/ServerHeartbeatFailedEvent.stub.php b/src/MongoDB/Monitoring/ServerHeartbeatFailedEvent.stub.php
@@ -13,7 +13,7 @@ final class ServerHeartbeatFailedEvent
     public readonly string $host;
     public readonly int $port;
     public readonly bool $awaited;
-    public readonly int $durationMicros;
+    public readonly int $duration;
     public readonly \Exception $error;
 
     final private function __construct() {}
diff --git a/src/MongoDB/Monitoring/ServerHeartbeatFailedEvent_arginfo.h b/src/MongoDB/Monitoring/ServerHeartbeatFailedEvent_arginfo.h
diff --git a/src/MongoDB/Monitoring/ServerHeartbeatSucceededEvent.c b/src/MongoDB/Monitoring/ServerHeartbeatSucceededEvent.c
@@ -93,7 +93,7 @@ static void phongo_serverheartbeatsucceededevent_update_properties(phongo_server
 	zend_update_property_string(phongo_serverheartbeatsucceededevent_ce, &intern->std, ZEND_STRL("host"), intern->host.host);
 	zend_update_property_long(phongo_serverheartbeatsucceededevent_ce, &intern->std, ZEND_STRL("port"), intern->host.port);
 	zend_update_property_bool(phongo_serverheartbeatsucceededevent_ce, &intern->std, ZEND_STRL("awaited"), intern->awaited);
-	zend_update_property_long(phongo_serverheartbeatsucceededevent_ce, &intern->std, ZEND_STRL("durationMicros"), intern->duration_micros);
+	zend_update_property_long(phongo_serverheartbeatsucceededevent_ce, &intern->std, ZEND_STRL("duration"), intern->duration_micros);
 
 	if (phongo_bson_to_zval_ex(intern->reply, &reply_state)) {
 		zend_update_property(phongo_serverheartbeatsucceededevent_ce, &intern->std, ZEND_STRL("reply"), &reply_state.zchild);
diff --git a/src/MongoDB/Monitoring/ServerHeartbeatSucceededEvent.stub.php b/src/MongoDB/Monitoring/ServerHeartbeatSucceededEvent.stub.php
@@ -13,7 +13,7 @@ final class ServerHeartbeatSucceededEvent
     public readonly string $host;
     public readonly int $port;
     public readonly bool $awaited;
-    public readonly int $durationMicros;
+    public readonly int $duration;
     public readonly object $reply;
 
     final private function __construct() {}
diff --git a/src/MongoDB/Monitoring/ServerHeartbeatSucceededEvent_arginfo.h b/src/MongoDB/Monitoring/ServerHeartbeatSucceededEvent_arginfo.h
diff --git a/tests/apm/commandFailedEvent-001.phpt b/tests/apm/commandFailedEvent-001.phpt
@@ -31,9 +31,9 @@ class MySubscriber implements MongoDB\Driver\Monitoring\CommandSubscriber
         var_dump($event->getDatabaseName());
         var_dump($event->databaseName);
         var_dump($event->getDurationMicros());
-        var_dump($event->durationMicros);
+        var_dump($event->duration);
         echo "getDurationMicros() returns > 0: ", $event->getDurationMicros() > 0 ? 'yes' : 'no', "\n";
-        echo "durationMicros returns > 0: ", $event->durationMicros > 0 ? 'yes' : 'no', "\n";
+        echo "duration returns > 0: ", $event->duration > 0 ? 'yes' : 'no', "\n";
         var_dump($event->getError() instanceof MongoDB\Driver\Exception\Exception);
         var_dump($event->error instanceof MongoDB\Driver\Exception\Exception);
         var_dump($event->getHost());
@@ -74,7 +74,7 @@ string(5) "admin"
 int(%d)
 int(%d)
 getDurationMicros() returns > 0: yes
-durationMicros returns > 0: yes
+duration returns > 0: yes
 bool(true)
 bool(true)
 string(%d) "%s"
diff --git a/tests/apm/commandFailedEvent-debug-001.phpt b/tests/apm/commandFailedEvent-debug-001.phpt
@@ -50,7 +50,7 @@ object(MongoDB\Driver\Monitoring\CommandFailedEvent)#%d (11) {
   string(9) "aggregate"
   ["databaseName"]=>
   string(%d) "%s"
-  ["durationMicros"]=>
+  ["duration"]=>
   int(%d)
   ["error"]=>
   object(MongoDB\Driver\Exception\ServerException)#%d (%d) {%A
diff --git a/tests/apm/commandSucceededEvent-001.phpt b/tests/apm/commandSucceededEvent-001.phpt
@@ -29,9 +29,9 @@ class MySubscriber implements MongoDB\Driver\Monitoring\CommandSubscriber
         var_dump($event->getDatabaseName());
         var_dump($event->databaseName);
         var_dump($event->getDurationMicros());
-        var_dump($event->durationMicros);
+        var_dump($event->duration);
         echo "getDurationMicros() returns > 0: ", $event->getDurationMicros() > 0 ? 'yes' : 'no', "\n";
-        echo "durationMicros returns > 0: ", $event->durationMicros > 0 ? 'yes' : 'no', "\n";
+        echo "duration returns > 0: ", $event->duration > 0 ? 'yes' : 'no', "\n";
         var_dump($event->getHost());
         var_dump($event->host);
         var_dump($event->getOperationId());
@@ -70,7 +70,7 @@ string(5) "admin"
 int(%d)
 int(%d)
 getDurationMicros() returns > 0: yes
-durationMicros returns > 0: yes
+duration returns > 0: yes
 string(%d) "%s"
 string(%d) "%s"
 string(%d) "%d"
diff --git a/tests/apm/commandSucceededEvent-debug-001.phpt b/tests/apm/commandSucceededEvent-debug-001.phpt
@@ -41,7 +41,7 @@ object(MongoDB\Driver\Monitoring\CommandSucceededEvent)#%d (10) {
   string(4) "ping"
   ["databaseName"]=>
   string(%d) "%s"
-  ["durationMicros"]=>
+  ["duration"]=>
   int(%d)
   ["reply"]=>
   object(stdClass)#%d (%d) {%A
diff --git a/tests/apm/serverHeartbeatFailedEvent-001.phpt b/tests/apm/serverHeartbeatFailedEvent-001.phpt
@@ -19,7 +19,7 @@ class MySubscriber implements MongoDB\Driver\Monitoring\SDAMSubscriber
     public function serverHeartbeatFailed(MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent $event): void
     {
         printf("getDurationMicros() returns an integer: %s\n", is_integer($event->getDurationMicros()) ? 'yes' : 'no');
-        printf("durationMicros returns an integer: %s\n", is_integer($event->durationMicros) ? 'yes' : 'no');
+        printf("duration returns an integer: %s\n", is_integer($event->duration) ? 'yes' : 'no');
         printf("getError() returns an Exception: %s\n", ($event->getError() instanceof Exception) ? 'yes' : 'no');
         printf("error returns an Exception: %s\n", ($event->error instanceof Exception) ? 'yes' : 'no');
         printf("getHost() returns a string: %s\n", is_string($event->getHost()) ? 'yes' : 'no');
@@ -67,7 +67,7 @@ configureFailPoint($m2, 'failCommand', 'off');
 <?php exit(0); ?>
 --EXPECTF--
 getDurationMicros() returns an integer: yes
-durationMicros returns an integer: yes
+duration returns an integer: yes
 getError() returns an Exception: yes
 error returns an Exception: yes
 getHost() returns a string: yes
@@ -83,7 +83,7 @@ object(MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent)#%d (%d) {
   int(%d)
   ["awaited"]=>
   bool(%s)
-  ["durationMicros"]=>
+  ["duration"]=>
   int(%d)
   ["error"]=>
   object(MongoDB\Driver\Exception\RuntimeException)#%d (%d) {%A
diff --git a/tests/apm/serverHeartbeatSucceededEvent-001.phpt b/tests/apm/serverHeartbeatSucceededEvent-001.phpt
@@ -29,7 +29,7 @@ class MySubscriber implements MongoDB\Driver\Monitoring\SDAMSubscriber
         $this->isObserved = true;
 
         printf("getDurationMicros() returns an integer: %s\n", is_integer($event->getDurationMicros()) ? 'yes' : 'no');
-        printf("durationMicros returns an integer: %s\n", is_integer($event->durationMicros) ? 'yes' : 'no');
+        printf("duration returns an integer: %s\n", is_integer($event->duration) ? 'yes' : 'no');
         printf("getHost() returns a string: %s\n", is_string($event->getHost()) ? 'yes' : 'no');
         printf("host returns a string: %s\n", is_string($event->host) ? 'yes' : 'no');
         printf("getPort() returns an integer: %s\n", is_integer($event->getPort()) ? 'yes' : 'no');
@@ -62,7 +62,7 @@ $m->executeCommand(DATABASE_NAME, $command);
 <?php exit(0); ?>
 --EXPECTF--
 getDurationMicros() returns an integer: yes
-durationMicros returns an integer: yes
+duration returns an integer: yes
 getHost() returns a string: yes
 host returns a string: yes
 getPort() returns an integer: yes
@@ -78,7 +78,7 @@ object(MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent)#%d (%d) {
   int(%d)
   ["awaited"]=>
   bool(%s)
-  ["durationMicros"]=>
+  ["duration"]=>
   int(%d)
   ["reply"]=>
   object(stdClass)#%d (%d) {%A

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ static void phongo_serverheartbeatfailedevent_update_properties(phongo_serverhea`
`81`	`81`	`zend_update_property_string(phongo_serverheartbeatfailedevent_ce, &intern->std, ZEND_STRL("host"), intern->host.host);`
`82`	`82`	`zend_update_property_long(phongo_serverheartbeatfailedevent_ce, &intern->std, ZEND_STRL("port"), intern->host.port);`
`83`	`83`	`zend_update_property_bool(phongo_serverheartbeatfailedevent_ce, &intern->std, ZEND_STRL("awaited"), intern->awaited);`
`84`		`- zend_update_property_long(phongo_serverheartbeatfailedevent_ce, &intern->std, ZEND_STRL("durationMicros"), intern->duration_micros);`
	`84`	`+ zend_update_property_long(phongo_serverheartbeatfailedevent_ce, &intern->std, ZEND_STRL("duration"), intern->duration_micros);`
`85`	`85`	`zend_update_property(phongo_serverheartbeatfailedevent_ce, &intern->std, ZEND_STRL("error"), &intern->z_error);`
`86`	`86`	`}`
`87`	`87`