From 12af03630fa6a69eedfbe149ed10c9f95ad64ea7 Mon Sep 17 00:00:00 2001
From: Lalit <labhas@microsoft.com>
Date: Tue, 24 Jan 2023 18:27:46 -0800
Subject: [PATCH 1/7] Fix

---
 CMakeLists.txt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6429162d05..90754df4b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -534,6 +534,27 @@ if(NOT WITH_API_ONLY)
   endif()
 endif()
 
+
+# Add custom vendor directory via environment variable
+if(DEFINED ENV{OPENTELEMETRY_CONTRIB_PATH})
+  # Add custom contrib path to build tree and consolidate binary artifacts in current project binary output directory.
+  add_subdirectory($ENV{OPENTELEMETRY_CONTRIB_PATH} ${PROJECT_BINARY_DIR}/contrib)
+endif()
+# OR Add opentelemetry-cpp-contrib from GitHub
+if(WITH_CONTRIB)
+  # This option requires CMake 3.11+: add standard remote contrib to build tree.
+  include(FetchContent)
+  FetchContent_Declare(
+    contrib
+    GIT_REPOSITORY "https://github.com/open-telemetry/opentelemetry-cpp-contrib"
+    GIT_TAG "main")
+  FetchContent_GetProperties(contrib)
+  if(NOT contrib_POPULATED)
+    FetchContent_Populate(contrib)
+    add_subdirectory(${contrib_SOURCE_DIR})
+  endif()
+endif()
+
 # Export cmake config and support find_packages(opentelemetry-cpp CONFIG) Write
 # config file for find_packages(opentelemetry-cpp CONFIG)
 set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")

From 5d51db58ff8ce19121c1e98320c7ab3e1ca515ff Mon Sep 17 00:00:00 2001
From: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
Date: Tue, 24 Jan 2023 20:12:16 -0800
Subject: [PATCH 2/7] fix

---
 CMakeLists.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90754df4b3..02f34d1708 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -534,11 +534,12 @@ if(NOT WITH_API_ONLY)
   endif()
 endif()
 
-
 # Add custom vendor directory via environment variable
 if(DEFINED ENV{OPENTELEMETRY_CONTRIB_PATH})
-  # Add custom contrib path to build tree and consolidate binary artifacts in current project binary output directory.
-  add_subdirectory($ENV{OPENTELEMETRY_CONTRIB_PATH} ${PROJECT_BINARY_DIR}/contrib)
+  # Add custom contrib path to build tree and consolidate binary artifacts in
+  # current project binary output directory.
+  add_subdirectory($ENV{OPENTELEMETRY_CONTRIB_PATH}
+                   ${PROJECT_BINARY_DIR}/contrib)
 endif()
 # OR Add opentelemetry-cpp-contrib from GitHub
 if(WITH_CONTRIB)

From 74d5eacb5262ef13f03f9d1a4a312688d6d639e7 Mon Sep 17 00:00:00 2001
From: Lalit <labhas@microsoft.com>
Date: Wed, 25 Jan 2023 12:42:48 -0800
Subject: [PATCH 3/7] fix

---
 CMakeLists.txt                          | 22 +----------------
 cmake/opentelemetry-build-contrib.cmake | 33 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 21 deletions(-)
 create mode 100644 cmake/opentelemetry-build-contrib.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02f34d1708..d11ff90405 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -534,27 +534,7 @@ if(NOT WITH_API_ONLY)
   endif()
 endif()
 
-# Add custom vendor directory via environment variable
-if(DEFINED ENV{OPENTELEMETRY_CONTRIB_PATH})
-  # Add custom contrib path to build tree and consolidate binary artifacts in
-  # current project binary output directory.
-  add_subdirectory($ENV{OPENTELEMETRY_CONTRIB_PATH}
-                   ${PROJECT_BINARY_DIR}/contrib)
-endif()
-# OR Add opentelemetry-cpp-contrib from GitHub
-if(WITH_CONTRIB)
-  # This option requires CMake 3.11+: add standard remote contrib to build tree.
-  include(FetchContent)
-  FetchContent_Declare(
-    contrib
-    GIT_REPOSITORY "https://github.com/open-telemetry/opentelemetry-cpp-contrib"
-    GIT_TAG "main")
-  FetchContent_GetProperties(contrib)
-  if(NOT contrib_POPULATED)
-    FetchContent_Populate(contrib)
-    add_subdirectory(${contrib_SOURCE_DIR})
-  endif()
-endif()
+include(cmake/opentelemetry-build-contrib.cmake)
 
 # Export cmake config and support find_packages(opentelemetry-cpp CONFIG) Write
 # config file for find_packages(opentelemetry-cpp CONFIG)
