test addition and details folder

Author: nikhilbhatia08

resource_detectors/CMakeLists.txt

@@ -30,7 +30,7 @@ otel_add_component(
   PATTERN
   "*.h"
   PATTERN
-  "container_detector_utils.h"
+  "resource_detectors/detail/*"
   EXCLUDE)
 
 if(BUILD_TESTING)

resource_detectors/container_detector.cc

@@ -3,7 +3,7 @@
 
 #include "opentelemetry/resource_detectors/container_detector.h"
 #include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/resource_detectors/container_detector_utils.h"
+#include "opentelemetry/resource_detectors/detail/container_detector_utils.h"
 #include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/sdk/resource/resource_detector.h"
 #include "opentelemetry/semconv/incubating/container_attributes.h"

resource_detectors/container_detector_utils.cc

@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/resource_detectors/container_detector_utils.h"
+#include "opentelemetry/resource_detectors/detail/container_detector_utils.h"
 #include "opentelemetry/nostd/string_view.h"
 
 #include <fstream>

resource_detectors/include/opentelemetry/resource_detectors/container_detector_utils.h renamed to resource_detectors/include/opentelemetry/resource_detectors/detail/container_detector_utils.h

@@ -3,13 +3,15 @@
 
 #include "opentelemetry/resource_detectors/process_detector.h"
 #include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/resource_detectors/process_detector_utils.h"
+#include "opentelemetry/resource_detectors/detail/process_detector_utils.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/sdk/resource/resource_detector.h"
 #include "opentelemetry/semconv/incubating/process_attributes.h"
 #include "opentelemetry/version.h"
 
 #include <stdint.h>
+#include <exception>
 #include <string>
 #include <unordered_map>
 #include <utility>
@@ -31,16 +33,32 @@ opentelemetry::sdk::resource::Resource ProcessResourceDetector::Detect() noexcep
   opentelemetry::sdk::resource::ResourceAttributes attributes;
   attributes[semconv::process::kProcessPid] = pid;
 
-  std::string executable_path = opentelemetry::resource_detector::detail::GetExecutablePath(pid);
-  if (!executable_path.empty())
+  try
   {
-    attributes[semconv::process::kProcessExecutablePath] = std::move(executable_path);
+    std::string executable_path = opentelemetry::resource_detector::detail::GetExecutablePath(pid);
+    if (!executable_path.empty())
+    {
+      attributes[semconv::process::kProcessExecutablePath] = std::move(executable_path);
+    }
+  }
+  catch (const ::std::exception &ex)
+  {
+    OTEL_INTERNAL_LOG_ERROR("[Process Resource Detector] "
+                            << "Error extracting the executable path: " << ex.what());
   }
 
-  std::string command = opentelemetry::resource_detector::detail::GetCommand(pid);
-  if (!command.empty())
+  try
+  {
+    std::string command = opentelemetry::resource_detector::detail::GetCommand(pid);
+    if (!command.empty())
+    {
+      attributes[semconv::process::kProcessCommand] = std::move(command);
+    }
+  }
+  catch (const std::exception &ex)
   {
-    attributes[semconv::process::kProcessCommand] = std::move(command);
+    OTEL_INTERNAL_LOG_ERROR("[Process Resource Detector] " << "Error extracting command: "
+                                                           << ex.what());
   }
 
   return ResourceDetector::Create(attributes);

resource_detectors/include/opentelemetry/resource_detectors/process_detector_utils.h renamed to resource_detectors/include/opentelemetry/resource_detectors/detail/process_detector_utils.h

@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/resource_detectors/process_detector_utils.h"
+#include "opentelemetry/resource_detectors/detail/process_detector_utils.h"
 
 #include <fstream>
 #include <string>
@@ -75,12 +75,16 @@ std::string GetCommand(const int32_t &pid)
   // so we ignore `pid` and just return the current process's command line.
   LPCWSTR wcmd = GetCommandLineW();
   if (!wcmd)
+  {
     return std::string();
+  }
 
   // Convert UTF-16 to UTF-8
   int size_needed = WideCharToMultiByte(CP_UTF8, 0, wcmd, -1, NULL, 0, NULL, NULL);
   if (size_needed <= 0)
+  {
     return std::string();
+  }
 
   std::string utf8_command(size_needed - 1, 0);  // exclude null terminator
   WideCharToMultiByte(CP_UTF8, 0, wcmd, -1, &utf8_command[0], size_needed, NULL, NULL);

resource_detectors/process_detector.cc

@@ -7,7 +7,7 @@
 #include <string>
 
 #include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/resource_detectors/container_detector_utils.h"
+#include "opentelemetry/resource_detectors/detail/container_detector_utils.h"
 
 TEST(ContainerIdDetectorTest, ExtractValidContainerIdFromLine)
 {

resource_detectors/process_detector_utils.cc

@@ -3,11 +3,23 @@
 
 #include <gtest/gtest.h>
 #include <stdint.h>
-#include <cstdio>
 #include <fstream>
 #include <string>
 
-#include "opentelemetry/resource_detectors/process_detector_utils.h"
+#ifdef _MSC_VER
+// clang-format off
+#  include <process.h>
+#  include <windows.h>
+#  include <psapi.h>
+#  define getpid _getpid
+// clang-format on
+#else
+#  include <sys/types.h>
+#  include <unistd.h>
+#  include <cstdio>
+#endif
+
+#include "opentelemetry/resource_detectors/detail/process_detector_utils.h"
 
 TEST(ProcessDetectorUtilsTest, FormFilePath)
 {
@@ -46,3 +58,53 @@ TEST(ProcessDetectorUtilsTest, EmptyCommandFile)
 
   std::remove(filename.c_str());  // Cleanup
 }
+
+TEST(ProcessDetectorUtilsTest, GetExecutablePathTest)
+{
+  int32_t pid = getpid();
+  std::string path;
+  #ifdef _MSC_VER
+  HANDLE hProcess =
+      OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, static_cast<DWORD>(pid));
+  if (!hProcess)
+  {
+    path = std::string();
+  }
+  else 
+  {
+
+    WCHAR wbuffer[MAX_PATH];
+    DWORD len = GetProcessImageFileNameW(hProcess, wbuffer, MAX_PATH);
+    CloseHandle(hProcess);
+
+    if (len == 0)
+    {
+      path = std::string();
+    }
+    else
+    {
+      int size_needed = WideCharToMultiByte(CP_UTF8, 0, wbuffer, len, NULL, 0, NULL, NULL);
+      std::string utf8_path(size_needed, 0);
+      WideCharToMultiByte(CP_UTF8, 0, wbuffer, len, &utf8_path[0], size_needed, NULL, NULL);
+
+      path = utf8_path;
+    }
+  }
+#else
+  std::string exe_path = opentelemetry::resource_detector::detail::FormFilePath(pid, "exe");
+  char buffer[4096];
+
+  ssize_t len = readlink(exe_path.c_str(), buffer, sizeof(buffer) - 1);
+  if (len != -1)
+  {
+    buffer[len] = '\0';
+    path = std::string(buffer);
+  }
+  else
+  {
+    path = std::string();
+  }
+#endif
+  std::string expected_path = opentelemetry::resource_detector::detail::GetExecutablePath(pid);
+  EXPECT_EQ(path, expected_path);
+}