ci and requested changes

nikhilbhatia08 · nikhilbhatia08 · commit 00decf9e0871 · 2025-08-02T15:04:05.000+05:30
diff --git a/sdk/include/opentelemetry/sdk/common/container.h b/sdk/include/opentelemetry/sdk/common/container.h
diff --git a/sdk/include/opentelemetry/sdk/resource/container_resource_detector.h b/sdk/include/opentelemetry/sdk/resource/container_resource_detector.h
@@ -0,0 +1,43 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include "opentelemetry/sdk/resource/resource.h"
+#include "opentelemetry/sdk/resource/resource_detector.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace resource
+{
+
+/**
+ * ContainerResourceDetector to detect resource attributes when running inside a containerized
+ * environment. This detector extracts metadata such as container ID from cgroup information and
+ * sets attributes like container.id following the OpenTelemetry semantic conventions.
+ */
+class ContainerResourceDetector : public ResourceDetector
+{
+public:
+  Resource Detect() noexcept override;
+};
+
+/**
+ * Reads the container.id from /proc/self/cgroup file.
+ * @param file_path file path of cgroup
+ * @return container.id as string or empty string
+ */
+std::string GetContainerIDFromCgroup(const char *file_path);
+
+/**
+ * Matches the line with the regex to find container.id
+ * @param line a single line of text, typically from the /proc/self/cgroup file
+ * @return matched id or empty string
+ */
+std::string ExtractContainerIDFromLine(const std::string &line);
+
+}  // namespace resource
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE
diff --git a/sdk/include/opentelemetry/sdk/resource/resource_detector.h b/sdk/include/opentelemetry/sdk/resource/resource_detector.h
@@ -39,17 +39,6 @@ class OTELResourceDetector : public ResourceDetector
   Resource Detect() noexcept override;
 };
 
