WL#15808: Fix logic that decides when "net.peer.port" attribute should be set.

Author: rsomla1

jdbc/driver/mysql_connection.cpp

@@ -1497,7 +1497,7 @@ void MySQL_Connection::init(ConnectOptionsMap & properties)
           connected = true;
 
           // Connected. We can set the connection telemetry.
-          intern->telemetry.set_attribs(this, *el);
+          intern->telemetry.set_attribs(this, *el, properties);
           currentUser = userName;
           break;
         }

jdbc/driver/mysql_telemetry.cpp

@@ -85,13 +85,17 @@ namespace telemetry
 
 
   void
-  Telemetry_base<MySQL_Connection>::set_attribs(MySQL_Connection *obj, MySQL_Uri::Host_data &data)
+  Telemetry_base<MySQL_Connection>::set_attribs(
+    MySQL_Connection* con, 
+    MySQL_Uri::Host_data& endpoint, 
+    sql::ConnectOptionsMap& options
+  )
   {
-    if (disabled(obj) || !span)
+    if (disabled(con) || !span)
       return;
 
     std::string transport;
-    switch(data.Protocol())
+    switch(endpoint.Protocol())
     {
       case NativeAPI::PROTOCOL_TCP:
         transport = "ip_tcp";
@@ -106,10 +110,19 @@ namespace telemetry
     }
 
     span->SetAttribute("net.transport", transport);
-    span->SetAttribute("net.peer.name", data.Host().c_str());
-    if (data.hasPort())
+    span->SetAttribute("net.peer.name", endpoint.Host().c_str());
+    
+    /*
+      Note: `endpoint.hasPort()` alone is not good because it tells whether
+      in a multi-host sceanrio a non-default port was specified for the chosen
+      endpoint. We want to send the port attribute also when
+      no endpint-specific port was given but user set the "global" port value
+      which is used for all hosts (which is a more typical scenario).
+    */
+
+    if (options.count(OPT_PORT) || endpoint.hasPort())
     {
-      span->SetAttribute("net.peer.port", data.Port());
+      span->SetAttribute("net.peer.port", endpoint.Port());
     }
   }
 

jdbc/driver/mysql_telemetry.h

@@ -58,63 +58,70 @@ namespace mysql
       be optimized out by the compiler).
     */
 
-#ifndef TELEMETRY
-
-    template<class>
-    struct Telemetry_base
-    {
-      void set_mode(opentelemetry_mode) {}
-    };
-
-    template<>
-    struct Telemetry_base<MySQL_Connection>
-    {
-      void set_mode(opentelemetry_mode) {}
-      void set_attribs(MySQL_Connection*, MySQL_Uri::Host_data&) {}
-    };
-
-#else
+#ifdef TELEMETRY
 
     namespace nostd      = opentelemetry::nostd;
     namespace trace      = opentelemetry::trace;
 
     using Span_ptr = nostd::shared_ptr<trace::Span>;
 
+#endif
+
+
     template<class Obj>
     struct Telemetry_base
     {
+#ifdef TELEMETRY
       bool disabled(Obj*) const;
       Span_ptr span;
 
     protected:
       Span_ptr mk_span(Obj*, const char *);
+#endif
     };
 
+
     template<>
     struct Telemetry_base<MySQL_Connection>
     {
       using Obj = MySQL_Connection;
-      Span_ptr span;
 
-      bool disabled(Obj *) const
+      void set_mode(opentelemetry_mode m) 
+#ifndef TELEMETRY
+      {}
+#else
       {
-        return OTEL_DISABLED == mode;
+        mode = m;
       }
+#endif
+
+      void set_attribs(
+        MySQL_Connection* con, 
+        MySQL_Uri::Host_data& endpoint, 
+        sql::ConnectOptionsMap& options
+      )
+#ifndef TELEMETRY
+      {}
+#else
+      ;   // Note: Defined in .cpp file
+#endif
 
+#ifdef TELEMETRY
+
+      Span_ptr span;
       enum opentelemetry_mode mode = OTEL_PREFERRED;
-      void set_mode(opentelemetry_mode m)
+
+      bool disabled(Obj *) const
       {
-        mode = m;
+        return OTEL_DISABLED == mode;
       }
 
-      void set_attribs(Obj*, MySQL_Uri::Host_data&);
-
     protected:
 
       Span_ptr mk_span(Obj*, const char *);
+#endif
     };
 
-#endif
 
     template<class Obj>
     struct Telemetry