v1: apm and events (CXX-3237, CXX-3238) (#1524)

* CXX-3236 update APM member function names for server heartbeat callbacks
* CXX 3236 Fix missing export macros

Author: eramongodb

src/mongocxx/include/mongocxx/v1/apm.hpp

@@ -254,14 +254,14 @@ class apm {
     /// @par Preconditions:
     /// - `fn` MUST NOT throw an exception when invoked.
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(apm&) on_heartbeat_started(
+    MONGOCXX_ABI_EXPORT_CDECL(apm&) on_server_heartbeat_started(
         std::function<void MONGOCXX_ABI_CDECL(v1::events::server_heartbeat_started const&)> fn);
 
     ///
     /// Return the current the "ServerHeartbeatStartedEvent" handler.
     ///
     MONGOCXX_ABI_EXPORT_CDECL(std::function<void MONGOCXX_ABI_CDECL(v1::events::server_heartbeat_started const&)>)
-    heartbeat_started() const;
+    server_heartbeat_started() const;
 
     ///
     /// Set the "ServerHeartbeatFailedEvent" handler.
@@ -271,14 +271,14 @@ class apm {
     /// @par Preconditions:
     /// - `fn` MUST NOT throw an exception when invoked.
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(apm&) on_heartbeat_failed(
+    MONGOCXX_ABI_EXPORT_CDECL(apm&) on_server_heartbeat_failed(
         std::function<void MONGOCXX_ABI_CDECL(v1::events::server_heartbeat_failed const&)> fn);
 
     ///
     /// Return the current the "ServerHeartbeatFailedEvent" handler.
     ///
     MONGOCXX_ABI_EXPORT_CDECL(std::function<void MONGOCXX_ABI_CDECL(v1::events::server_heartbeat_failed const&)>)
-    heartbeat_failed() const;
+    server_heartbeat_failed() const;
 
     ///
     /// Set the "ServerHeartbeatSucceededEvent" handler.
@@ -288,14 +288,16 @@ class apm {
     /// @par Preconditions:
     /// - `fn` MUST NOT throw an exception when invoked.
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(apm&) on_heartbeat_succeeded(
+    MONGOCXX_ABI_EXPORT_CDECL(apm&) on_server_heartbeat_succeeded(
         std::function<void MONGOCXX_ABI_CDECL(v1::events::server_heartbeat_succeeded const&)> fn);
 
     ///
     /// Return the current the "ServerHeartbeatSucceededEvent" handler.
     ///
     MONGOCXX_ABI_EXPORT_CDECL(std::function<void MONGOCXX_ABI_CDECL(v1::events::server_heartbeat_succeeded const&)>)
-    heartbeat_succeeded() const;
+    server_heartbeat_succeeded() const;
+
+    class internal;
 };
 
 } // namespace v1

src/mongocxx/include/mongocxx/v1/events/command_failed.hpp

@@ -87,6 +87,8 @@ class command_failed {
     ///
     MONGOCXX_ABI_EXPORT_CDECL(std::uint16_t) port() const;
 
+    class internal;
+
    private:
     /* explicit(false) */ command_failed(void const* impl);
 };

src/mongocxx/include/mongocxx/v1/events/command_started.hpp

@@ -87,6 +87,8 @@ class command_started {
     ///
     MONGOCXX_ABI_EXPORT_CDECL(std::uint16_t) port() const;
 
+    class internal;
+
    private:
     /* explicit(false) */ command_started(void const* impl);
 };

src/mongocxx/include/mongocxx/v1/events/command_succeeded.hpp

@@ -87,6 +87,8 @@ class command_succeeded {
     ///
     MONGOCXX_ABI_EXPORT_CDECL(std::uint16_t) port() const;
 
+    class internal;
+
    private:
     /* explicit(false) */ command_succeeded(void const* impl);
 };

src/mongocxx/include/mongocxx/v1/events/server_closed.hpp

@@ -60,6 +60,8 @@ class server_closed {
     ///
     MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v1::oid) topology_id() const;
 
+    class internal;
+
    private:
     /* explicit(false) */ server_closed(void const* impl);
 };

src/mongocxx/include/mongocxx/v1/events/server_description.hpp

@@ -72,12 +72,12 @@ class server_description {
     ///
     /// Copy constructor.
     ///
-    server_description(server_description const& other);
+    MONGOCXX_ABI_EXPORT_CDECL() server_description(server_description const& other);
 
     ///
     /// Copy assignment.
     ///
-    server_description& operator=(server_description const& other);
+    MONGOCXX_ABI_EXPORT_CDECL(server_description&) operator=(server_description const& other);
 
     ///
     /// Return the client-generated unique server ID.
@@ -124,6 +124,11 @@ class server_description {
     /// Return the port number for the connection used by the command.
     ///
     MONGOCXX_ABI_EXPORT_CDECL(std::uint16_t) port() const;
+
+    class internal;
+
+   private:
+    /* explicit(false) */ server_description(void* impl);
 };
 
 } // namespace events

src/mongocxx/include/mongocxx/v1/events/server_description_changed.hpp

@@ -72,6 +72,8 @@ class server_description_changed {
     ///
     MONGOCXX_ABI_EXPORT_CDECL(v1::events::server_description) new_description() const;
 
+    class internal;
+
    private:
     /* explicit(false) */ server_description_changed(void const* impl);
 };

src/mongocxx/include/mongocxx/v1/events/server_heartbeat_failed.hpp

@@ -72,6 +72,8 @@ class server_heartbeat_failed {
     ///
     MONGOCXX_ABI_EXPORT_CDECL(bool) awaited() const;
 
+    class internal;
+
    private:
     /* explicit(false) */ server_heartbeat_failed(void const* impl);
 };

src/mongocxx/include/mongocxx/v1/events/server_heartbeat_started.hpp

@@ -61,6 +61,8 @@ class server_heartbeat_started {
     ///
     MONGOCXX_ABI_EXPORT_CDECL(bool) awaited() const;
 
+    class internal;
+
    private:
     /* explicit(false) */ server_heartbeat_started(void const* impl);
 };

src/mongocxx/include/mongocxx/v1/events/server_heartbeat_succeeded.hpp

@@ -73,6 +73,8 @@ class server_heartbeat_succeeded {
     ///
     MONGOCXX_ABI_EXPORT_CDECL(bool) awaited() const;
 
+    class internal;
+
    private:
     /* explicit(false) */ server_heartbeat_succeeded(void const* impl);
 };