-/**
- * ContainerResourceDetector to detect resource attributes when running inside a containerized
- * environment. This detector extracts metadata such as container ID from cgroup information and
- * sets attributes like container.id following the OpenTelemetry semantic conventions.
- */
-class ContainerResourceDetector : public ResourceDetector
-{
-public:
-  Resource Detect() noexcept override;
-};
-
 }  // namespace resource
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/sdk/src/common/BUILD b/sdk/src/common/BUILD
@@ -57,17 +57,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "container",
-    srcs = [
-        "container.cc",
-    ],
-    deps = [
-        "//api",
-        "//sdk:headers",
-    ],
-)
-
 cc_library(
     name = "global_log_handler",
     srcs = [
diff --git a/sdk/src/common/CMakeLists.txt b/sdk/src/common/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-set(COMMON_SRCS random.cc global_log_handler.cc env_variables.cc container.cc
-                base64.cc disabled.cc)
+set(COMMON_SRCS random.cc global_log_handler.cc env_variables.cc base64.cc
+                disabled.cc)
 if(WIN32)
   list(APPEND COMMON_SRCS platform/fork_windows.cc)
 else()
diff --git a/sdk/src/resource/BUILD b/sdk/src/resource/BUILD
@@ -10,7 +10,6 @@ cc_library(
     deps = [
         "//api",
         "//sdk:headers",
-        "//sdk/src/common:container",
         "//sdk/src/common:env_variables",
     ],
 )
diff --git a/sdk/src/resource/CMakeLists.txt b/sdk/src/resource/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(opentelemetry_resources resource.cc resource_detector.cc 
-                                    container_detector.cc)
+add_library(opentelemetry_resources resource.cc resource_detector.cc
+                                    container.cc container_detector.cc)
 
 set_target_properties(opentelemetry_resources PROPERTIES EXPORT_NAME resources)
 set_target_version(opentelemetry_resources)
diff --git a/sdk/src/resource/container.cc b/sdk/src/resource/container.cc
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/sdk/common/container.h"
+#include "opentelemetry/sdk/resource/container_resource_detector.h"
 
 #include <fstream>
 #include <regex>
@@ -11,7 +11,7 @@
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
 {
-namespace common
+namespace resource
 {
 std::string GetContainerIDFromCgroup(const char *file_path)
 {
@@ -41,6 +41,6 @@ std::string ExtractContainerIDFromLine(const std::string &line)
 
   return "";
 }
-}  // namespace common
+}  // namespace resource
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/sdk/src/resource/container_detector.cc b/sdk/src/resource/container_detector.cc
@@ -2,9 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/container.h"
+#include "opentelemetry/sdk/resource/container_resource_detector.h"
 #include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/resource/resource_detector.h"
 #include "opentelemetry/semconv/incubating/container_attributes.h"
 #include "opentelemetry/version.h"
 
@@ -24,7 +23,7 @@ const char *KCGroupPath = "/proc/self/cgroup";
 
 Resource ContainerResourceDetector::Detect() noexcept
 {
-  std::string container_id = opentelemetry::sdk::common::GetContainerIDFromCgroup(KCGroupPath);
+  std::string container_id = opentelemetry::sdk::resource::GetContainerIDFromCgroup(KCGroupPath);
   if (container_id.empty())
   {
     return ResourceDetector::Create({});
diff --git a/sdk/src/resource/resource.cc b/sdk/src/resource/resource.cc
@@ -6,6 +6,7 @@
 #include <utility>
 
 #include "opentelemetry/nostd/variant.h"
+#include "opentelemetry/sdk/resource/container_resource_detector.h"
 #include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/sdk/resource/resource_detector.h"
 #include "opentelemetry/sdk/version/version.h"
diff --git a/sdk/test/resource/resource_test.cc b/sdk/test/resource/resource_test.cc
@@ -13,7 +13,7 @@
 
 #include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/container.h"
+#include "opentelemetry/sdk/resource/container_resource_detector.h"
 #include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/sdk/resource/resource_detector.h"
 #include "opentelemetry/sdk/version/version.h"
@@ -300,7 +300,7 @@ TEST(ResourceTest, ExtractValidContainerId)
 {
   std::string line =
       "13:name=systemd:/podruntime/docker/kubepods/ac679f8a8319c8cf7d38e1adf263bc08d23.aaaa";
-  std::string extracted_id = opentelemetry::sdk::common::ExtractContainerIDFromLine(line);
+  std::string extracted_id = opentelemetry::sdk::resource::ExtractContainerIDFromLine(line);
   EXPECT_EQ(std::string{"ac679f8a8319c8cf7d38e1adf263bc08d23"}, extracted_id);
 }
 
@@ -316,7 +316,7 @@ TEST(ResourceTest, ExtractIdFromMockUpCGroupFile)
     outfile << "9:cpu:/not-a-container\n";
   }
 
-  std::string container_id = opentelemetry::sdk::common::GetContainerIDFromCgroup(filename);
+  std::string container_id = opentelemetry::sdk::resource::GetContainerIDFromCgroup(filename);
   EXPECT_EQ(container_id,
             std::string{"e857a4bf05a69080a759574949d7a0e69572e27647800fa7faff6a05a8332aa1"});
 
@@ -326,7 +326,7 @@ TEST(ResourceTest, ExtractIdFromMockUpCGroupFile)
 TEST(ResourceTest, DoesNotExtractInvalidLine)
 {
   std::string line = "this line does not contain a container id";
-  std::string id   = opentelemetry::sdk::common::ExtractContainerIDFromLine(line);
+  std::string id   = opentelemetry::sdk::resource::ExtractContainerIDFromLine(line);
   EXPECT_EQ(id, std::string{""});
 }
 
@@ -339,7 +339,7 @@ TEST(ContainerIdDetectorTest, ReturnsEmptyOnNoMatch)
     outfile << "no container id here\n";
   }
 
-  std::string id = opentelemetry::sdk::common::GetContainerIDFromCgroup(filename);
+  std::string id = opentelemetry::sdk::resource::GetContainerIDFromCgroup(filename);
   EXPECT_EQ(id, std::string{""});
 
   std::remove(filename);  // cleanup

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ cc_library(`
`10`	`10`	`deps = [`
`11`	`11`	`"//api",`
`12`	`12`	`"//sdk:headers",`
`13`		`- "//sdk/src/common:container",`
`14`	`13`	`"//sdk/src/common:env_variables",`
`15`	`14`	`],`
`16`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright The OpenTelemetry Authors`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`		`-#include "opentelemetry/sdk/common/container.h"`
	`4`	`+#include "opentelemetry/sdk/resource/container_resource_detector.h"`
`5`	`5`
`6`	`6`	`#include <fstream>`
`7`	`7`	`#include <regex>`
`@@ -11,7 +11,7 @@`
`11`	`11`	`OPENTELEMETRY_BEGIN_NAMESPACE`
`12`	`12`	`namespace sdk`
`13`	`13`	`{`
`14`		`-namespace common`
	`14`	`+namespace resource`
`15`	`15`	`{`
`16`	`16`	`std::string GetContainerIDFromCgroup(const char *file_path)`
`17`	`17`	`{`
`@@ -41,6 +41,6 @@ std::string ExtractContainerIDFromLine(const std::string &line)`
`41`	`41`
`42`	`42`	`return "";`
`43`	`43`	`}`
`44`		`-} // namespace common`
	`44`	`+} // namespace resource`
`45`	`45`	`} // namespace sdk`
`46`	`46`	`OPENTELEMETRY_END_NAMESPACE`