Fix ABI failure and linter

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

include/gz/transport/NodeShared.hh

@@ -68,8 +68,14 @@ namespace gz
     {
       /// \brief NodeShared is a singleton. This method gets the
       /// NodeShared instance shared between all the nodes.
+      /// Note: This is deprecated. Please use \sa SharedInstance
       /// \return Pointer to the current NodeShared instance.
-      public: static std::shared_ptr<NodeShared> Instance();
+      public: static NodeShared *Instance() GZ_DEPRECATED(13);
+
+      /// \brief NodeShared is a singleton. This method gets the
+      /// a reference counted NodeShared instance shared between all the nodes.
+      /// \return A shared_ptr to the current NodeShared instance.
+      public: static std::shared_ptr<NodeShared> SharedInstance();
 
       /// \brief Receive data and control messages.
       public: void RunReceptionTask();

log/src/Recorder.cc

@@ -188,7 +188,7 @@ Recorder::Implementation::Implementation()
     this->OnMessageReceived(_data, _len, _info);
   };
 
-  auto shared = NodeShared::Instance();
+  auto shared = NodeShared::SharedInstance();
 
   this->discovery = std::make_unique<MsgDiscovery>(
       Uuid().ToString(), shared->discoveryIP, shared->msgDiscPort);

src/Node.cc

@@ -77,13 +77,13 @@ namespace gz
     //////////////////////////////////////////////////
     int rcvHwm()
     {
-      return NodeShared::Instance()->RcvHwm();
+      return NodeShared::SharedInstance()->RcvHwm();
     }
 
     //////////////////////////////////////////////////
     int sndHwm()
     {
-      return NodeShared::Instance()->SndHwm();
+      return NodeShared::SharedInstance()->SndHwm();
     }
 
     //////////////////////////////////////////////////
@@ -104,14 +104,14 @@ namespace gz
     {
       /// \brief Default constructor.
       public: PublisherPrivate()
-        : shared(NodeShared::Instance())
+        : shared(NodeShared::SharedInstance())
       {
       }
 
       /// \brief Constructor
       /// \param[in] _publisher The message publisher.
       public: explicit PublisherPrivate(const MessagePublisher &_publisher)
-        : shared(NodeShared::Instance()),
+        : shared(NodeShared::SharedInstance()),
           publisher(_publisher)
       {
       }

src/NodePrivate.hh

@@ -18,6 +18,7 @@
 #ifndef GZ_TRANSPORT_NODEPRIVATE_HH_
 #define GZ_TRANSPORT_NODEPRIVATE_HH_
 
+#include <memory>
 #include <string>
 #include <unordered_set>
 
@@ -32,6 +33,7 @@ namespace gz
   {
     inline namespace GZ_TRANSPORT_VERSION_NAMESPACE
     {
+    class NodeShared;
 
     /// \internal
     /// \brief Private data for Node class.
@@ -66,7 +68,7 @@ namespace gz
 
       /// \brief Pointer to the object shared between all the nodes within the
       /// same process.
-      public: std::shared_ptr<NodeShared> shared = NodeShared::Instance();
+      public: std::shared_ptr<NodeShared> shared = NodeShared::SharedInstance();
 
       /// \brief Partition for this node.
       public: std::string partition = hostname() + ":" + username();

src/NodeShared.cc

@@ -152,7 +152,17 @@ void sendAuthErrorHelper(zmq::socket_t &_socket, const std::string &_err)
 }
 
 //////////////////////////////////////////////////
-std::shared_ptr<NodeShared> NodeShared::Instance()
+NodeShared *NodeShared::Instance()
+{
+  // This is a deprecated function, but since it's public, the following ensures
+  // backward compatibility by instantiating a shared_ptr that never gets
+  // deleted.
+  static std::shared_ptr<NodeShared> nodeShared = NodeShared::SharedInstance();
+  return nodeShared.get();
+}
+
+//////////////////////////////////////////////////
+std::shared_ptr<NodeShared> NodeShared::SharedInstance()
 {
   // Create an instance of NodeShared per process so the ZMQ context
   // is not shared between different processes.