diff --git a/cmake/opentelemetry-build-contrib.cmake b/cmake/opentelemetry-build-contrib.cmake
new file mode 100644
index 0000000000..4363dc59e1
--- /dev/null
+++ b/cmake/opentelemetry-build-contrib.cmake
@@ -0,0 +1,33 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable building external components and/or cotrib repo through otel-cpp build
+# The config options are
+#  - OPENTELEMETRY_CONTRIB_PATH - Setting local path of the external
+# component as env variable
+#  - Enable WITH_CONTRIB CMake option to build otel-cpp-contrib repo as part of
+# otel-cpp build.
+# Add custom vendor directory via environment variable
+
+option(WITH_CONTRIB "Build a tarball package" OFF)
+
+if(DEFINED ENV{OPENTELEMETRY_CONTRIB_PATH})
+  # Add custom contrib path to build tree and consolidate binary artifacts in
+  # current project binary output directory.
+  add_subdirectory($ENV{OPENTELEMETRY_CONTRIB_PATH}
+                   ${PROJECT_BINARY_DIR}/contrib)
+endif()
+# OR Add opentelemetry-cpp-contrib from GitHub
+if(WITH_CONTRIB)
+  # This option requires CMake 3.11+: add standard remote contrib to build tree.
+  include(FetchContent)
+  FetchContent_Declare(
+    contrib
+    GIT_REPOSITORY "https://github.com/open-telemetry/opentelemetry-cpp-contrib"
+    GIT_TAG "main")
+  FetchContent_GetProperties(contrib)
+  if(NOT contrib_POPULATED)
+    FetchContent_Populate(contrib)
+    add_subdirectory(${contrib_SOURCE_DIR})
+  endif()
+endif()

From a29459aea28ba53178302af9925fc5fc03176665 Mon Sep 17 00:00:00 2001
From: Lalit <labhas@microsoft.com>
Date: Wed, 25 Jan 2023 12:45:51 -0800
Subject: [PATCH 4/7] fix typo

---
 cmake/opentelemetry-build-contrib.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/opentelemetry-build-contrib.cmake b/cmake/opentelemetry-build-contrib.cmake
index 4363dc59e1..dd437431e7 100644
--- a/cmake/opentelemetry-build-contrib.cmake
+++ b/cmake/opentelemetry-build-contrib.cmake
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-# Enable building external components and/or cotrib repo through otel-cpp build
+# Enable building external components and/or contrib repo through otel-cpp build
 # The config options are
 #  - OPENTELEMETRY_CONTRIB_PATH - Setting local path of the external
 # component as env variable

From 930290c7f1318ad33e986d16e410301500ca8bdd Mon Sep 17 00:00:00 2001
From: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
Date: Thu, 22 Jun 2023 16:45:31 -0700
Subject: [PATCH 5/7] remove contrib

---
 cmake/opentelemetry-build-contrib.cmake       | 33 -------------------
 ...entelemetry-build-external-component.cmake | 30 +++++++++++++++++
 2 files changed, 30 insertions(+), 33 deletions(-)
 delete mode 100644 cmake/opentelemetry-build-contrib.cmake
 create mode 100644 cmake/opentelemetry-build-external-component.cmake

