Bug 29394723/94444 REPORT RUN-TIME INFORMATION IN CONNECTION ATTRIBUTES, INSTEAD OF BUILT-TIME

Author: Bogdan Degtyariov

common/session.cc

@@ -47,6 +47,7 @@ POP_SYS_WARNINGS
 #ifndef _WIN32
 #include <sys/types.h>
 #include <unistd.h>
+#include <sys/utsname.h>
 #endif
 
 using namespace ::mysqlx::common;
@@ -85,22 +86,109 @@ void Settings_impl::set_client_opts(const Settings_impl &opts)
   set.commit();
 }
 
+/*
+  Get information about OS and platform architecture.
+  platform - an output parameter containig the string with the
+  platform architecture (such as 'i386' or 'x86_64' etc)
+
+  Returns the string containing the OS type and its version.
+  Note: it returns the version, not the number in the name of the OS.
+        In Windows it will be Windows-6.3.x instead of Windows-8.1
+*/
+std::string get_os_version_info(std::string &platform)
+{
+  std::stringstream ver_info;
+#ifdef _WIN32
+  HMODULE ntdll = GetModuleHandleA("ntdll.dll");
+  typedef long (NTAPI *tRtlGetVersion)(OSVERSIONINFO*);
+  tRtlGetVersion pRtlGetVersion = nullptr;
+  OSVERSIONINFO ver;
+  _SYSTEM_INFO hw_info;
+
+  memset(&ver, 0, sizeof(OSVERSIONINFO));
+  ver.dwOSVersionInfoSize = sizeof(sizeof(OSVERSIONINFO));
+
+  if (ntdll != nullptr)
+    pRtlGetVersion = (tRtlGetVersion)GetProcAddress(ntdll, "RtlGetVersion");
+
+  if (pRtlGetVersion)
+  {
+    pRtlGetVersion(&ver);
+  }
+  else
+  {
+    PUSH_SYS_WARNINGS
+      DISABLE_WARNING(4996)
+      if (GetVersionEx(&ver) == 0)
+        ver_info << "<unknown>";
+    POP_SYS_WARNINGS
+  }
+
+  // Check if version info was set to <unknown> because of error
+  if (ver_info.str().length() == 0)
+    ver_info << "Windows-"
+      << ver.dwMajorVersion << "."
+      << ver.dwMinorVersion << "."
+      << ver.dwBuildNumber;
+
+  GetSystemInfo(&hw_info);
+  switch (hw_info.wProcessorArchitecture)
+  {
+  case PROCESSOR_ARCHITECTURE_AMD64:
+    platform = "x86_64"; break;
+  case PROCESSOR_ARCHITECTURE_ARM:
+    platform = "arm"; break;
+  case PROCESSOR_ARCHITECTURE_IA64:
+    platform = "ia64"; break;
+  case PROCESSOR_ARCHITECTURE_INTEL:
+    platform = "i386"; break;
+  case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64:
+    platform = "i686"; break;
+  case PROCESSOR_ARCHITECTURE_PPC:
+    platform = "powerpc"; break;
+  case PROCESSOR_ARCHITECTURE_MIPS:
+    platform = "mips"; break;
+  case PROCESSOR_ARCHITECTURE_ALPHA:
+  case PROCESSOR_ARCHITECTURE_ALPHA64:
+    platform = "alpha"; break;
+  default:
+    platform = "<unknown>";
+  }
+
+#else
+  struct utsname ver;
+  if (uname(&ver) == -1)
+  {
+    ver_info << "<unknown>";
+    platform = "<unknown>";
+  }
+  else
+  {
+    ver_info << ver.sysname << "-" << ver.release;
+    platform = ver.machine;
+  }
+#endif
+
+  return ver_info.str();
+}
+
 void mysqlx::common::Settings_impl::Data::init_connection_attr()
 {
   //Already initialized... nothing to do here!
   if (!m_connection_attr.empty())
     return;
 
   std::string pid;
+  std::string platform;
 #ifdef _WIN32
   pid = std::to_string(GetCurrentProcessId());
 #else
   pid = std::to_string(getpid());
 #endif
   m_connection_attr["_pid"] =  pid;
 
-  m_connection_attr["_platform"] = MACHINE_TYPE;
-  m_connection_attr["_os"] = SYSTEM_TYPE;
+  m_connection_attr["_os"] = get_os_version_info(platform);
+  m_connection_attr["_platform"] = platform;
   m_connection_attr["_source_host"] =
       cdk::foundation::connection::get_local_hostname();
   m_connection_attr["_client_name"] =  PACKAGE_NAME;

devapi/tests/bugs-t.cc

@@ -660,3 +660,29 @@ TEST_F(Bugs, is_false)
   auto tbl = schema.getCollectionAsTable("is_false");
   EXPECT_EQ(1, tbl.select().where("doc->$.val is false").execute().count());
 }
+
+TEST_F(Bugs, bug29394723)
+{
+  SKIP_IF_NO_XPLUGIN
+  // Check that the _os session attribute is present and not empty
+  string _os = get_sess().sql("SELECT ATTR_VALUE FROM "
+                            "performance_schema.session_account_connect_attrs "
+                            "WHERE ATTR_NAME = '_os' AND "
+                            "PROCESSLIST_ID = CONNECTION_ID() AND "
+                            "LENGTH(ATTR_VALUE) > 0").execute().
+                            fetchOne()[0].get<string>();
+
+  cout << "_os: " << _os << endl;
+  EXPECT_NE("", _os);
+
+  // Check that the _platform session attribute is present and not empty
+  string _platform = get_sess().sql("SELECT ATTR_VALUE FROM "
+                            "performance_schema.session_account_connect_attrs "
+                            "WHERE ATTR_NAME = '_platform' AND "
+                            "PROCESSLIST_ID = CONNECTION_ID() AND "
+                            "LENGTH(ATTR_VALUE) > 0").execute().
+                            fetchOne()[0].get<string>();
+
+  cout << "_platform: " << _platform << endl;
+  EXPECT_NE("", _platform);
+}