add missing copyright and license statements. Set LD_LIBRARY path to the install directory. Update ci scripts to set environment variables properly

dbarker · dbarker · commit 96e2e96ff966 · 2025-02-16T21:35:24.000-07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -542,23 +542,25 @@ jobs:
       with:
         submodules: 'recursive'
     - name: setup
-      env:
-        CXX_STANDARD: '14'
-        PROTOBUF_VERSION: '21.3'
-        GRPC_VERSION: 'v1.49.2'
-        OTEL_CPP_TEST_INSTALL_DIR: "$HOME/test-install"
-        PKG_CONFIG_PATH: "${OTEL_CPP_TEST_INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
       run: |
         sudo -E ./ci/setup_googletest.sh
         sudo -E ./ci/setup_ci_environment.sh
     - name: run cmake install
+      env:
+        CXX_STANDARD: '14'
+        PROTOBUF_VERSION: '21.3'
+        GRPC_VERSION: 'v1.49.2'
       run: |
         sudo ./ci/install_protobuf.sh
         sudo ./ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf
     - name: build and run tests
+      env:
+        OTEL_CPP_TEST_INSTALL_DIR: "$HOME/test-install"
       run: |
         ./ci/do_ci.sh cmake.install.test
     - name: verify packages
+      env:
+        PKG_CONFIG_PATH: "$HOME/test-install/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
       run: |
         ./ci/verify_packages.sh
 
diff --git a/ci/do_ci.sh b/ci/do_ci.sh
@@ -241,6 +241,7 @@ elif [[ "$1" == "cmake.opentracing_shim.test" ]]; then
   make -j $(nproc)
   make test
   make install
+  export LD_LIBRARY_PATH="${OTEL_CPP_TEST_INSTALL_DIR}/lib:$LD_LIBRARY_PATH"
   cmake -S "${SRC_DIR}/cmake/install/test" \
         -B "${BUILD_DIR}/install_test" \
         "-DCMAKE_PREFIX_PATH=${OTEL_CPP_TEST_INSTALL_DIR}" \
@@ -441,6 +442,7 @@ elif [[ "$1" == "cmake.install.test" ]]; then
         "${SRC_DIR}"
   make -j $(nproc)
   make install
+  export LD_LIBRARY_PATH="${OTEL_CPP_TEST_INSTALL_DIR}/lib:$LD_LIBRARY_PATH"
   cmake -S "${SRC_DIR}/cmake/install/test" \
         -B "${BUILD_DIR}/install_test" \
          "-DCMAKE_PREFIX_PATH=${OTEL_CPP_TEST_INSTALL_DIR}" \
diff --git a/cmake/install/component-definitions.cmake b/cmake/install/component-definitions.cmake
@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 # ----------------------------------------------------------------------
 # opentelmetry-cpp COMPONENT list
 # ----------------------------------------------------------------------
diff --git a/cmake/install/find-package-support-functions.cmake b/cmake/install/find-package-support-functions.cmake
@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 include("${CMAKE_CURRENT_LIST_DIR}/component-definitions.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/thirdparty-dependency-definitions.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/thirdparty-built-with-flags.cmake")
diff --git a/cmake/install/test/CMakeLists.txt b/cmake/install/test/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-component-install-tests LANGUAGES CXX)
 
@@ -12,6 +15,7 @@ endif()
 
 include(${CMAKE_SOURCE_DIR}/../../install/component-definitions.cmake)
 
+# If COMPONENTS_TO_TEST is not set, then test all components
 if(NOT COMPONENTS_TO_TEST)
   set(COMPONENTS_TO_TEST ${opentelemetry-cpp_COMPONENTS})
 else()
@@ -41,6 +45,8 @@ message(STATUS "Testing cmake usage for find_package(opentelemetry ...)")
 # 2. Test find_package with components specified but not sorted in dependency
 #    order
 # 3. Test find_package with components specified but missing dependent components