diff --git a/cmake/opentelemetry-build-contrib.cmake b/cmake/opentelemetry-build-contrib.cmake
deleted file mode 100644
index dd437431e7..0000000000
--- a/cmake/opentelemetry-build-contrib.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Enable building external components and/or contrib repo through otel-cpp build
-# The config options are
-#  - OPENTELEMETRY_CONTRIB_PATH - Setting local path of the external
-# component as env variable
-#  - Enable WITH_CONTRIB CMake option to build otel-cpp-contrib repo as part of
-# otel-cpp build.
-# Add custom vendor directory via environment variable
-
-option(WITH_CONTRIB "Build a tarball package" OFF)
-
-if(DEFINED ENV{OPENTELEMETRY_CONTRIB_PATH})
-  # Add custom contrib path to build tree and consolidate binary artifacts in
-  # current project binary output directory.
-  add_subdirectory($ENV{OPENTELEMETRY_CONTRIB_PATH}
-                   ${PROJECT_BINARY_DIR}/contrib)
-endif()
-# OR Add opentelemetry-cpp-contrib from GitHub
-if(WITH_CONTRIB)
-  # This option requires CMake 3.11+: add standard remote contrib to build tree.
-  include(FetchContent)
-  FetchContent_Declare(
-    contrib
-    GIT_REPOSITORY "https://github.com/open-telemetry/opentelemetry-cpp-contrib"
-    GIT_TAG "main")
-  FetchContent_GetProperties(contrib)
-  if(NOT contrib_POPULATED)
-    FetchContent_Populate(contrib)
-    add_subdirectory(${contrib_SOURCE_DIR})
-  endif()
-endif()
diff --git a/cmake/opentelemetry-build-external-component.cmake b/cmake/opentelemetry-build-external-component.cmake
new file mode 100644
index 0000000000..3d76ac6a52
--- /dev/null
+++ b/cmake/opentelemetry-build-external-component.cmake
@@ -0,0 +1,30 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable building external components through otel-cpp build
+# The config options are
+#  - OPENTELEMETRY_EXTERNAL_COMPONENT_PATH - Setting local path of the external
+# component as env variable
+#  - OPENTELEMETRY_EXTERNAL_COMPONENT_URL Setting githb-repo of external component
+#  as env variable
+
+
+# Add custom vendor component from local path, or GitHub repo
+if(DEFINED $ENV{OPENTELEMETRY_EXTERNAL_COMPONENT_PATH})
+  # Add custom component path to build tree and consolidate binary artifacts in
+  # current project binary output directory.
+  add_subdirectory($ENV{OPENTELEMETRY_EXTERNAL_COMPONENT_PATH}
+                   ${PROJECT_BINARY_DIR}/external)
+elseif(DEFINED $ENV{OPENTELEMETRY_EXTERNAL_COMPONENT_URL})
+  # This option requires CMake 3.11+: add standard remote repo to build tree.
+  include(FetchContent)
+  FetchContent_Declare(
+    external
+    GIT_REPOSITORY $ENV{OPENTELEMETRY_EXTERNAL_COMPONENT_URL}
+    GIT_TAG "main")
+  FetchContent_GetProperties(external)
+  if(NOT external_POPULATED)
+    FetchContent_Populate(external)
+    add_subdirectory(${external_SOURCE_DIR})
+  endif()
+endif()

From 624345f4b2f78f40ba90533c883ead3eb8a6d3d1 Mon Sep 17 00:00:00 2001
From: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
Date: Thu, 22 Jun 2023 16:49:49 -0700
Subject: [PATCH 6/7] fix cmake

