Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-cpp

Author: malkia

.github/workflows/cppcheck.yml

@@ -47,6 +47,7 @@ jobs:
             -I exporters/zipkin/include \
             -I ext/include \
             -I opentracing-shim/include \
+            -I resource_detectors/include \
             -I sdk/include \
             -i build \
             -i test \

CHANGELOG.md

@@ -72,6 +72,9 @@ Increment the:
 * [CODE HEALTH] Fix clang-tidy special-member-functions warnings in trace
   [#3934](https://github.com/open-telemetry/opentelemetry-cpp/pull/3934)
 
+* [TEST] CMake component install test for resource_detectors
+  [#3940](https://github.com/open-telemetry/opentelemetry-cpp/pull/3940)
+
 Important changes:
 
 * [BUILD] Revisit EventLogger deprecation

INSTALL.md

@@ -268,6 +268,7 @@ build configuration.
 | **exporters_elasticsearch**| opentelemetry-cpp::elasticsearch_log_record_exporter                                             |
 | **exporters_etw**          | opentelemetry-cpp::etw_exporter                                                                  |
 | **exporters_zipkin**       | opentelemetry-cpp::zipkin_trace_exporter                                                         |
+| **resource_detectors**     | opentelemetry-cpp::resource_detectors                                                            |
 | **shims_opentracing**      | opentelemetry-cpp::opentracing_shim                                                              |
 
 ## Build instructions using Bazel

ci/do_ci.ps1

@@ -442,7 +442,8 @@ switch ($action) {
       "exporters_prometheus",
       "exporters_elasticsearch",
       "exporters_zipkin",
-      "exporters_etw"
+      "exporters_etw",
+      "resource_detectors"
     )
     $EXPECTED_COMPONENTS_STRING = $EXPECTED_COMPONENTS -join ";"
 

ci/do_ci.sh

@@ -507,6 +507,7 @@ elif [[ "$1" == "cmake.install.test" ]]; then
     "exporters_prometheus_builder"
     "exporters_elasticsearch"
     "exporters_zipkin"
+    "resource_detectors"
   )
   EXPECTED_COMPONENTS_STRING=$(IFS=\;; echo "${EXPECTED_COMPONENTS[*]}")
   mkdir -p "${BUILD_DIR}/install_test"

cmake/templates/opentelemetry-cpp-config.cmake.in

@@ -85,6 +85,7 @@
 #   exporters_elasticsearch
 #   exporters_etw
 #   exporters_zipkin
+#   resource_detectors
 #   shims_opentracing
 #
 # ::
@@ -125,6 +126,7 @@
 #   opentelemetry-cpp::elasticsearch_log_record_exporter - Imported target of COMPONENT exporters_elasticsearch
 #   opentelemetry-cpp::etw_exporter                      - Imported target of COMPONENT exporters_etw
 #   opentelemetry-cpp::zipkin_trace_exporter             - Imported target of COMPONENT exporters_zipkin
+#   opentelemetry-cpp::resource_detectors                - Imported target of COMPONENT resource_detectors
 #   opentelemetry-cpp::opentracing_shim                  - Imported target of COMPONENT shims_opentracing
 #
 # Additional Files Used in Component to Component and Third-Party Dependency Resolution

install/test/cmake/component_tests/resource_detectors/CMakeLists.txt

@@ -0,0 +1,18 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.16)
+project(opentelemetry-cpp-resource-detectors-install-test LANGUAGES CXX)
+
+find_package(opentelemetry-cpp REQUIRED COMPONENTS resource_detectors)
+
+find_package(GTest CONFIG REQUIRED)
+include(GoogleTest)
+
+add_executable(resource_detectors_test
+               ${INSTALL_TEST_SRC_DIR}/test_resource_detectors.cc)
+target_link_libraries(
+  resource_detectors_test PRIVATE opentelemetry-cpp::resource_detectors
+                                  GTest::gtest GTest::gtest_main)
+
+gtest_discover_tests(resource_detectors_test)

install/test/src/test_resource_detectors.cc

@@ -0,0 +1,33 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#include <gtest/gtest.h>
+
+#include <opentelemetry/resource_detectors/container_detector.h>
+#include <opentelemetry/resource_detectors/env_entity_detector.h>
+#include <opentelemetry/resource_detectors/process_detector.h>
+#include <memory>
+
+TEST(ResourceDetectorsInstall, ContainerResourceDetector)
+{
+  std::unique_ptr<opentelemetry::sdk::resource::ResourceDetector> detector =
+      std::make_unique<opentelemetry::resource_detector::ContainerResourceDetector>();
+  ASSERT_TRUE(detector != nullptr);
+  ASSERT_NO_THROW(auto resource = detector->Detect());
+}
+
+TEST(ResourceDetectorsInstall, EnvEntityDetector)
+{
+  std::unique_ptr<opentelemetry::sdk::resource::ResourceDetector> detector =
+      std::make_unique<opentelemetry::resource_detector::EnvEntityDetector>();
+  ASSERT_TRUE(detector != nullptr);
+  ASSERT_NO_THROW(auto resource = detector->Detect());
+}
+
+TEST(ResourceDetectorsInstall, ProcessResourceDetector)
+{
+  std::unique_ptr<opentelemetry::sdk::resource::ResourceDetector> detector =
+      std::make_unique<opentelemetry::resource_detector::ProcessResourceDetector>();
+  ASSERT_TRUE(detector != nullptr);
+  ASSERT_NO_THROW(auto resource = detector->Detect());
+}

resource_detectors/BUILD

@@ -8,11 +8,11 @@ package(default_visibility = ["//visibility:public"])
 otel_cc_library(
     name = "resource_detectors",
     srcs = [
-        "container_detector.cc",
-        "container_detector_utils.cc",
-        "env_entity_detector.cc",
-        "process_detector.cc",
-        "process_detector_utils.cc",
+        "src/container_detector.cc",
+        "src/container_detector_utils.cc",
+        "src/env_entity_detector.cc",
+        "src/process_detector.cc",
+        "src/process_detector_utils.cc",
     ],
     copts = ["-fexceptions"],
     linkopts = select({

resource_detectors/CMakeLists.txt

@@ -3,8 +3,9 @@
 
 add_library(
   opentelemetry_resource_detectors
-  container_detector_utils.cc container_detector.cc env_entity_detector.cc
-  process_detector.cc process_detector_utils.cc)
+  src/container_detector_utils.cc src/container_detector.cc
+  src/env_entity_detector.cc src/process_detector.cc
+  src/process_detector_utils.cc)
 
 set_target_properties(opentelemetry_resource_detectors
                       PROPERTIES EXPORT_NAME resource_detectors)