CDRIVER-5936 remove deprecated *_get_server_connection_id API

kevinAlbs · web-flow · commit cbec298fdee4 · 2025-03-25T15:23:59.000-04:00
* remove `mongoc_apm_command_started_get_server_connection_id`
* remove `mongoc_apm_command_failed_get_server_connection_id`
* remove `mongoc_apm_command_succeeded_get_server_connection_id`
diff --git a/NEWS b/NEWS
@@ -38,6 +38,7 @@ Unreleased (2.0.0)
 * Support for LibreSSL (the CMake option `ENABLE_SSL=LIBRESSL`) is removed. Associated API is removed (`MONGOC_ENABLE_SSL_LIBRESSL` and  `mongoc_stream_tls_libressl_new`).
 * `MONGOC_WRITE_CONCERN_W_ERRORS_IGNORED` (value -1) is removed. Use `MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED` (value 0) which is handled equivalently. If specified in a URI, replace: `mongodb://host/?w=-1` with `mongodb://host/?w=0`.
 * The deprecated CMake option `ENABLE_AUTOMATIC_INIT_AND_CLEANUP` is removed. See [Initialization and cleanup](https://mongoc.org/libmongoc/1.30.2/init-cleanup.html) for expected use of `mongoc_init()` and `mongoc_cleanup()`.
+* Deprecated `mongoc_apm_command_*_get_server_connection_id` functions are removed. Use `mongoc_apm_command_*_get_server_connection_id_int64` instead.
 
 ### Forwarding headers (`#include <bson.h>` and `#include <mongoc.h>`)
 
diff --git a/src/libmongoc/doc/mongoc_apm_command_failed_get_server_connection_id.rst b/src/libmongoc/doc/mongoc_apm_command_failed_get_server_connection_id.rst
diff --git a/src/libmongoc/doc/mongoc_apm_command_failed_t.rst b/src/libmongoc/doc/mongoc_apm_command_failed_t.rst
@@ -30,7 +30,6 @@ An event notification sent when the driver fails to execute a MongoDB command.
     mongoc_apm_command_failed_get_request_id
     mongoc_apm_command_failed_get_server_id
     mongoc_apm_command_failed_get_service_id
-    mongoc_apm_command_failed_get_server_connection_id
     mongoc_apm_command_failed_get_server_connection_id_int64
 
 .. seealso::
diff --git a/src/libmongoc/doc/mongoc_apm_command_started_get_server_connection_id.rst b/src/libmongoc/doc/mongoc_apm_command_started_get_server_connection_id.rst
diff --git a/src/libmongoc/doc/mongoc_apm_command_started_t.rst b/src/libmongoc/doc/mongoc_apm_command_started_t.rst
@@ -32,6 +32,5 @@ An event notification sent when the driver begins executing a MongoDB command.
     mongoc_apm_command_started_get_request_id
     mongoc_apm_command_started_get_server_id
     mongoc_apm_command_started_get_service_id
-    mongoc_apm_command_started_get_server_connection_id
     mongoc_apm_command_started_get_server_connection_id_int64
 
diff --git a/src/libmongoc/doc/mongoc_apm_command_succeeded_get_server_connection_id.rst b/src/libmongoc/doc/mongoc_apm_command_succeeded_get_server_connection_id.rst
diff --git a/src/libmongoc/doc/mongoc_apm_command_succeeded_t.rst b/src/libmongoc/doc/mongoc_apm_command_succeeded_t.rst
@@ -33,6 +33,5 @@ An event notification sent when the driver successfully executes a MongoDB comma
     mongoc_apm_command_succeeded_get_request_id
     mongoc_apm_command_succeeded_get_server_id
     mongoc_apm_command_succeeded_get_service_id
-    mongoc_apm_command_succeeded_get_server_connection_id
     mongoc_apm_command_succeeded_get_server_connection_id_int64
 
diff --git a/src/libmongoc/src/mongoc/mongoc-apm.c b/src/libmongoc/src/mongoc/mongoc-apm.c
@@ -378,20 +378,6 @@ mongoc_apm_command_started_get_service_id (const mongoc_apm_command_started_t *e
 }
 
 
-int32_t
-mongoc_apm_command_started_get_server_connection_id (const mongoc_apm_command_started_t *event)
-{
-   if (event->server_connection_id > INT32_MAX || event->server_connection_id < INT32_MIN) {
-      MONGOC_WARNING ("Server connection ID %" PRId64 " is outside of int32 range. Returning -1. Use "
-                      "mongoc_apm_command_started_get_server_connection_id_int64.",
-                      event->server_connection_id);
-      return MONGOC_NO_SERVER_CONNECTION_ID;
-   }
-
-   return (int32_t) event->server_connection_id;
-}
-
-
 int64_t
 mongoc_apm_command_started_get_server_connection_id_int64 (const mongoc_apm_command_started_t *event)
 {
@@ -474,20 +460,6 @@ mongoc_apm_command_succeeded_get_service_id (const mongoc_apm_command_succeeded_
 }
 
 
-int32_t
-mongoc_apm_command_succeeded_get_server_connection_id (const mongoc_apm_command_succeeded_t *event)
-{
-   if (event->server_connection_id > INT32_MAX || event->server_connection_id < INT32_MIN) {
-      MONGOC_WARNING ("Server connection ID %" PRId64 " is outside of int32 range. Returning -1. Use "
-                      "mongoc_apm_command_succeeded_get_server_connection_id_int64.",
-                      event->server_connection_id);
-      return MONGOC_NO_SERVER_CONNECTION_ID;
-   }
-
-   return (int32_t) event->server_connection_id;
-}
-
-
 int64_t
 mongoc_apm_command_succeeded_get_server_connection_id_int64 (const mongoc_apm_command_succeeded_t *event)
 {
@@ -570,20 +542,6 @@ mongoc_apm_command_failed_get_service_id (const mongoc_apm_command_failed_t *eve
 }
 
 
-int32_t
-mongoc_apm_command_failed_get_server_connection_id (const mongoc_apm_command_failed_t *event)
-{
-   if (event->server_connection_id > INT32_MAX || event->server_connection_id < INT32_MIN) {
-      MONGOC_WARNING ("Server connection ID %" PRId64 " is outside of int32 range. Returning -1. Use "
-                      "mongoc_apm_command_failed_get_server_connection_id_int64.",
-                      event->server_connection_id);
-      return MONGOC_NO_SERVER_CONNECTION_ID;
-   }
-
-   return (int32_t) event->server_connection_id;
-}
-
-
 int64_t
 mongoc_apm_command_failed_get_server_connection_id_int64 (const mongoc_apm_command_failed_t *event)
 {
diff --git a/src/libmongoc/src/mongoc/mongoc-apm.h b/src/libmongoc/src/mongoc/mongoc-apm.h
@@ -101,9 +101,6 @@ mongoc_apm_command_started_get_server_id (const mongoc_apm_command_started_t *ev
 MONGOC_EXPORT (const bson_oid_t *)
 mongoc_apm_command_started_get_service_id (const mongoc_apm_command_started_t *event);
 
-BSON_DEPRECATED_FOR (mongoc_apm_command_started_get_server_connection_id_int64)
-MONGOC_EXPORT (int32_t) mongoc_apm_command_started_get_server_connection_id (const mongoc_apm_command_started_t *event);
-
 MONGOC_EXPORT (int64_t)
 mongoc_apm_command_started_get_server_connection_id_int64 (const mongoc_apm_command_started_t *event);
 
@@ -140,10 +137,6 @@ mongoc_apm_command_succeeded_get_server_id (const mongoc_apm_command_succeeded_t
 MONGOC_EXPORT (const bson_oid_t *)
 mongoc_apm_command_succeeded_get_service_id (const mongoc_apm_command_succeeded_t *event);
 
-BSON_DEPRECATED_FOR (mongoc_apm_command_succeeded_get_server_connection_id_int64)
-MONGOC_EXPORT (int32_t)
-   mongoc_apm_command_succeeded_get_server_connection_id (const mongoc_apm_command_succeeded_t *event);
-
 MONGOC_EXPORT (int64_t)
 mongoc_apm_command_succeeded_get_server_connection_id_int64 (const mongoc_apm_command_succeeded_t *event);
 
@@ -184,9 +177,6 @@ mongoc_apm_command_failed_get_server_id (const mongoc_apm_command_failed_t *even
 MONGOC_EXPORT (const bson_oid_t *)
 mongoc_apm_command_failed_get_service_id (const mongoc_apm_command_failed_t *event);
 
-BSON_DEPRECATED_FOR (mongoc_apm_command_failed_get_server_connection_id_int64)
-MONGOC_EXPORT (int32_t) mongoc_apm_command_failed_get_server_connection_id (const mongoc_apm_command_failed_t *event);
-
 MONGOC_EXPORT (int64_t)
 mongoc_apm_command_failed_get_server_connection_id_int64 (const mongoc_apm_command_failed_t *event);
 