---
 CMakeLists.txt | 181 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 129 insertions(+), 52 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69cde2d791..27930fe793 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,6 +118,13 @@ option(WITH_GSL
 
 option(WITH_ABSEIL "Whether to use Abseil for C++latest features" OFF)
 
+set(OPENTELEMETRY_INSTALL_default ON)
+if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+  set(OPENTELEMETRY_INSTALL_default OFF)
+endif()
+option(OPENTELEMETRY_INSTALL "Whether to install opentelemetry targets"
+       ${OPENTELEMETRY_INSTALL_default})
+
 if(NOT DEFINED CMAKE_CXX_STANDARD)
   if(WITH_STL)
     # Require at least C++17. C++20 is needed to avoid gsl::span
@@ -152,7 +159,15 @@ if(WITH_STL)
   endif()
 endif()
 
-option(WITH_OTLP "Whether to include the OpenTelemetry Protocol in the SDK" OFF)
+if(DEFINED WITH_OTLP)
+  message(
+    FATAL_ERROR
+      "WITH_OTLP is deprecated. Please set either WITH_OTLP_GRPC=ON, WITH_OTLP_HTTP=ON, or both to ON."
+  )
+endif()
+
+option(WITH_OTLP_GRPC "Whether to include the OTLP gRPC exporter in the SDK"
+       OFF)
 
 option(WITH_OTLP_HTTP "Whether to include the OTLP http exporter in the SDK"
        OFF)
@@ -179,6 +194,15 @@ option(BUILD_W3CTRACECONTEXT_TEST "Whether to build w3c trace context" OFF)
 
 option(OTELCPP_MAINTAINER_MODE "Build in maintainer mode (-Wall -Werror)" OFF)
 
+option(WITH_OPENTRACING "Whether to include the Opentracing shim" OFF)
+
+option(OTELCPP_VERSIONED_LIBS "Whether to generate the versioned shared libs"
+       OFF)
+
+if(OTELCPP_VERSIONED_LIBS AND NOT BUILD_SHARED_LIBS)
+  message(FATAL_ERROR "OTELCPP_VERSIONED_LIBS=ON requires BUILD_SHARED_LIBS=ON")
+endif()
+
 set(OTELCPP_PROTO_PATH
     ""
     CACHE PATH "Path to opentelemetry-proto")
@@ -210,11 +234,21 @@ option(
   "Whether to build http client/server examples. Requires WITH_EXAMPLES and CURL"
   OFF)
 
+option(WITH_FUNC_TESTS "Whether to build functional tests" ON)
+
 option(WITH_LOGS_PREVIEW "Whether to build logs preview" OFF)
-option(WITH_ASYNC_EXPORT_PREVIEW "Whether enable async export" OFF)
+option(WITH_ASYNC_EXPORT_PREVIEW "Whether to enable async export" OFF)
+
+# EXPERIMENTAL
+option(WITH_OTLP_HTTP_SSL_PREVIEW "Whether to enable otlp http ssl export" OFF)
+
+# EXPERIMENTAL
+option(WITH_OTLP_HTTP_SSL_TLS_PREVIEW
+       "Whether to enable otlp http ssl tls min/max/cipher options" OFF)
+
 # Exemplar specs status is experimental, so behind feature flag by default
 option(WITH_METRICS_EXEMPLAR_PREVIEW
-       "Whethere to enable exemplar within metrics" OFF)
+       "Whether to enable exemplar within metrics" OFF)
 
 #
 # Verify options dependencies
@@ -224,6 +258,13 @@ if(WITH_EXAMPLES_HTTP AND NOT WITH_EXAMPLES)
   message(FATAL_ERROR "WITH_EXAMPLES_HTTP=ON requires WITH_EXAMPLES=ON")
 endif()
 
+if(WITH_OTLP_HTTP_SSL_TLS_PREVIEW AND NOT WITH_OTLP_HTTP_SSL_PREVIEW)
+  message(
+    FATAL_ERROR
+      "WITH_OTLP_HTTP_SSL_TLS_PREVIEW=ON requires WITH_OTLP_HTTP_SSL_PREVIEW=ON"
+  )
+endif()
+
 find_package(Threads)
 
 function(install_windows_deps)
@@ -238,7 +279,20 @@ function(install_windows_deps)
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/setup-buildtools.cmd)
   set(CMAKE_TOOLCHAIN_FILE
       ${CMAKE_CURRENT_SOURCE_DIR}/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
-      PARENT_SCOPE)
+      CACHE FILEPATH "")
+  message(
+    "Make sure that vcpkg.cmake is set as the CMAKE_TOOLCHAIN_FILE at the START of the cmake build process!
+    Can be command-line arg (cmake -DCMAKE_TOOLCHAIN_FILE=...) or set in your editor of choice."
+  )
+
+endfunction()
+
+function(set_target_version target_name)
+  if(OTELCPP_VERSIONED_LIBS)
+    set_target_properties(
+      ${target_name} PROPERTIES VERSION ${OPENTELEMETRY_VERSION}
+                                SOVERSION ${OPENTELEMETRY_ABI_VERSION_NO})
+  endif()
 endfunction()
 
 if(WITH_JAEGER)