+# 4. Test find_package with components specified but including
+#    unsupported/unknown components
 
 add_test(
   NAME cmake-usage-no-components-test
@@ -76,9 +82,7 @@ add_test(
 
 # -----------------------------------------------------------
 # Test the full package install using legacy cmake build instructions
-# find_package(opentelemetry-cpp CONFIG REQUIRED) target_include_directories(foo
-# PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS}) target_link_libraries(foo PRIVATE
-# ${OPENTELEMETRY_CPP_LIBRARIES})
+# find_package(opentelemetry-cpp CONFIG REQUIRED)
 message(STATUS "Testing the full package install")
 # Test cmake configuration
 add_test(
diff --git a/cmake/install/test/projects/cmake_usage_tests/missing_components/CMakeLists.txt b/cmake/install/test/projects/cmake_usage_tests/missing_components/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 
 project(opentelemetry-cpp-unsorted-components-install-test LANGUAGES CXX)
diff --git a/cmake/install/test/projects/cmake_usage_tests/no_components/CMakeLists.txt b/cmake/install/test/projects/cmake_usage_tests/no_components/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 
 project(opentelemetry-cpp-unsorted-components-install-test LANGUAGES CXX)
diff --git a/cmake/install/test/projects/cmake_usage_tests/unsorted_components/CMakeLists.txt b/cmake/install/test/projects/cmake_usage_tests/unsorted_components/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 
 project(opentelemetry-cpp-unsorted-components-install-test LANGUAGES CXX)
diff --git a/cmake/install/test/projects/cmake_usage_tests/unsupported_components/CMakeLists.txt b/cmake/install/test/projects/cmake_usage_tests/unsupported_components/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 
 project(opentelemetry-cpp-unsupported-components-install-test LANGUAGES CXX)
diff --git a/cmake/install/test/projects/component_tests/api/CMakeLists.txt b/cmake/install/test/projects/component_tests/api/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 
 project(opentelemetry-cpp-api-install-test LANGUAGES CXX)
diff --git a/cmake/install/test/projects/component_tests/exporters_elasticsearch/CMakeLists.txt b/cmake/install/test/projects/component_tests/exporters_elasticsearch/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-exporters-elasticsearch-install-test LANGUAGES CXX)
-message(STATUS "Testing the exporters_elasticsearch_test component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_elasticsearch)
 
 find_package(GTest REQUIRED)
diff --git a/cmake/install/test/projects/component_tests/exporters_etw/CMakeLists.txt b/cmake/install/test/projects/component_tests/exporters_etw/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-exporters_etw-install-test LANGUAGES CXX)
-message(STATUS "Testing the exporters_etw_test component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_etw)
 
 find_package(GTest REQUIRED)
diff --git a/cmake/install/test/projects/component_tests/exporters_in_memory/CMakeLists.txt b/cmake/install/test/projects/component_tests/exporters_in_memory/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-exporters-in-memory-install-test LANGUAGES CXX)
-message(STATUS "Testing the exporters_in_memory_test component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_in_memory)
 
 find_package(GTest REQUIRED)
diff --git a/cmake/install/test/projects/component_tests/exporters_ostream/CMakeLists.txt b/cmake/install/test/projects/component_tests/exporters_ostream/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-exporters-ostream-install-test LANGUAGES CXX)
-message(STATUS "Testing the exporters_ostream_test component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_ostream)
 
 find_package(GTest REQUIRED)
diff --git a/cmake/install/test/projects/component_tests/exporters_otlp_common/CMakeLists.txt b/cmake/install/test/projects/component_tests/exporters_otlp_common/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-exporters-otlp-common-install-test LANGUAGES CXX)
-message(STATUS "Testing the exporters_otlp_common_test component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_otlp_common)
 
 if(NOT TARGET protobuf::libprotobuf)
diff --git a/cmake/install/test/projects/component_tests/exporters_otlp_file/CMakeLists.txt b/cmake/install/test/projects/component_tests/exporters_otlp_file/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-exporters-otlp-file-install-test LANGUAGES CXX)
-message(STATUS "Testing the exporters_otlp_file_test component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_otlp_file)
 
 if(NOT TARGET protobuf::libprotobuf)
diff --git a/cmake/install/test/projects/component_tests/exporters_otlp_grpc/CMakeLists.txt b/cmake/install/test/projects/component_tests/exporters_otlp_grpc/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-exporters-otlp-grpc-install-test LANGUAGES CXX)
-message(STATUS "Testing the exporters_otlp_grpc_test component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_otlp_grpc)
 
 if(NOT TARGET protobuf::libprotobuf)
diff --git a/cmake/install/test/projects/component_tests/exporters_otlp_http/CMakeLists.txt b/cmake/install/test/projects/component_tests/exporters_otlp_http/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-exporters-otlp-http-install-test LANGUAGES CXX)
-message(STATUS "Testing the exporters_otlp_http_test component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_otlp_http)
 
 if(NOT TARGET protobuf::libprotobuf)
diff --git a/cmake/install/test/projects/component_tests/exporters_prometheus/CMakeLists.txt b/cmake/install/test/projects/component_tests/exporters_prometheus/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-exporters-prometheus-install-test LANGUAGES CXX)
-message(STATUS "Testing the exporters_prometheus_test component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_prometheus)
 
 if(NOT TARGET prometheus-cpp::core)
diff --git a/cmake/install/test/projects/component_tests/exporters_zipkin/CMakeLists.txt b/cmake/install/test/projects/component_tests/exporters_zipkin/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-exporters-zipkin-install-test LANGUAGES CXX)
-message(STATUS "Testing the exporters_zipkin_test component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_zipkin)
 
 find_package(GTest REQUIRED)
diff --git a/cmake/install/test/projects/component_tests/ext_common/CMakeLists.txt b/cmake/install/test/projects/component_tests/ext_common/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-ext_common-install-test LANGUAGES CXX)
-message(STATUS "Testing the ext_common component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS ext_common)
 
 find_package(GTest REQUIRED)
diff --git a/cmake/install/test/projects/component_tests/ext_http_curl/CMakeLists.txt b/cmake/install/test/projects/component_tests/ext_http_curl/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-ext_http_curl-install-test LANGUAGES CXX)
-message(STATUS "Testing the ext_http_curl component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS ext_http_curl)
 
 if(NOT TARGET CURL::libcurl)
diff --git a/cmake/install/test/projects/component_tests/sdk/CMakeLists.txt b/cmake/install/test/projects/component_tests/sdk/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-sdk-install-test LANGUAGES CXX)
-message(STATUS "Testing the sdk component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS sdk)
 
 find_package(GTest REQUIRED)
diff --git a/cmake/install/test/projects/component_tests/shims_opentracing/CMakeLists.txt b/cmake/install/test/projects/component_tests/shims_opentracing/CMakeLists.txt
@@ -1,6 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 project(opentelemetry-cpp-shims_opentracing-install-test LANGUAGES CXX)
-message(STATUS "Testing the shims_opentracing component install")
+
 find_package(opentelemetry-cpp REQUIRED COMPONENTS shims_opentracing)
 
 if(NOT TARGET OpenTracing::opentracing)
diff --git a/cmake/install/test/projects/package_test/CMakeLists.txt b/cmake/install/test/projects/package_test/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 cmake_minimum_required(VERSION 3.10)
 
 project(opentelemetry-cpp-full-package-install-test LANGUAGES CXX)
@@ -11,14 +14,7 @@ endif()
 
 find_package(opentelemetry-cpp CONFIG REQUIRED)
 
-# Test that the following variables are set: OPENTELEMETRY_CPP_INCLUDE_DIRS  -
-# Include directories of opentelemetry-cpp. OPENTELEMETRY_CPP_LIBRARY_DIRS  -
-# Link directories of opentelemetry-cpp. OPENTELEMETRY_CPP_LIBRARIES     - List
-# of libraries when using opentelemetry-cpp. OPENTELEMETRY_CPP_FOUND         -
-# True if opentelemetry-cpp found. OPENTELEMETRY_ABI_VERSION_NO    - ABI version
-# of opentelemetry-cpp. OPENTELEMETRY_VERSION           - Version of
-# opentelemetry-cpp. OPENTELEMETRY_CPP_COMPONENTS_INSTALLED - List of components
-# installed.
+# Test that the required OPENTELEMETRY_CPP_* variables are set
 
 if(NOT OPENTELEMETRY_CPP_INCLUDE_DIRS)
   message(FATAL_ERROR "OPENTELEMETRY_CPP_INCLUDE_DIRS is empty")
diff --git a/cmake/install/thirdparty-dependency-definitions.cmake b/cmake/install/thirdparty-dependency-definitions.cmake
@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 #-----------------------------------------------------------------------
 # Third party dependencies supported by opentelemetry-cpp
 #    Dependencies will be found in this order when find_package(opentelemetry-cpp ...)  is called.
diff --git a/cmake/templates/thirdparty-built-with-flags.cmake.in b/cmake/templates/thirdparty-built-with-flags.cmake.in
@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 #-------------------------------------------------------------------------
 # CMAKE flags to capture the build configuration for the insalled package
 #    BUILT_WITH_<dependency> is set to true if the installed package requires that dependency