@@ -302,11 +356,10 @@ if(WITH_PROMETHEUS)
   endif()
 endif()
 
-if(WITH_OTLP)
+if(WITH_OTLP_GRPC OR WITH_OTLP_HTTP)
   set(protobuf_MODULE_COMPATIBLE ON)
   find_package(Protobuf)
-  if(WITH_OTLP_GRPC OR (NOT DEFINED WITH_OTLP_GRPC AND NOT DEFINED
-                                                       CACHE{WITH_OTLP_GRPC}))
+  if(WITH_OTLP_GRPC)
     find_package(gRPC)
   endif()
   if((NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND) OR (NOT gRPC_FOUND))
@@ -324,9 +377,7 @@ if(WITH_OTLP)
     if(NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND)
       find_package(Protobuf REQUIRED)
     endif()
-    if(NOT gRPC_FOUND
-       AND (WITH_OTLP_GRPC OR (NOT DEFINED WITH_OTLP_GRPC
-                               AND NOT DEFINED CACHE{WITH_OTLP_GRPC})))
+    if(NOT gRPC_FOUND AND WITH_OTLP_GRPC)
       find_package(gRPC)
     endif()
     if(WIN32)
@@ -344,10 +395,6 @@ if(WITH_OTLP)
   endif()
   include(CMakeDependentOption)
 
-  cmake_dependent_option(
-    WITH_OTLP_GRPC "Whether to include the OTLP gRPC exporter in the SDK" ON
-    "gRPC_FOUND" OFF)
-
   message(STATUS "PROTOBUF_PROTOC_EXECUTABLE=${PROTOBUF_PROTOC_EXECUTABLE}")
   include(cmake/opentelemetry-proto.cmake)
 endif()
@@ -500,9 +547,10 @@ if(BUILD_TESTING)
         ${CMAKE_BINARY_DIR}/lib/libgmock.a)
   elseif(WIN32)
     # Make sure we are always bootsrapped with vcpkg on Windows
-    find_package(GTest REQUIRED)
+    find_package(GTest)
     if(NOT (GTEST_FOUND OR GTest_FOUND))
       install_windows_deps()
+      include(${CMAKE_TOOLCHAIN_FILE})
       find_package(GTest REQUIRED)
     endif()
   else()
@@ -536,6 +584,29 @@ include_directories(api/include)
 
 add_subdirectory(api)
 
+if(WITH_OPENTRACING)
+  find_package(OpenTracing CONFIG QUIET)
+  if(NOT OpenTracing_FOUND)
+    set(OPENTRACING_DIR "third_party/opentracing-cpp")
+    message("Trying to use local ${OPENTRACING_DIR} from submodule")
+    if(EXISTS "${PROJECT_SOURCE_DIR}/${OPENTRACING_DIR}/.git")
+      set(SAVED_BUILD_TESTING ${BUILD_TESTING})
+      set(BUILD_TESTING OFF)
+      add_subdirectory(${OPENTRACING_DIR})
+      set(BUILD_TESTING ${SAVED_BUILD_TESTING})
+    else()
+      message(
+        FATAL_ERROR
+          "\nopentracing-cpp package was not found. Please either provide it manually or clone with submodules. "
+          "To initialize, fetch and checkout any nested submodules, you can use the following command:\n"
+          "git submodule update --init --recursive")
+    endif()
+  else()
+    message("Using external opentracing-cpp")
+  endif()
+  add_subdirectory(opentracing-shim)
+endif()
+
 if(NOT WITH_API_ONLY)
   set(BUILD_TESTING ${BUILD_TESTING})
   include_directories(sdk/include)
@@ -545,51 +616,57 @@ if(NOT WITH_API_ONLY)
   add_subdirectory(sdk)
   add_subdirectory(ext)
   add_subdirectory(exporters)
+
   if(BUILD_TESTING)
     add_subdirectory(test_common)
   endif()
   if(WITH_EXAMPLES)
     add_subdirectory(examples)
   endif()
+  if(WITH_FUNC_TESTS)
+    add_subdirectory(functional)
+  endif()
 endif()
 
-include(cmake/opentelemetry-build-contrib.cmake)
-
-# Export cmake config and support find_packages(opentelemetry-cpp CONFIG) Write
-# config file for find_packages(opentelemetry-cpp CONFIG)
-set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
-configure_package_config_file(
-  "${CMAKE_CURRENT_LIST_DIR}/cmake/opentelemetry-cpp-config.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake"
-  INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
-  PATH_VARS OPENTELEMETRY_ABI_VERSION_NO OPENTELEMETRY_VERSION PROJECT_NAME
-            INCLUDE_INSTALL_DIR CMAKE_INSTALL_LIBDIR
-  NO_CHECK_REQUIRED_COMPONENTS_MACRO)
-
-# Write version file for find_packages(opentelemetry-cpp CONFIG)
-write_basic_package_version_file(
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config-version.cmake"
-  VERSION ${OPENTELEMETRY_VERSION}
-  COMPATIBILITY ExactVersion)
-
-install(
-  FILES
+include(cmake/opentelemetry-build-external-component.cmake)
+
+if(OPENTELEMETRY_INSTALL)
+  # Export cmake config and support find_packages(opentelemetry-cpp CONFIG)
+  # Write config file for find_packages(opentelemetry-cpp CONFIG)
+  set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
+  configure_package_config_file(
+    "${CMAKE_CURRENT_LIST_DIR}/cmake/opentelemetry-cpp-config.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake"
+    INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
+    PATH_VARS OPENTELEMETRY_ABI_VERSION_NO OPENTELEMETRY_VERSION PROJECT_NAME
+              INCLUDE_INSTALL_DIR CMAKE_INSTALL_LIBDIR
+    NO_CHECK_REQUIRED_COMPONENTS_MACRO)
+
+  # Write version file for find_packages(opentelemetry-cpp CONFIG)
+  write_basic_package_version_file(
     "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config-version.cmake"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-
-# Export all components
-export(
-  EXPORT "${PROJECT_NAME}-target"
-  NAMESPACE "${PROJECT_NAME}::"
-  FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-target.cmake"
-)
-install(
-  EXPORT "${PROJECT_NAME}-target"
-  NAMESPACE "${PROJECT_NAME}::"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-
-if(BUILD_PACKAGE)
-  include(cmake/package.cmake)
-  include(CPack)
+    VERSION ${OPENTELEMETRY_VERSION}
+    COMPATIBILITY ExactVersion)
+
+  install(
+    FILES
+      "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake"
+      "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config-version.cmake"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+
+  # Export all components
+  export(
+    EXPORT "${PROJECT_NAME}-target"
+    NAMESPACE "${PROJECT_NAME}::"
+    FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-target.cmake"
+  )
+  install(
+    EXPORT "${PROJECT_NAME}-target"
+    NAMESPACE "${PROJECT_NAME}::"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+
+  if(BUILD_PACKAGE)
+    include(cmake/package.cmake)
+    include(CPack)
+  endif()
 endif()

From 910f980e7c251bc6380fd3f3c1a7ac2d7d32c86c Mon Sep 17 00:00:00 2001
From: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
Date: Thu, 22 Jun 2023 23:29:32 -0700
Subject: [PATCH 7/7] Update cmake/opentelemetry-build-external-component.cmake

Co-authored-by: Tom Tan <lilotom@gmail.com>
---
 cmake/opentelemetry-build-external-component.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/opentelemetry-build-external-component.cmake b/cmake/opentelemetry-build-external-component.cmake
index 3d76ac6a52..cd30eb082f 100644
--- a/cmake/opentelemetry-build-external-component.cmake
+++ b/cmake/opentelemetry-build-external-component.cmake
@@ -5,7 +5,7 @@
 # The config options are
 #  - OPENTELEMETRY_EXTERNAL_COMPONENT_PATH - Setting local path of the external
 # component as env variable
-#  - OPENTELEMETRY_EXTERNAL_COMPONENT_URL Setting githb-repo of external component
+#  - OPENTELEMETRY_EXTERNAL_COMPONENT_URL Setting github-repo of external component
 #  as env variable