From 77012391b272c016b15611092626dec4c21c54bb Mon Sep 17 00:00:00 2001
From: Dat Le <4686348+tdat00@users.noreply.github.com>
Date: Thu, 27 Jun 2024 14:01:41 +0700
Subject: [PATCH 01/13] [BUILD] Add bazel missing BUILD file (#2720)

---
 examples/etw_threads/BUILD | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 examples/etw_threads/BUILD

diff --git a/examples/etw_threads/BUILD b/examples/etw_threads/BUILD
new file mode 100644
index 0000000000..edb60080eb
--- /dev/null
+++ b/examples/etw_threads/BUILD
@@ -0,0 +1,18 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+cc_binary(
+    name = "example_etw_threads",
+    srcs = [
+        "main.cc",
+    ],
+    tags = [
+        "etw",
+        "examples",
+    ],
+    target_compatible_with = ["@platforms//os:windows"],
+    deps = [
+        "//api",
+        "//exporters/etw:etw_exporter",
+    ],
+)

From f0e0ef0bf3e769b609de3fd1d79a5b615b8bc881 Mon Sep 17 00:00:00 2001
From: Siddhartha Malladi <msiddhu45@gmail.com>
Date: Thu, 27 Jun 2024 18:14:31 -0400
Subject: [PATCH 02/13]  [SDK] Added reserve for spans array in
 BatchSpanProcessor. (#2724)

* Added reserve for spans array in BatchSpanProcessor.

    Added reserve for spans array in BatchSpanProcessor.

    Helps to allocate the amount of memory needed for number of records so that dynamic memory allocation doesn't happen in the consume method.

    .push_back() reallocates memory each time the method is called.

    Using .reserve() would avoid memory reallocation as already the memory is allocated.

    References:
    https://cplusplus.com/reference/vector/vector/push_back/
    https://cplusplus.com/reference/vector/vector/reserve/

* Added reserve for spans array in BatchLogProcessor.

Added reserve for spans array in BatchLogProcessor. Same as previously done for BatchSpanProcessor

* Update batch_log_record_processor.cc

* Update batch_span_processor.cc

* Update sdk/src/logs/batch_log_record_processor.cc
---
 sdk/src/logs/batch_log_record_processor.cc | 2 ++
 sdk/src/trace/batch_span_processor.cc      | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/sdk/src/logs/batch_log_record_processor.cc b/sdk/src/logs/batch_log_record_processor.cc
index c85d56739e..f5c35ad339 100644
--- a/sdk/src/logs/batch_log_record_processor.cc
+++ b/sdk/src/logs/batch_log_record_processor.cc
@@ -208,6 +208,8 @@ void BatchLogRecordProcessor::Export()
       break;
     }
 
+    // Reserve space for the number of records
+    records_arr.reserve(num_records_to_export);
     buffer_.Consume(num_records_to_export,
                     [&](CircularBufferRange<AtomicUniquePtr<Recordable>> range) noexcept {
                       range.ForEach([&](AtomicUniquePtr<Recordable> &ptr) {
diff --git a/sdk/src/trace/batch_span_processor.cc b/sdk/src/trace/batch_span_processor.cc
index c5e72f8176..03b79f6ebb 100644
--- a/sdk/src/trace/batch_span_processor.cc
+++ b/sdk/src/trace/batch_span_processor.cc
@@ -206,6 +206,10 @@ void BatchSpanProcessor::Export()
       NotifyCompletion(notify_force_flush, exporter_, synchronization_data_);
       break;
     }
+
+    // Reserve space for the number of records
+    spans_arr.reserve(num_records_to_export);
+
     buffer_.Consume(num_records_to_export,
                     [&](CircularBufferRange<AtomicUniquePtr<Recordable>> range) noexcept {
                       range.ForEach([&](AtomicUniquePtr<Recordable> &ptr) {

From ead2d1b6062473c354a9ca91f65e322170acb001 Mon Sep 17 00:00:00 2001
From: Pravila <pravila0011@gmail.com>
Date: Sun, 30 Jun 2024 13:47:06 +0100
Subject: [PATCH 03/13] [DOC] Update "Using triplets" section in
 building-with-vcpkg documentation. (#2726)

* Update triplet links in building-with-vcpkg documentation.

* Update docs/building-with-vcpkg.md

Co-authored-by: Tom Tan <lilotom@gmail.com>

---------

Co-authored-by: Marc Alff <marc.alff@free.fr>
Co-authored-by: Tom Tan <lilotom@gmail.com>
---
 docs/building-with-vcpkg.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/building-with-vcpkg.md b/docs/building-with-vcpkg.md
index aace95460c..70d794d5cf 100644
--- a/docs/building-with-vcpkg.md
+++ b/docs/building-with-vcpkg.md
@@ -67,12 +67,12 @@ logs in case if you encounter package installation failures.
 
 In order to enable custom build flags - vcpkg triplets and custom environment
 variables may be used. Please see [triplets instruction
-here](https://vcpkg.readthedocs.io/en/latest/users/triplets/). Response file for
+here](https://learn.microsoft.com/en-us/vcpkg/users/triplets). Response file for
 a custom build, e.g. `response_file_linux_PRODUCTNAME.txt` may specify a custom
 triplet. For example, custom triplet controls if the library is built as static
-or dynamic. Default triplets may also be overridden with [custom
-triplets](https://vcpkg.readthedocs.io/en/latest/examples/overlay-triplets-linux-dynamic/#overlay-triplets-example).
-Custom triplets specific to various products must be maintained by product
+or dynamic. Default triplets may also be overridden with [overlay
+triplets](https://learn.microsoft.com/en-us/vcpkg/users/examples/overlay-triplets-linux-dynamic).
+Overlay triplets specific to various products must be maintained by product
 teams. Product teams may optionally decide to integrate their triplets in the
 mainline OpenTelemetry C++ SDK repo as-needed.
 

From 5e21b8ac2dec059d89f515e67600a0c11d15d19f Mon Sep 17 00:00:00 2001
From: Dylan Herman <d.herman56@gmail.com>
Date: Sun, 30 Jun 2024 14:42:19 -0700
Subject: [PATCH 04/13] [DOC] Remove comment for unused LoggerProvider
 initialization params (#2972)

---
 sdk/include/opentelemetry/sdk/logs/logger_provider.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sdk/include/opentelemetry/sdk/logs/logger_provider.h b/sdk/include/opentelemetry/sdk/logs/logger_provider.h
index bf116b4272..6c035ad5e9 100644
--- a/sdk/include/opentelemetry/sdk/logs/logger_provider.h
+++ b/sdk/include/opentelemetry/sdk/logs/logger_provider.h
@@ -36,10 +36,6 @@ class OPENTELEMETRY_EXPORT LoggerProvider final : public opentelemetry::logs::Lo
    * @param processor The span processor for this logger provider. This must
    * not be a nullptr.
    * @param resource  The resources for this logger provider.
-   * @param sampler The sampler for this logger provider. This must
-   * not be a nullptr.
-   * @param id_generator The custom id generator for this logger provider. This must
-   * not be a nullptr
    */
   explicit LoggerProvider(std::unique_ptr<LogRecordProcessor> &&processor,
                           opentelemetry::sdk::resource::Resource resource =

From 42563e41602bd29fba7ea00082a4df4a4f8c7676 Mon Sep 17 00:00:00 2001
From: Marc Alff <marc.alff@oracle.com>
Date: Tue, 2 Jul 2024 20:42:54 +0200
Subject: [PATCH 05/13] [SECURITY] Remove OTLP HTTP support for TLS 1.0 and TLS
 1.1, require TLS 1.2 (#2722)

---
 CHANGELOG.md                                  | 19 ++++++
 .../exporters/otlp/otlp_environment.h         |  2 +-
 .../ext/http/client/http_client.h             |  8 +--
 .../http/client/curl/http_operation_curl.cc   | 40 +++++-------
 functional/otlp/func_http_main.cc             | 62 +++++++++++++++----
 5 files changed, 86 insertions(+), 45 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6edb724131..92e234a77b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,25 @@ Increment the:
 
 ## [Unreleased]
 
+* [SECURITY] Remove OTLP HTTP support for TLS 1.0 and TLS 1.1,
+  require TLS 1.2 or better
+  [#2721](https://github.com/open-telemetry/opentelemetry-cpp/pull/2721)
+
+Breaking changes:
+
+* [SECURITY] Remove OTLP HTTP support for TLS 1.0 and TLS 1.1,
+  require TLS 1.2 or better
+  [#2721](https://github.com/open-telemetry/opentelemetry-cpp/pull/2721)
+  * The OTLP HTTP exporter no longer accept options like:
+    * min_TLS = 1.0
+    * min_TLS = 1.1
+    * max_TLS = 1.0
+    * max_TLS = 1.1
+  * When connecting to an OTLP HTTP endpoint, using `https`,
+    the connection will require TLS 1.2 by default,
+    unless min_TLS is set to 1.3
+  * Plain `http` connections (insecure) are not affected.
+
 ## [1.16.0] 2024-06-21
 
 * [BUILD] Upgrade bazel abseil from 20220623.1 to 20230802.2
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_environment.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_environment.h
index c2e0afb7bc..8b486a548f 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_environment.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_environment.h
@@ -111,7 +111,7 @@ std::string GetOtlpDefaultTracesSslTlsMaxVersion();
 std::string GetOtlpDefaultMetricsSslTlsMaxVersion();
 std::string GetOtlpDefaultLogsSslTlsMaxVersion();
 
-// For TLS 1.0, 1.1, 1.2
+// For TLS 1.2
 std::string GetOtlpDefaultTracesSslTlsCipher();
 std::string GetOtlpDefaultMetricsSslTlsCipher();
 std::string GetOtlpDefaultLogsSslTlsCipher();
diff --git a/ext/include/opentelemetry/ext/http/client/http_client.h b/ext/include/opentelemetry/ext/http/client/http_client.h
index b3cf7365eb..1089402e28 100644
--- a/ext/include/opentelemetry/ext/http/client/http_client.h
+++ b/ext/include/opentelemetry/ext/http/client/http_client.h
@@ -192,9 +192,7 @@ struct HttpSslOptions
   /**
     Minimum SSL version to use.
     Valid values are:
-    - empty (no minimum version required)
-    - "1.0" (TLSv1.0)
-    - "1.1" (TLSv1.1)
+    - empty (defaults to TLSv1.2)
     - "1.2" (TLSv1.2)
     - "1.3" (TLSv1.3)
   */
@@ -204,8 +202,6 @@ struct HttpSslOptions
     Maximum SSL version to use.
     Valid values are:
     - empty (no maximum version required)
-    - "1.0" (TLSv1.0)
-    - "1.1" (TLSv1.1)
     - "1.2" (TLSv1.2)
     - "1.3" (TLSv1.3)
   */
@@ -213,7 +209,7 @@ struct HttpSslOptions
 
   /**
     TLS Cipher.
-    This is for TLS 1.0, 1.1 and 1.2.
+    This is for TLS 1.2.
     The list is delimited by colons (":").
     Cipher names depends on the underlying CURL implementation.
   */
diff --git a/ext/src/http/client/curl/http_operation_curl.cc b/ext/src/http/client/curl/http_operation_curl.cc
index 25f43fcb2f..fe06384414 100644
--- a/ext/src/http/client/curl/http_operation_curl.cc
+++ b/ext/src/http/client/curl/http_operation_curl.cc
@@ -414,16 +414,16 @@ void HttpOperation::Cleanup()
   To represent versions, the following symbols are needed:
 
   Added in CURL 7.34.0:
-  - CURL_SSLVERSION_TLSv1_0
-  - CURL_SSLVERSION_TLSv1_1
+  - CURL_SSLVERSION_TLSv1_0 (do not use)
+  - CURL_SSLVERSION_TLSv1_1 (do not use)
   - CURL_SSLVERSION_TLSv1_2
 
   Added in CURL 7.52.0:
   - CURL_SSLVERSION_TLSv1_3
 
   Added in CURL 7.54.0:
-  - CURL_SSLVERSION_MAX_TLSv1_0
-  - CURL_SSLVERSION_MAX_TLSv1_1
+  - CURL_SSLVERSION_MAX_TLSv1_0 (do not use)
+  - CURL_SSLVERSION_MAX_TLSv1_1 (do not use)
   - CURL_SSLVERSION_MAX_TLSv1_2
   - CURL_SSLVERSION_MAX_TLSv1_3
 
@@ -439,16 +439,6 @@ void HttpOperation::Cleanup()
 static long parse_min_ssl_version(std::string version)
 {
 #ifdef HAVE_TLS_VERSION
-  if (version == "1.0")
-  {
-    return CURL_SSLVERSION_TLSv1_0;
-  }
-
-  if (version == "1.1")
-  {
-    return CURL_SSLVERSION_TLSv1_1;
-  }
-
   if (version == "1.2")
   {
     return CURL_SSLVERSION_TLSv1_2;
@@ -466,16 +456,6 @@ static long parse_min_ssl_version(std::string version)
 static long parse_max_ssl_version(std::string version)
 {
 #ifdef HAVE_TLS_VERSION
-  if (version == "1.0")
-  {
-    return CURL_SSLVERSION_MAX_TLSv1_0;
-  }
-
-  if (version == "1.1")
-  {
-    return CURL_SSLVERSION_MAX_TLSv1_1;
-  }
-
   if (version == "1.2")
   {
     return CURL_SSLVERSION_MAX_TLSv1_2;
@@ -730,7 +710,12 @@ CURLcode HttpOperation::Setup()
 
     /* 4 - TLS */
 
+#ifdef HAVE_TLS_VERSION
+    /* By default, TLSv1.2 or better is required (if we have TLS). */
+    long min_ssl_version = CURL_SSLVERSION_TLSv1_2;
+#else
     long min_ssl_version = 0;
+#endif
 
     if (!ssl_options_.ssl_min_tls.empty())
     {
@@ -748,6 +733,11 @@ CURLcode HttpOperation::Setup()
 #endif
     }
 
+    /*
+     * Do not set a max TLS version by default.
+     * The CURL + openssl library may be more recent than this code,
+     * and support a version we do not know about.
+     */
     long max_ssl_version = 0;
 
     if (!ssl_options_.ssl_max_tls.empty())
@@ -780,7 +770,7 @@ CURLcode HttpOperation::Setup()
 
     if (!ssl_options_.ssl_cipher.empty())
     {
-      /* TLS 1.0, 1.1, 1.2 */
+      /* TLS 1.2 */
       const char *cipher_list = ssl_options_.ssl_cipher.c_str();
 
       rc = SetCurlStrOption(CURLOPT_SSL_CIPHER_LIST, cipher_list);
diff --git a/functional/otlp/func_http_main.cc b/functional/otlp/func_http_main.cc
index 9cd3585668..08b7807998 100644
--- a/functional/otlp/func_http_main.cc
+++ b/functional/otlp/func_http_main.cc
@@ -54,6 +54,8 @@ struct TestResult
   bool found_request_send_failure = false;
   bool found_export_error         = false;
   bool found_export_success       = false;
+  bool found_unknown_min_tls      = false;
+  bool found_unknown_max_tls      = false;
 
   void reset()
   {
@@ -62,6 +64,8 @@ struct TestResult
     found_request_send_failure = false;
     found_export_error         = false;
     found_export_success       = false;
+    found_unknown_min_tls      = false;
+    found_unknown_max_tls      = false;
   }
 };
 
@@ -96,6 +100,20 @@ void parse_error_msg(TestResult *result, std::string msg)
   {
     result->found_export_error = true;
   }
+
+  static std::string unknown_min_tls("Unknown min TLS version");
+
+  if (msg.find(unknown_min_tls) != std::string::npos)
+  {
+    result->found_unknown_min_tls = true;
+  }
+
+  static std::string unknown_max_tls("Unknown max TLS version");
+
+  if (msg.find(unknown_max_tls) != std::string::npos)
+  {
+    result->found_unknown_max_tls = true;
+  }
 }
 
 void parse_warning_msg(TestResult * /* result */, std::string /* msg */) {}
@@ -507,6 +525,24 @@ int expect_request_send_failed()
   return TEST_FAILED;
 }
 
+int expect_unknown_min_tls()
+{
+  if (g_test_result.found_export_error && g_test_result.found_unknown_min_tls)
+  {
+    return TEST_PASSED;
+  }
+  return TEST_FAILED;
+}
+
+int expect_unknown_max_tls()
+{
+  if (g_test_result.found_export_error && g_test_result.found_unknown_max_tls)
+  {
+    return TEST_PASSED;
+  }
+  return TEST_FAILED;
+}
+
 int expect_export_failed()
 {
   /*
@@ -928,7 +964,7 @@ int test_min_tls_unknown()
     return expect_export_failed();
   }
 
-  return expect_connection_failed();
+  return expect_unknown_min_tls();
 }
 
 int test_min_tls_10()
@@ -963,7 +999,7 @@ int test_min_tls_10()
     return expect_connection_failed();
   }
 
-  return expect_success();
+  return expect_unknown_min_tls();
 }
 
 int test_min_tls_11()
@@ -998,7 +1034,7 @@ int test_min_tls_11()
     return expect_connection_failed();
   }
 
-  return expect_success();
+  return expect_unknown_min_tls();
 }
 
 int test_min_tls_12()
@@ -1098,7 +1134,7 @@ int test_max_tls_unknown()
     return expect_export_failed();
   }
 
-  return expect_connection_failed();
+  return expect_unknown_max_tls();
 }
 
 int test_max_tls_10()
@@ -1134,7 +1170,7 @@ int test_max_tls_10()
   }
 
   // No support for TLS 1.0
-  return expect_connection_failed();
+  return expect_unknown_max_tls();
 }
 
 int test_max_tls_11()
@@ -1170,7 +1206,7 @@ int test_max_tls_11()
   }
 
   // No support for TLS 1.1
-  return expect_connection_failed();
+  return expect_unknown_max_tls();
 }
 
 int test_max_tls_12()
@@ -1277,7 +1313,7 @@ int test_range_tls_10()
   }
 
   // No support for TLS 1.0
-  return expect_connection_failed();
+  return expect_unknown_min_tls();
 }
 
 int test_range_tls_11()
@@ -1314,7 +1350,7 @@ int test_range_tls_11()
   }
 
   // No support for TLS 1.0
-  return expect_connection_failed();
+  return expect_unknown_min_tls();
 }
 
 int test_range_tls_12()
@@ -1423,7 +1459,7 @@ int test_range_tls_10_11()
   }
 
   // No support for TLS 1.0, TLS 1.1
-  return expect_connection_failed();
+  return expect_unknown_min_tls();
 }
 
 int test_range_tls_10_12()
@@ -1459,7 +1495,7 @@ int test_range_tls_10_12()
     return expect_connection_failed();
   }
 
-  return expect_success();
+  return expect_unknown_min_tls();
 }
 
 int test_range_tls_10_13()
@@ -1495,7 +1531,7 @@ int test_range_tls_10_13()
     return expect_connection_failed();
   }
 
-  return expect_success();
+  return expect_unknown_min_tls();
 }
 
 int test_range_tls_11_10()
@@ -1563,7 +1599,7 @@ int test_range_tls_11_12()
     return expect_connection_failed();
   }
 
-  return expect_success();
+  return expect_unknown_min_tls();
 }
 
 int test_range_tls_11_13()
@@ -1599,7 +1635,7 @@ int test_range_tls_11_13()
     return expect_connection_failed();
   }
 
-  return expect_success();
+  return expect_unknown_min_tls();
 }
 
 int test_range_tls_12_10()

From f6dca999b5ec011af07fb2e86cc7e9c1eaa6e80a Mon Sep 17 00:00:00 2001
From: Marc Alff <marc.alff@oracle.com>
Date: Wed, 3 Jul 2024 18:04:05 +0200
Subject: [PATCH 06/13] [TEST] Fix opentelemetry-collector bind address (#2989)

---
 functional/otlp/otel-config-http.yaml         | 1 +
 functional/otlp/otel-config-https.yaml        | 1 +
 functional/otlp/otel-docker-config-http.yaml  | 1 +
 functional/otlp/otel-docker-config-https.yaml | 1 +
 4 files changed, 4 insertions(+)

diff --git a/functional/otlp/otel-config-http.yaml b/functional/otlp/otel-config-http.yaml
index 39c264c747..da68e6f96c 100644
--- a/functional/otlp/otel-config-http.yaml
+++ b/functional/otlp/otel-config-http.yaml
@@ -10,6 +10,7 @@ receivers:
   otlp:
     protocols:
       http:
+        endpoint: 0.0.0.0:4318
 
 processors:
   batch:
diff --git a/functional/otlp/otel-config-https.yaml b/functional/otlp/otel-config-https.yaml
index 611bba828f..f106baf8b6 100644
--- a/functional/otlp/otel-config-https.yaml
+++ b/functional/otlp/otel-config-https.yaml
@@ -10,6 +10,7 @@ receivers:
   otlp:
     protocols:
       http:
+        endpoint: 0.0.0.0:4318
         tls:
           ca_file: ../cert/ca.pem
           cert_file: ../cert/server_cert.pem
diff --git a/functional/otlp/otel-docker-config-http.yaml b/functional/otlp/otel-docker-config-http.yaml
index f8e5ad45d3..c18f0e54a4 100644
--- a/functional/otlp/otel-docker-config-http.yaml
+++ b/functional/otlp/otel-docker-config-http.yaml
@@ -9,6 +9,7 @@ receivers:
   otlp:
     protocols:
       http:
+        endpoint: 0.0.0.0:4318
 
 processors:
   batch:
diff --git a/functional/otlp/otel-docker-config-https.yaml b/functional/otlp/otel-docker-config-https.yaml
index 9b3422bf5e..db8f2b3756 100644
--- a/functional/otlp/otel-docker-config-https.yaml
+++ b/functional/otlp/otel-docker-config-https.yaml
@@ -9,6 +9,7 @@ receivers:
   otlp:
     protocols:
       http:
+        endpoint: 0.0.0.0:4318
         tls:
           ca_file: /otel-cpp/ca.pem
           cert_file: /otel-cpp/server_cert.pem

From 0ff58e8334dc9c5b7cbf0f8088f174dd5ddbd538 Mon Sep 17 00:00:00 2001
From: Mats Taraldsvik <mats.taraldsvik@gmail.com>
Date: Fri, 5 Jul 2024 19:16:32 +0200
Subject: [PATCH 07/13] [EXPORTER] Fix references in AttributeValueVisitor
 (#2985)

---
 .../include/opentelemetry/exporters/ostream/common_utils.h      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exporters/ostream/include/opentelemetry/exporters/ostream/common_utils.h b/exporters/ostream/include/opentelemetry/exporters/ostream/common_utils.h
index ec1ee2d367..ec860794f0 100644
--- a/exporters/ostream/include/opentelemetry/exporters/ostream/common_utils.h
+++ b/exporters/ostream/include/opentelemetry/exporters/ostream/common_utils.h
@@ -87,7 +87,7 @@ class AttributeValueVisitor
     print_value(arg, sout_);
   }
 
-  void operator()(const nostd::string_view &&arg) { sout_.write(arg.data(), arg.size()); }
+  void operator()(nostd::string_view &&arg) { sout_.write(arg.data(), arg.size()); }
 
 private:
   std::ostream &sout_;

From 6dbfdb52ebca82d8705392fe88dadd9c133374e4 Mon Sep 17 00:00:00 2001
From: Marc Alff <marc.alff@oracle.com>
Date: Sat, 6 Jul 2024 17:16:02 +0200
Subject: [PATCH 08/13] [Code health] include-what-you-use cleanup, part 2
 (#2704)

---
 .github/workflows/iwyu.yml                    |  8 +++
 api/include/opentelemetry/std/shared_ptr.h    |  4 +-
 api/include/opentelemetry/std/span.h          |  2 +
 api/include/opentelemetry/std/string_view.h   |  2 +
 api/include/opentelemetry/std/type_traits.h   |  2 +
 api/include/opentelemetry/std/unique_ptr.h    |  4 +-
 api/include/opentelemetry/std/utility.h       |  2 +
 api/include/opentelemetry/std/variant.h       |  2 +
 cmake/opentelemetry-proto.cmake               |  6 ++
 examples/batch/main.cc                        |  5 +-
 examples/common/foo_library/foo_library.cc    |  1 -
 .../common/logs_foo_library/foo_library.cc    |  5 +-
 .../common/metrics_foo_library/foo_library.cc | 36 ++++++------
 examples/multithreaded/main.cc                |  5 +-
 examples/otlp/file_log_main.cc                | 19 +++---
 examples/otlp/file_main.cc                    | 13 +++--
 examples/otlp/file_metric_main.cc             | 25 ++++----
 examples/otlp/http_log_main.cc                | 18 ++++--
 examples/otlp/http_main.cc                    | 11 +++-
 examples/otlp/http_metric_main.cc             | 22 ++++---
 examples/plugin/load/main.cc                  |  2 +-
 examples/plugin/plugin/factory_impl.cc        |  1 -
 examples/plugin/plugin/tracer.cc              |  2 -
 examples/plugin/plugin/tracer.h               |  1 -
 examples/zipkin/main.cc                       |  9 +++
 exporters/ostream/src/span_exporter.cc        |  1 -
 .../exporters/otlp/otlp_environment.h         | 12 ++--
 .../exporters/otlp/otlp_file_client.h         |  9 +--
 .../exporters/otlp/otlp_file_exporter.h       | 13 +++--
 .../otlp/otlp_file_exporter_factory.h         |  1 +
 .../otlp/otlp_file_log_record_exporter.h      | 14 ++---
 .../otlp_file_log_record_exporter_factory.h   |  1 +
 .../otlp/otlp_file_metric_exporter.h          | 14 ++---
 .../otlp/otlp_file_metric_exporter_factory.h  |  1 +
 .../opentelemetry/exporters/otlp/otlp_http.h  |  3 +-
 .../exporters/otlp/otlp_http_client.h         | 16 ++---
 .../exporters/otlp/otlp_http_exporter.h       | 17 +++---
 .../otlp/otlp_http_exporter_factory.h         |  1 +
 .../otlp/otlp_http_exporter_options.h         |  8 +--
 .../otlp/otlp_http_log_record_exporter.h      | 15 +++--
 .../otlp_http_log_record_exporter_factory.h   |  5 +-
 .../otlp_http_log_record_exporter_options.h   |  8 +--
 .../otlp/otlp_http_metric_exporter.h          | 14 ++---
 .../otlp/otlp_http_metric_exporter_factory.h  |  5 +-
 .../otlp/otlp_http_metric_exporter_options.h  |  8 +--
 .../exporters/otlp/otlp_metric_utils.h        | 32 +++++++---
 .../otlp/otlp_populate_attribute_utils.h      | 31 ++++++++--
 .../exporters/otlp/otlp_recordable.h          | 22 +++++--
 .../exporters/otlp/otlp_recordable_utils.h    | 36 +++++++++---
 exporters/otlp/src/otlp_environment.cc        | 17 ++++--
 exporters/otlp/src/otlp_file_client.cc        |  7 +--
 exporters/otlp/src/otlp_file_exporter.cc      | 25 +++++---
 .../otlp/src/otlp_file_log_record_exporter.cc | 24 ++++++--
 .../otlp/src/otlp_file_metric_exporter.cc     | 25 ++++++--
 exporters/otlp/src/otlp_http_client.cc        | 58 ++++++++++---------
 exporters/otlp/src/otlp_http_exporter.cc      | 32 +++++++---
 .../otlp/src/otlp_http_exporter_options.cc    |  9 +--
 .../otlp/src/otlp_http_log_record_exporter.cc | 32 +++++++---
 .../otlp_http_log_record_exporter_options.cc  |  9 +--
 .../otlp/src/otlp_http_metric_exporter.cc     | 30 +++++++---
 .../src/otlp_http_metric_exporter_options.cc  | 10 ++--
 exporters/otlp/src/otlp_log_recordable.cc     | 19 ++++--
 exporters/otlp/src/otlp_metric_utils.cc       | 23 ++++++++
 .../otlp/src/otlp_populate_attribute_utils.cc | 22 +++++++
 exporters/otlp/src/otlp_recordable.cc         | 30 +++++++++-
 exporters/otlp/src/otlp_recordable_utils.cc   | 43 +++++++++-----
 exporters/otlp/test/otlp_recordable_test.cc   |  6 ++
 .../exporters/zipkin/recordable.h             | 14 +++++
 .../exporters/zipkin/zipkin_exporter.h        | 18 +++---
 .../zipkin/zipkin_exporter_factory.h          |  1 +
 exporters/zipkin/src/recordable.cc            | 27 ++++++++-
 exporters/zipkin/src/zipkin_exporter.cc       | 21 ++++++-
 .../zipkin/src/zipkin_exporter_factory.cc     |  2 +
 .../ext/http/client/curl/http_client_curl.h   | 21 ++++---
 ext/src/http/client/curl/http_client_curl.cc  | 26 ++++++++-
 .../client/curl/http_client_factory_curl.cc   |  2 +
 .../http/client/curl/http_operation_curl.cc   | 21 ++++++-
 functional/otlp/func_http_main.cc             | 19 +++++-
 sdk/src/logs/logger.cc                        |  1 -
 sdk/src/logs/logger_provider.cc               |  2 -
 sdk/src/logs/readable_log_record.cc           |  1 -
 sdk/src/metrics/meter.cc                      |  1 -
 sdk/src/metrics/meter_provider.cc             |  2 -
 sdk/src/metrics/state/observable_registry.cc  |  1 -
 sdk/src/trace/tracer.cc                       |  2 -
 sdk/src/trace/tracer_provider.cc              |  2 -
 86 files changed, 761 insertions(+), 338 deletions(-)

diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml
index 29b8274fbd..598f57e97e 100644
--- a/.github/workflows/iwyu.yml
+++ b/.github/workflows/iwyu.yml
@@ -36,10 +36,18 @@ jobs:
           TOPDIR=`pwd`
           mkdir build && cd build
           CC="clang" CXX="clang++" cmake \
+            -DCMAKE_CXX_STANDARD=14 \
+            -DWITH_STL=CXX14 \
             -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-w;-Xiwyu;--mapping_file=${TOPDIR}/.iwyu.imp;" \
             -DBUILD_TESTING=OFF \
             -DWITH_DEPRECATED_SDK_FACTORY=OFF \
             -DBUILD_W3CTRACECONTEXT_TEST=OFF \
+            -DWITH_OTLP_GRPC=OFF \
+            -DWITH_OTLP_HTTP=ON \
+            -DWITH_OTLP_FILE=ON \
+            -DWITH_OTLP_HTTP_COMPRESSION=ON \
+            -DWITH_ZIPKIN=ON \
+            -DWITH_PROMETHEUS=OFF \
             ..
 
       - name: iwyu_tool
diff --git a/api/include/opentelemetry/std/shared_ptr.h b/api/include/opentelemetry/std/shared_ptr.h
index b1b99bd36c..8b855b08c6 100644
--- a/api/include/opentelemetry/std/shared_ptr.h
+++ b/api/include/opentelemetry/std/shared_ptr.h
@@ -3,7 +3,9 @@
 
 #pragma once
 
-#include <memory>
+// IWYU pragma: private, include "opentelemetry/nostd/shared_ptr.h"
+
+#include <memory>  // IWYU pragma: export
 
 #include "opentelemetry/version.h"
 
diff --git a/api/include/opentelemetry/std/span.h b/api/include/opentelemetry/std/span.h
index 1160d54fbe..5d20e0227f 100644
--- a/api/include/opentelemetry/std/span.h
+++ b/api/include/opentelemetry/std/span.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "opentelemetry/nostd/span.h"
+
 #include "opentelemetry/version.h"
 
 // Standard library implementation requires at least C++17 compiler.
diff --git a/api/include/opentelemetry/std/string_view.h b/api/include/opentelemetry/std/string_view.h
index 5295eb4544..d0f0c08125 100644
--- a/api/include/opentelemetry/std/string_view.h
+++ b/api/include/opentelemetry/std/string_view.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "opentelemetry/nostd/string_view.h"
+
 #include <string_view>
 
 #include "opentelemetry/version.h"
diff --git a/api/include/opentelemetry/std/type_traits.h b/api/include/opentelemetry/std/type_traits.h
index f26af95b94..074f796798 100644
--- a/api/include/opentelemetry/std/type_traits.h
+++ b/api/include/opentelemetry/std/type_traits.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "opentelemetry/nostd/type_traits.h"
+
 #include <type_traits>
 
 #include "opentelemetry/version.h"
diff --git a/api/include/opentelemetry/std/unique_ptr.h b/api/include/opentelemetry/std/unique_ptr.h
index 1d7d9b1fc7..4b25b7c381 100644
--- a/api/include/opentelemetry/std/unique_ptr.h
+++ b/api/include/opentelemetry/std/unique_ptr.h
@@ -3,7 +3,9 @@
 
 #pragma once
 
-#include <memory>
+// IWYU pragma: private, include "opentelemetry/nostd/unique_ptr.h"
+
+#include <memory>  // IWYU pragma: export
 
 #include "opentelemetry/version.h"
 
diff --git a/api/include/opentelemetry/std/utility.h b/api/include/opentelemetry/std/utility.h
index be0f1e5f46..d1f5614d7c 100644
--- a/api/include/opentelemetry/std/utility.h
+++ b/api/include/opentelemetry/std/utility.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "opentelemetry/nostd/utility.h"
+
 #include <cstddef>
 #include <utility>
 
diff --git a/api/include/opentelemetry/std/variant.h b/api/include/opentelemetry/std/variant.h
index 6acdb81e9a..58bc510c5f 100644
--- a/api/include/opentelemetry/std/variant.h
+++ b/api/include/opentelemetry/std/variant.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "opentelemetry/nostd/variant.h"
+
 #include "opentelemetry/version.h"
 
 #include <cstddef>
diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake
index 19516c3b71..62197068e2 100644
--- a/cmake/opentelemetry-proto.cmake
+++ b/cmake/opentelemetry-proto.cmake
@@ -326,6 +326,12 @@ add_library(
   ${LOGS_SERVICE_PB_CPP_FILE}
   ${METRICS_SERVICE_PB_CPP_FILE})
 
+# Disable include-what-you-use on generated code.
+set_target_properties(
+  opentelemetry_proto
+  PROPERTIES CXX_INCLUDE_WHAT_YOU_USE ""
+)
+
 if(WITH_ABSEIL)
   target_link_libraries(opentelemetry_proto PUBLIC absl::bad_variant_access)
 endif()
diff --git a/examples/batch/main.cc b/examples/batch/main.cc
index 2a7fba4630..677feca424 100644
--- a/examples/batch/main.cc
+++ b/examples/batch/main.cc
@@ -5,13 +5,11 @@
 #include <stdio.h>
 #include <chrono>
 #include <iostream>
-#include <memory>
 #include <string>
 #include <thread>
 #include <utility>
 
 #include "opentelemetry/exporters/ostream/span_exporter_factory.h"
-#include "opentelemetry/nostd/detail/decay.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/sdk/trace/batch_span_processor_factory.h"
@@ -30,7 +28,6 @@ namespace trace_api      = opentelemetry::trace;
 namespace resource       = opentelemetry::sdk::resource;
 namespace trace_sdk      = opentelemetry::sdk::trace;
 namespace trace_exporter = opentelemetry::exporter::trace;
-namespace nostd          = opentelemetry::nostd;
 
 namespace
 {
@@ -69,7 +66,7 @@ void CleanupTracer()
   trace_api::Provider::SetTracerProvider(none);
 }
 
-nostd::shared_ptr<trace_api::Tracer> get_tracer()
+opentelemetry::nostd::shared_ptr<trace_api::Tracer> get_tracer()
 {
   auto provider = trace_api::Provider::GetTracerProvider();
   return provider->GetTracer("foo_library");
diff --git a/examples/common/foo_library/foo_library.cc b/examples/common/foo_library/foo_library.cc
index e336bc5e4c..6dd7792e48 100644
--- a/examples/common/foo_library/foo_library.cc
+++ b/examples/common/foo_library/foo_library.cc
@@ -3,7 +3,6 @@
 
 #include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/sdk/version/version.h"
 #include "opentelemetry/trace/provider.h"
 #include "opentelemetry/trace/scope.h"
diff --git a/examples/common/logs_foo_library/foo_library.cc b/examples/common/logs_foo_library/foo_library.cc
index 23402563c6..510c3956d4 100644
--- a/examples/common/logs_foo_library/foo_library.cc
+++ b/examples/common/logs_foo_library/foo_library.cc
@@ -16,17 +16,16 @@
 
 namespace logs  = opentelemetry::logs;
 namespace trace = opentelemetry::trace;
-namespace nostd = opentelemetry::nostd;
 
 namespace
 {
-nostd::shared_ptr<trace::Tracer> get_tracer()
+opentelemetry::nostd::shared_ptr<trace::Tracer> get_tracer()
 {
   auto provider = trace::Provider::GetTracerProvider();
   return provider->GetTracer("foo_library", OPENTELEMETRY_SDK_VERSION);
 }
 
-nostd::shared_ptr<logs::Logger> get_logger()
+opentelemetry::nostd::shared_ptr<logs::Logger> get_logger()
 {
   auto provider = logs::Provider::GetLoggerProvider();
   return provider->GetLogger("foo_library_logger", "foo_library");
diff --git a/examples/common/metrics_foo_library/foo_library.cc b/examples/common/metrics_foo_library/foo_library.cc
index dd5f23297b..c4be2b530f 100644
--- a/examples/common/metrics_foo_library/foo_library.cc
+++ b/examples/common/metrics_foo_library/foo_library.cc
@@ -17,17 +17,17 @@
 #include "opentelemetry/metrics/meter_provider.h"
 #include "opentelemetry/metrics/observer_result.h"
 #include "opentelemetry/metrics/provider.h"
+#include "opentelemetry/metrics/sync_instruments.h"
 #include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/nostd/variant.h"
 
-namespace nostd       = opentelemetry::nostd;
 namespace metrics_api = opentelemetry::metrics;
 
 namespace
 {
 
-static nostd::shared_ptr<metrics_api::ObservableInstrument> double_observable_counter;
+static opentelemetry::nostd::shared_ptr<metrics_api::ObservableInstrument>
+    double_observable_counter;
 
 std::map<std::string, std::string> get_random_attr()
 {
@@ -45,13 +45,15 @@ class MeasurementFetcher
 public:
   static void Fetcher(opentelemetry::metrics::ObserverResult observer_result, void * /* state */)
   {
-    if (nostd::holds_alternative<
-            nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(observer_result))
+    if (opentelemetry::nostd::holds_alternative<
+            opentelemetry::nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(
+            observer_result))
     {
       double random_incr = (rand() % 5) + 1.1;
       value_ += random_incr;
       std::map<std::string, std::string> labels = get_random_attr();
-      nostd::get<nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(
+      opentelemetry::nostd::get<
+          opentelemetry::nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(
           observer_result)
           ->Observe(value_, labels);
     }
@@ -63,10 +65,10 @@ double MeasurementFetcher::value_ = 0.0;
 
 void foo_library::counter_example(const std::string &name)
 {
-  std::string counter_name                    = name + "_counter";
-  auto provider                               = metrics_api::Provider::GetMeterProvider();
-  nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
-  auto double_counter                         = meter->CreateDoubleCounter(counter_name);
+  std::string counter_name = name + "_counter";
+  auto provider            = metrics_api::Provider::GetMeterProvider();
+  opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
+  auto double_counter = meter->CreateDoubleCounter(counter_name);
 
   for (uint32_t i = 0; i < 20; ++i)
   {
@@ -78,10 +80,10 @@ void foo_library::counter_example(const std::string &name)
 
 void foo_library::observable_counter_example(const std::string &name)
 {
-  std::string counter_name                    = name + "_observable_counter";
-  auto provider                               = metrics_api::Provider::GetMeterProvider();
-  nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
-  double_observable_counter                   = meter->CreateDoubleObservableCounter(counter_name);
+  std::string counter_name = name + "_observable_counter";
+  auto provider            = metrics_api::Provider::GetMeterProvider();
+  opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
+  double_observable_counter = meter->CreateDoubleObservableCounter(counter_name);
   double_observable_counter->AddCallback(MeasurementFetcher::Fetcher, nullptr);
   for (uint32_t i = 0; i < 20; ++i)
   {
@@ -91,9 +93,9 @@ void foo_library::observable_counter_example(const std::string &name)
 
 void foo_library::histogram_example(const std::string &name)
 {
-  std::string histogram_name                  = name + "_histogram";
-  auto provider                               = metrics_api::Provider::GetMeterProvider();
-  nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
+  std::string histogram_name = name + "_histogram";
+  auto provider              = metrics_api::Provider::GetMeterProvider();
+  opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
   auto histogram_counter = meter->CreateDoubleHistogram(histogram_name, "des", "unit");
   auto context           = opentelemetry::context::Context{};
   for (uint32_t i = 0; i < 20; ++i)
diff --git a/examples/multithreaded/main.cc b/examples/multithreaded/main.cc
index 9dd76647c5..d92a4ab2ac 100644
--- a/examples/multithreaded/main.cc
+++ b/examples/multithreaded/main.cc
@@ -2,14 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <algorithm>
-#include <memory>
 #include <string>
 #include <thread>
 #include <utility>
 #include <vector>
 
 #include "opentelemetry/exporters/ostream/span_exporter_factory.h"
-#include "opentelemetry/nostd/detail/decay.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/sdk/trace/processor.h"
@@ -25,7 +23,6 @@
 
 namespace trace_api = opentelemetry::trace;
 namespace trace_sdk = opentelemetry::sdk::trace;
-namespace nostd     = opentelemetry::nostd;
 
 namespace
 {
@@ -46,7 +43,7 @@ void CleanupTracer()
   trace_api::Provider::SetTracerProvider(none);
 }
 
-nostd::shared_ptr<trace_api::Tracer> get_tracer()
+opentelemetry::nostd::shared_ptr<trace_api::Tracer> get_tracer()
 {
   auto provider = trace_api::Provider::GetTracerProvider();
   return provider->GetTracer("foo_library");
diff --git a/examples/otlp/file_log_main.cc b/examples/otlp/file_log_main.cc
index 9254c9947f..30eb71cc2b 100644
--- a/examples/otlp/file_log_main.cc
+++ b/examples/otlp/file_log_main.cc
@@ -1,27 +1,32 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <functional>
+#include <iostream>
+#include <string>
+#include <utility>
+
 #include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
 #include "opentelemetry/exporters/otlp/otlp_file_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
+#include "opentelemetry/logs/log_record.h"
+#include "opentelemetry/logs/logger_provider.h"
 #include "opentelemetry/logs/provider.h"
-#include "opentelemetry/sdk/logs/exporter.h"
+#include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/sdk/logs/logger_provider.h"
 #include "opentelemetry/sdk/logs/logger_provider_factory.h"
-#include "opentelemetry/sdk/logs/processor.h"
+#include "opentelemetry/sdk/logs/recordable.h"
 #include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
-#include "opentelemetry/sdk/trace/exporter.h"
 #include "opentelemetry/sdk/trace/processor.h"
+#include "opentelemetry/sdk/trace/recordable.h"
 #include "opentelemetry/sdk/trace/simple_processor_factory.h"
 #include "opentelemetry/sdk/trace/tracer_provider.h"
 #include "opentelemetry/sdk/trace/tracer_provider_factory.h"
 #include "opentelemetry/trace/provider.h"
-
-#include <iostream>
-#include <string>
-#include <utility>
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 #ifdef BAZEL_BUILD
 #  include "examples/common/logs_foo_library/foo_library.h"
diff --git a/examples/otlp/file_main.cc b/examples/otlp/file_main.cc
index 13db0e4ad1..243ad44428 100644
--- a/examples/otlp/file_main.cc
+++ b/examples/otlp/file_main.cc
@@ -1,16 +1,21 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
 #include "opentelemetry/exporters/otlp/otlp_file_exporter_factory.h"
+#include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
 #include "opentelemetry/sdk/trace/processor.h"
+#include "opentelemetry/sdk/trace/recordable.h"
 #include "opentelemetry/sdk/trace/simple_processor_factory.h"
 #include "opentelemetry/sdk/trace/tracer_provider.h"
 #include "opentelemetry/sdk/trace/tracer_provider_factory.h"
 #include "opentelemetry/trace/provider.h"
-
-#include <iostream>
-#include <string>
-#include <utility>
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 #ifdef BAZEL_BUILD
 #  include "examples/common/foo_library/foo_library.h"
diff --git a/examples/otlp/file_metric_main.cc b/examples/otlp/file_metric_main.cc
index b99d77a609..ce259005be 100644
--- a/examples/otlp/file_metric_main.cc
+++ b/examples/otlp/file_metric_main.cc
@@ -1,21 +1,26 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <chrono>
+#include <memory>
+#include <string>
+#include <thread>
+#include <utility>
+
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
 #include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h"
+#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h"
+#include "opentelemetry/metrics/meter_provider.h"
 #include "opentelemetry/metrics/provider.h"
-#include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
-#include "opentelemetry/sdk/metrics/meter.h"
+#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
+#include "opentelemetry/sdk/metrics/meter_context.h"
 #include "opentelemetry/sdk/metrics/meter_context_factory.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "opentelemetry/sdk/metrics/meter_provider_factory.h"
-
-#include <iostream>
-#include <memory>
-#include <string>
-#include <thread>
-#include <utility>
+#include "opentelemetry/sdk/metrics/metric_reader.h"
+#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+#include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h"
 
 #ifdef BAZEL_BUILD
 #  include "examples/common/metrics_foo_library/foo_library.h"
diff --git a/examples/otlp/http_log_main.cc b/examples/otlp/http_log_main.cc
index e2b219de1c..38aa009d04 100644
--- a/examples/otlp/http_log_main.cc
+++ b/examples/otlp/http_log_main.cc
@@ -1,23 +1,33 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <iostream>
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "opentelemetry/exporters/otlp/otlp_environment.h"
+#include "opentelemetry/exporters/otlp/otlp_http.h"
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
+#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
+#include "opentelemetry/logs/log_record.h"
+#include "opentelemetry/logs/logger_provider.h"
 #include "opentelemetry/logs/provider.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/logs/logger_provider.h"
 #include "opentelemetry/sdk/logs/logger_provider_factory.h"
-#include "opentelemetry/sdk/logs/processor.h"
+#include "opentelemetry/sdk/logs/recordable.h"
 #include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
 #include "opentelemetry/sdk/trace/processor.h"
+#include "opentelemetry/sdk/trace/recordable.h"
 #include "opentelemetry/sdk/trace/simple_processor_factory.h"
 #include "opentelemetry/sdk/trace/tracer_provider.h"
 #include "opentelemetry/sdk/trace/tracer_provider_factory.h"
 #include "opentelemetry/trace/provider.h"
-
-#include <iostream>
-#include <string>
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 #ifdef BAZEL_BUILD
 #  include "examples/common/logs_foo_library/foo_library.h"
diff --git a/examples/otlp/http_main.cc b/examples/otlp/http_main.cc
index 9ad476bd47..6217bdcb34 100644
--- a/examples/otlp/http_main.cc
+++ b/examples/otlp/http_main.cc
@@ -1,16 +1,23 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "opentelemetry/exporters/otlp/otlp_environment.h"
+#include "opentelemetry/exporters/otlp/otlp_http.h"
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/trace/processor.h"
+#include "opentelemetry/sdk/trace/recordable.h"
 #include "opentelemetry/sdk/trace/simple_processor_factory.h"
 #include "opentelemetry/sdk/trace/tracer_provider.h"
 #include "opentelemetry/sdk/trace/tracer_provider_factory.h"
 #include "opentelemetry/trace/provider.h"
-
-#include <string>
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 #ifdef BAZEL_BUILD
 #  include "examples/common/foo_library/foo_library.h"
diff --git a/examples/otlp/http_metric_main.cc b/examples/otlp/http_metric_main.cc
index f33d57772f..53f5fe38bc 100644
--- a/examples/otlp/http_metric_main.cc
+++ b/examples/otlp/http_metric_main.cc
@@ -1,20 +1,28 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <chrono>
+#include <memory>
+#include <string>
+#include <thread>
+#include <utility>
+
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/exporters/otlp/otlp_environment.h"
+#include "opentelemetry/exporters/otlp/otlp_http.h"
 #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
+#include "opentelemetry/metrics/meter_provider.h"
 #include "opentelemetry/metrics/provider.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
-#include "opentelemetry/sdk/metrics/meter.h"
+#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
+#include "opentelemetry/sdk/metrics/meter_context.h"
 #include "opentelemetry/sdk/metrics/meter_context_factory.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "opentelemetry/sdk/metrics/meter_provider_factory.h"
-
-#include <memory>
-#include <thread>
+#include "opentelemetry/sdk/metrics/metric_reader.h"
+#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+#include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h"
 
 #ifdef BAZEL_BUILD
 #  include "examples/common/metrics_foo_library/foo_library.h"
diff --git a/examples/plugin/load/main.cc b/examples/plugin/load/main.cc
index 589f70c2af..81d5221372 100644
--- a/examples/plugin/load/main.cc
+++ b/examples/plugin/load/main.cc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <cstdio>
-#include <fstream>
+#include <fstream>  // IWYU pragma: keep
 #include <iostream>
 #include <iterator>
 #include <memory>
diff --git a/examples/plugin/plugin/factory_impl.cc b/examples/plugin/plugin/factory_impl.cc
index 4d74bd6062..6eaa4aa4f1 100644
--- a/examples/plugin/plugin/factory_impl.cc
+++ b/examples/plugin/plugin/factory_impl.cc
@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include <memory>
 #include <new>
 #include <utility>
 
diff --git a/examples/plugin/plugin/tracer.cc b/examples/plugin/plugin/tracer.cc
index faf3f036e5..5361197584 100644
--- a/examples/plugin/plugin/tracer.cc
+++ b/examples/plugin/plugin/tracer.cc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <iostream>
-#include <memory>
 #include <new>
 #include <string>
 #include <utility>
@@ -10,7 +9,6 @@
 #include "opentelemetry/common/attribute_value.h"
 #include "opentelemetry/common/timestamp.h"
 #include "opentelemetry/context/context_value.h"
-#include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/trace/span_context.h"
 #include "opentelemetry/trace/span_metadata.h"
 #include "tracer.h"
diff --git a/examples/plugin/plugin/tracer.h b/examples/plugin/plugin/tracer.h
index bb933d3d9b..92012fa4a5 100644
--- a/examples/plugin/plugin/tracer.h
+++ b/examples/plugin/plugin/tracer.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <stdint.h>
-#include <memory>
 
 #include "opentelemetry/common/key_value_iterable.h"
 #include "opentelemetry/nostd/shared_ptr.h"
diff --git a/examples/zipkin/main.cc b/examples/zipkin/main.cc
index 0052cd430e..ac9e454580 100644
--- a/examples/zipkin/main.cc
+++ b/examples/zipkin/main.cc
@@ -1,12 +1,21 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include "opentelemetry/exporters/zipkin/zipkin_exporter_factory.h"
+#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
 #include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/sdk/trace/processor.h"
+#include "opentelemetry/sdk/trace/recordable.h"
 #include "opentelemetry/sdk/trace/simple_processor_factory.h"
+#include "opentelemetry/sdk/trace/tracer_provider.h"
 #include "opentelemetry/sdk/trace/tracer_provider_factory.h"
 #include "opentelemetry/trace/provider.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 #ifdef BAZEL_BUILD
 #  include "examples/common/foo_library/foo_library.h"
diff --git a/exporters/ostream/src/span_exporter.cc b/exporters/ostream/src/span_exporter.cc
index d3f5093b40..9437ae561a 100644
--- a/exporters/ostream/src/span_exporter.cc
+++ b/exporters/ostream/src/span_exporter.cc
@@ -5,7 +5,6 @@
 #include <chrono>
 #include <iostream>
 #include <map>
-#include <memory>
 #include <string>
 #include <unordered_map>
 #include <utility>
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_environment.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_environment.h
index 8b486a548f..74a222a9d0 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_environment.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_environment.h
@@ -3,18 +3,14 @@
 
 #pragma once
 
-#include "opentelemetry/common/kv_properties.h"
-#include "opentelemetry/nostd/string_view.h"
-
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/env_variables.h"
-#include "opentelemetry/sdk/version/version.h"
-
+#include <ctype.h>
 #include <algorithm>
 #include <chrono>
 #include <map>
 #include <string>
-#include <unordered_set>
+
+#include "opentelemetry/sdk/version/version.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client.h
index bedbe77e52..e377b140b6 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client.h
@@ -3,12 +3,13 @@
 
 #pragma once
 
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
+#include <chrono>
+#include <cstddef>
 
 #include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-
-#include <chrono>
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/version.h"
 
 // forward declare google::protobuf::Message
 namespace google
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter.h
index b5b87f9f88..b49dcef77f 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter.h
@@ -3,15 +3,16 @@
 
 #pragma once
 
-// We need include exporter.h first, which will include Windows.h with NOMINMAX on Windows
-#include "opentelemetry/sdk/trace/exporter.h"
+#include <chrono>
+#include <memory>
 
 #include "opentelemetry/exporters/otlp/otlp_file_client.h"
-
 #include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
-
-#include <chrono>
-#include <memory>
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/trace/exporter.h"
+#include "opentelemetry/sdk/trace/recordable.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_factory.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_factory.h
index dc68609729..bf4ba3288f 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_factory.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_factory.h
@@ -7,6 +7,7 @@
 
 #include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
 #include "opentelemetry/sdk/trace/exporter.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter.h
index 79d816ae53..6fb9f6d844 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter.h
@@ -3,16 +3,16 @@
 
 #pragma once
 
-#include "opentelemetry/sdk/logs/exporter.h"
+#include <chrono>
+#include <memory>
 
 #include "opentelemetry/exporters/otlp/otlp_file_client.h"
-
 #include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
-
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <string>
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/logs/exporter.h"
+#include "opentelemetry/sdk/logs/recordable.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h
index 0e6c0143b9..663eeb189a 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h
@@ -7,6 +7,7 @@
 
 #include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
 #include "opentelemetry/sdk/logs/exporter.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter.h
index 165c7de99a..e03e544de9 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter.h
@@ -3,16 +3,16 @@
 
 #pragma once
 
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+#include <chrono>
+#include <memory>
 
 #include "opentelemetry/exporters/otlp/otlp_file_client.h"
-
 #include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h"
-
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <string>
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/metrics/export/metric_producer.h"
+#include "opentelemetry/sdk/metrics/instruments.h"
+#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h
index 483e4aa5aa..a34c057fad 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h
@@ -7,6 +7,7 @@
 
 #include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h"
 #include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http.h
index 7d1e7bac55..6899c6f544 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http.h
@@ -3,9 +3,8 @@
 
 #pragma once
 
-#include "opentelemetry/common/macros.h"
 #include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/version/version.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_client.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_client.h
index 9d79b5d99b..6806f1cdf9 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_client.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_client.h
@@ -3,14 +3,6 @@
 
 #pragma once
 
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-
-#include <atomic>
 #include <chrono>
 #include <condition_variable>
 #include <cstddef>
@@ -21,6 +13,14 @@
 #include <string>
 #include <unordered_map>
 
+#include "opentelemetry/exporters/otlp/otlp_environment.h"
+#include "opentelemetry/exporters/otlp/otlp_http.h"
+#include "opentelemetry/ext/http/client/http_client.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/variant.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/version.h"
+
 // forward declare google::protobuf::Message
 namespace google
 {
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h
index b5faf1a9b8..38f1d9e306 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h
@@ -3,19 +3,16 @@
 
 #pragma once
 
-// We need include exporter.h first, which will include Windows.h with NOMINMAX on Windows
-#include "opentelemetry/sdk/trace/exporter.h"
+#include <chrono>
+#include <memory>
 
 #include "opentelemetry/exporters/otlp/otlp_http_client.h"
-
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
-
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <string>
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/trace/exporter.h"
+#include "opentelemetry/sdk/trace/recordable.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_factory.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_factory.h
index 5316528365..9e072a0534 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_factory.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_factory.h
@@ -7,6 +7,7 @@
 
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
 #include "opentelemetry/sdk/trace/exporter.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h
index 1be4bd8d95..7f6d5a1b35 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h
@@ -3,15 +3,13 @@
 
 #pragma once
 
+#include <chrono>
+#include <string>
+
 #include "opentelemetry/exporters/otlp/otlp_environment.h"
 #include "opentelemetry/exporters/otlp/otlp_http.h"
 #include "opentelemetry/version.h"
 
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <string>
-
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h
index f481fdab0b..9439e5725b 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h
@@ -3,17 +3,16 @@
 
 #pragma once
 
-#include "opentelemetry/sdk/logs/exporter.h"
+#include <chrono>
+#include <memory>
 
 #include "opentelemetry/exporters/otlp/otlp_http_client.h"
-
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
 #include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
-
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <string>
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/logs/exporter.h"
+#include "opentelemetry/sdk/logs/recordable.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h
index f4c90d5b0c..c1e9de9ae1 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h
@@ -3,10 +3,11 @@
 
 #pragma once
 
+#include <memory>
+
 #include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
 #include "opentelemetry/sdk/logs/exporter.h"
-
-#include <memory>
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h
index 7d60a28cf0..60f674a3a7 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h
@@ -3,15 +3,13 @@
 
 #pragma once
 
+#include <chrono>
+#include <string>
+
 #include "opentelemetry/exporters/otlp/otlp_environment.h"
 #include "opentelemetry/exporters/otlp/otlp_http.h"
 #include "opentelemetry/version.h"
 
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <string>
-
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter.h
index 0aebf79760..d74177e5c9 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter.h
@@ -3,16 +3,16 @@
 
 #pragma once
 
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+#include <chrono>
+#include <memory>
 
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
 #include "opentelemetry/exporters/otlp/otlp_http_client.h"
 #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
-
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <string>
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/metrics/export/metric_producer.h"
+#include "opentelemetry/sdk/metrics/instruments.h"
+#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h
index 7fa7980470..a290d91fd0 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h
@@ -3,10 +3,11 @@
 
 #pragma once
 
+#include <memory>
+
 #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
 #include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-
-#include <memory>
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h
index d5cf3072f8..82c91aa51f 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h
@@ -3,16 +3,14 @@
 
 #pragma once
 
+#include <chrono>
+#include <string>
+
 #include "opentelemetry/exporters/otlp/otlp_environment.h"
 #include "opentelemetry/exporters/otlp/otlp_http.h"
 #include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
 #include "opentelemetry/version.h"
 
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <string>
-
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h
index c6e11aeff3..4f92b8e665 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h
@@ -3,16 +3,34 @@
 
 #pragma once
 
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
+#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
+#include "opentelemetry/sdk/metrics/data/metric_data.h"
+#include "opentelemetry/sdk/metrics/export/metric_producer.h"
+#include "opentelemetry/sdk/metrics/instruments.h"
+#include "opentelemetry/version.h"
 
-#include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
 #include "opentelemetry/proto/metrics/v1/metrics.pb.h"
-#include "opentelemetry/proto/resource/v1/resource.pb.h"
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
+// clang-format on
 
-#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
+namespace opentelemetry
+{
+namespace proto
+{
+namespace collector
+{
+namespace metrics
+{
+namespace v1
+{
+class ExportMetricsServiceRequest;
+}
+}  // namespace metrics
+}  // namespace collector
+}  // namespace proto
+}  // namespace opentelemetry
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h
index dc43827641..499aa3685f 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h
@@ -3,18 +3,37 @@
 
 #pragma once
 
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-#include "opentelemetry/proto/resource/v1/resource.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-// clang-format on
-
 #include "opentelemetry/common/attribute_value.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/sdk/common/attribute_utils.h"
 #include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/version.h"
 
+namespace opentelemetry
+{
+namespace proto
+{
+
+namespace common
+{
+namespace v1
+{
+class AnyValue;
+class KeyValue;
+}  // namespace v1
+}  // namespace common
+
+namespace resource
+{
+namespace v1
+{
+class Resource;
+}
+}  // namespace resource
+
+}  // namespace proto
+}  // namespace opentelemetry
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h
index 88e7cd91cf..103357d11f 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h
@@ -3,14 +3,28 @@
 
 #pragma once
 
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
+#include <chrono>
+#include <string>
 
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
+#include "opentelemetry/proto/common/v1/common.pb.h"
 #include "opentelemetry/proto/resource/v1/resource.pb.h"
 #include "opentelemetry/proto/trace/v1/trace.pb.h"
-
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
+// clang-format on
+
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/common/key_value_iterable.h"
+#include "opentelemetry/common/timestamp.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
+#include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/sdk/trace/recordable.h"
+#include "opentelemetry/trace/span_context.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/span_metadata.h"
+#include "opentelemetry/trace/trace_flags.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable_utils.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable_utils.h
index 74a4cd9aeb..0651abc2b9 100644
--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable_utils.h
+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable_utils.h
@@ -5,18 +5,36 @@
 
 #include <memory>
 
-#include "opentelemetry/nostd/unique_ptr.h"
-
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-
-#include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
-#include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/sdk/logs/recordable.h"
+#include "opentelemetry/sdk/trace/recordable.h"
+#include "opentelemetry/version.h"
 
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
+namespace opentelemetry
+{
+namespace proto
+{
+namespace collector
+{
 
-#include "opentelemetry/sdk/trace/recordable.h"
+namespace logs
+{
+namespace v1
+{
+class ExportLogsServiceRequest;
+}
+}  // namespace logs
+namespace trace
+{
+namespace v1
+{
+class ExportTraceServiceRequest;
+}
+}  // namespace trace
 
-#include "opentelemetry/sdk/logs/recordable.h"
+}  // namespace collector
+}  // namespace proto
+}  // namespace opentelemetry
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/src/otlp_environment.cc b/exporters/otlp/src/otlp_environment.cc
index a7af30bb73..276d9fc709 100644
--- a/exporters/otlp/src/otlp_environment.cc
+++ b/exporters/otlp/src/otlp_environment.cc
@@ -1,15 +1,20 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <chrono>
+#include <map>
+#include <string>
+#include <type_traits>
+#include <unordered_set>
+#include <utility>
+
+#include "opentelemetry/common/kv_properties.h"
 #include "opentelemetry/exporters/otlp/otlp_environment.h"
-
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/sdk/common/attribute_utils.h"
 #include "opentelemetry/sdk/common/env_variables.h"
-#include "opentelemetry/sdk/version/version.h"
-
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk_config.h"
+#include "opentelemetry/version.h"
 
-namespace nostd      = opentelemetry::nostd;
 namespace sdk_common = opentelemetry::sdk::common;
 
 /*
diff --git a/exporters/otlp/src/otlp_file_client.cc b/exporters/otlp/src/otlp_file_client.cc
index 9678b22476..bd36a602c4 100644
--- a/exporters/otlp/src/otlp_file_client.cc
+++ b/exporters/otlp/src/otlp_file_client.cc
@@ -10,7 +10,7 @@
 #endif
 
 // clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
 // clang-format on
 
 #include "google/protobuf/message.h"
@@ -19,15 +19,14 @@
 #include "nlohmann/json.hpp"
 
 // clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
 // clang-format on
 
-#include "opentelemetry/common/macros.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/sdk/common/base64.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk_config.h"
+#include "opentelemetry/version.h"
 
 #include <atomic>
 #include <condition_variable>
diff --git a/exporters/otlp/src/otlp_file_exporter.cc b/exporters/otlp/src/otlp_file_exporter.cc
index 816151719a..b98a6b2007 100644
--- a/exporters/otlp/src/otlp_file_exporter.cc
+++ b/exporters/otlp/src/otlp_file_exporter.cc
@@ -1,19 +1,30 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/exporters/otlp/otlp_file_exporter.h"
+#include <chrono>
+#include <cstddef>
+#include <memory>
+#include <new>
+#include <ostream>
+
 #include "opentelemetry/exporters/otlp/otlp_file_client.h"
+#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
+#include "opentelemetry/exporters/otlp/otlp_file_exporter.h"
+#include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_recordable.h"
 #include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/sdk/trace/recordable.h"
+#include "opentelemetry/version.h"
 
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
 #include "google/protobuf/arena.h"
 #include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
-
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-
-#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
+// clang-format on
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/src/otlp_file_log_record_exporter.cc b/exporters/otlp/src/otlp_file_log_record_exporter.cc
index 49cbfd3ab2..7df1c70b29 100644
--- a/exporters/otlp/src/otlp_file_log_record_exporter.cc
+++ b/exporters/otlp/src/otlp_file_log_record_exporter.cc
@@ -1,18 +1,30 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <chrono>
+#include <cstddef>
+#include <memory>
+#include <new>
+#include <ostream>
+
+#include "opentelemetry/exporters/otlp/otlp_file_client.h"
+#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
 #include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter.h"
+#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_log_recordable.h"
 #include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/sdk/logs/recordable.h"
+#include "opentelemetry/version.h"
 
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
 #include "google/protobuf/arena.h"
 #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
-
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-
-#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
+// clang-format on
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/src/otlp_file_metric_exporter.cc b/exporters/otlp/src/otlp_file_metric_exporter.cc
index 2c414c31b4..78aea66956 100644
--- a/exporters/otlp/src/otlp_file_metric_exporter.cc
+++ b/exporters/otlp/src/otlp_file_metric_exporter.cc
@@ -1,17 +1,30 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <chrono>
+#include <cstddef>
+#include <memory>
+#include <new>
+#include <ostream>
+#include <vector>
+
+#include "opentelemetry/exporters/otlp/otlp_file_client.h"
+#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
 #include "opentelemetry/exporters/otlp/otlp_file_metric_exporter.h"
+#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/sdk/metrics/export/metric_producer.h"
+#include "opentelemetry/sdk/metrics/instruments.h"
+#include "opentelemetry/version.h"
 
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
 #include "google/protobuf/arena.h"
 #include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
-
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-
-#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
+// clang-format on
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/src/otlp_http_client.cc b/exporters/otlp/src/otlp_http_client.cc
index 8bada1e0e0..03eb5fb434 100644
--- a/exporters/otlp/src/otlp_http_client.cc
+++ b/exporters/otlp/src/otlp_http_client.cc
@@ -1,7 +1,22 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/exporters/otlp/otlp_http_client.h"
+#include <algorithm>
+#include <atomic>
+#include <chrono>
+#include <condition_variable>
+#include <cstddef>
+#include <functional>
+#include <iostream>
+#include <list>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <ratio>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 #if defined(HAVE_GSL)
 #  include <gsl/gsl>
@@ -9,42 +24,33 @@
 #  include <assert.h>
 #endif
 
-#include "opentelemetry/ext/http/client/http_client_factory.h"
-#include "opentelemetry/ext/http/common/url_parser.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-// clang-format on
-
-#include "google/protobuf/message.h"
-#include "google/protobuf/reflection.h"
-#include "google/protobuf/stubs/common.h"
 #include "nlohmann/json.hpp"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-// clang-format on
-
 #include "opentelemetry/common/timestamp.h"
+#include "opentelemetry/exporters/otlp/otlp_environment.h"
+#include "opentelemetry/exporters/otlp/otlp_http.h"
+#include "opentelemetry/exporters/otlp/otlp_http_client.h"
+#include "opentelemetry/ext/http/client/http_client.h"
+#include "opentelemetry/ext/http/client/http_client_factory.h"
+#include "opentelemetry/ext/http/common/url_parser.h"
 #include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/sdk/common/base64.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk_config.h"
+#include "opentelemetry/version.h"
 
-#include <atomic>
-#include <condition_variable>
-#include <cstring>
-#include <fstream>
-#include <mutex>
-#include <sstream>
-#include <string>
-#include <vector>
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
+#include <google/protobuf/message.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/stubs/port.h>
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
+// clang-format on
 
 #ifdef GetMessage
 #  undef GetMessage
 #endif
 
-namespace nostd       = opentelemetry::nostd;
 namespace http_client = opentelemetry::ext::http::client;
 
 OPENTELEMETRY_BEGIN_NAMESPACE
diff --git a/exporters/otlp/src/otlp_http_exporter.cc b/exporters/otlp/src/otlp_http_exporter.cc
index aa00c3f79a..f740a0babf 100644
--- a/exporters/otlp/src/otlp_http_exporter.cc
+++ b/exporters/otlp/src/otlp_http_exporter.cc
@@ -1,20 +1,33 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <chrono>
+#include <cstddef>
+#include <memory>
+#include <new>
+#include <ostream>
+#include <string>
+#include <utility>
+
+#include "opentelemetry/exporters/otlp/otlp_environment.h"
+#include "opentelemetry/exporters/otlp/otlp_http_client.h"
 #include "opentelemetry/exporters/otlp/otlp_http_exporter.h"
+#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_recordable.h"
 #include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/sdk/trace/recordable.h"
+#include "opentelemetry/version.h"
 
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
 #include "google/protobuf/arena.h"
 #include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
-
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-
-#include "opentelemetry/sdk/common/global_log_handler.h"
-
-namespace nostd = opentelemetry::nostd;
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
+// clang-format on
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
@@ -78,7 +91,8 @@ std::unique_ptr<opentelemetry::sdk::trace::Recordable> OtlpHttpExporter::MakeRec
 }
 
 opentelemetry::sdk::common::ExportResult OtlpHttpExporter::Export(
-    const nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans) noexcept
+    const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>>
+        &spans) noexcept
 {
   if (http_client_->IsShutdown())
   {
diff --git a/exporters/otlp/src/otlp_http_exporter_options.cc b/exporters/otlp/src/otlp_http_exporter_options.cc
index d88b8d2e3d..753efcb481 100644
--- a/exporters/otlp/src/otlp_http_exporter_options.cc
+++ b/exporters/otlp/src/otlp_http_exporter_options.cc
@@ -1,13 +1,14 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
-
 #include <chrono>
-#include <cstddef>
-#include <memory>
 #include <string>
 
+#include "opentelemetry/exporters/otlp/otlp_environment.h"
+#include "opentelemetry/exporters/otlp/otlp_http.h"
+#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
+#include "opentelemetry/version.h"
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {
diff --git a/exporters/otlp/src/otlp_http_log_record_exporter.cc b/exporters/otlp/src/otlp_http_log_record_exporter.cc
index 0d08c66a79..bd76bd10bd 100644
--- a/exporters/otlp/src/otlp_http_log_record_exporter.cc
+++ b/exporters/otlp/src/otlp_http_log_record_exporter.cc
@@ -1,20 +1,33 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <chrono>
+#include <cstddef>
+#include <memory>
+#include <new>
+#include <ostream>
+#include <string>
+#include <utility>
+
+#include "opentelemetry/exporters/otlp/otlp_environment.h"
+#include "opentelemetry/exporters/otlp/otlp_http_client.h"
 #include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h"
+#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_log_recordable.h"
 #include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/sdk/logs/recordable.h"
+#include "opentelemetry/version.h"
 
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
 #include "google/protobuf/arena.h"
 #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
-
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-
-#include "opentelemetry/sdk/common/global_log_handler.h"
-
-namespace nostd = opentelemetry::nostd;
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
+// clang-format on
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
@@ -82,7 +95,8 @@ OtlpHttpLogRecordExporter::MakeRecordable() noexcept
 }
 
 opentelemetry::sdk::common::ExportResult OtlpHttpLogRecordExporter::Export(
-    const nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &logs) noexcept
+    const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>>
+        &logs) noexcept
 {
   if (http_client_->IsShutdown())
   {
diff --git a/exporters/otlp/src/otlp_http_log_record_exporter_options.cc b/exporters/otlp/src/otlp_http_log_record_exporter_options.cc
index cf2227a8d5..08a04cfa80 100644
--- a/exporters/otlp/src/otlp_http_log_record_exporter_options.cc
+++ b/exporters/otlp/src/otlp_http_log_record_exporter_options.cc
@@ -1,13 +1,14 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
-
 #include <chrono>
-#include <cstddef>
-#include <memory>
 #include <string>
 
+#include "opentelemetry/exporters/otlp/otlp_environment.h"
+#include "opentelemetry/exporters/otlp/otlp_http.h"
+#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
+#include "opentelemetry/version.h"
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {
diff --git a/exporters/otlp/src/otlp_http_metric_exporter.cc b/exporters/otlp/src/otlp_http_metric_exporter.cc
index 1782bb6acb..18b4ed0712 100644
--- a/exporters/otlp/src/otlp_http_metric_exporter.cc
+++ b/exporters/otlp/src/otlp_http_metric_exporter.cc
@@ -1,19 +1,33 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <chrono>
+#include <cstddef>
+#include <memory>
+#include <new>
+#include <ostream>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "opentelemetry/exporters/otlp/otlp_environment.h"
+#include "opentelemetry/exporters/otlp/otlp_http_client.h"
 #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter.h"
+#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/sdk/metrics/export/metric_producer.h"
+#include "opentelemetry/sdk/metrics/instruments.h"
+#include "opentelemetry/version.h"
 
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
 #include "google/protobuf/arena.h"
 #include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
-
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-
-#include "opentelemetry/sdk/common/global_log_handler.h"
-
-namespace nostd = opentelemetry::nostd;
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
+// clang-format on
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/otlp/src/otlp_http_metric_exporter_options.cc b/exporters/otlp/src/otlp_http_metric_exporter_options.cc
index 7e2c145639..66d65fa54b 100644
--- a/exporters/otlp/src/otlp_http_metric_exporter_options.cc
+++ b/exporters/otlp/src/otlp_http_metric_exporter_options.cc
@@ -1,13 +1,15 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
-
 #include <chrono>
-#include <cstddef>
-#include <memory>
 #include <string>
 
+#include "opentelemetry/exporters/otlp/otlp_environment.h"
+#include "opentelemetry/exporters/otlp/otlp_http.h"
+#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
+#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
+#include "opentelemetry/version.h"
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {
diff --git a/exporters/otlp/src/otlp_log_recordable.cc b/exporters/otlp/src/otlp_log_recordable.cc
index 8acb4073d2..03c89626f2 100644
--- a/exporters/otlp/src/otlp_log_recordable.cc
+++ b/exporters/otlp/src/otlp_log_recordable.cc
@@ -1,14 +1,23 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/common/macros.h"
+#include <chrono>
 
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/common/timestamp.h"
 #include "opentelemetry/exporters/otlp/otlp_log_recordable.h"
 #include "opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
+#include "opentelemetry/logs/severity.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/proto/logs/v1/logs.pb.h"
+#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
 #include "opentelemetry/sdk/logs/readable_log_record.h"
-
-namespace nostd = opentelemetry::nostd;
+#include "opentelemetry/sdk/resource/resource.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/trace_flags.h"
+#include "opentelemetry/trace/trace_id.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
@@ -216,7 +225,7 @@ void OtlpLogRecordable::SetTraceFlags(const opentelemetry::trace::TraceFlags &tr
   proto_record_.set_flags(trace_flags.flags());
 }
 
-void OtlpLogRecordable::SetAttribute(nostd::string_view key,
+void OtlpLogRecordable::SetAttribute(opentelemetry::nostd::string_view key,
                                      const opentelemetry::common::AttributeValue &value) noexcept
 {
   OtlpPopulateAttributeUtils::PopulateAttribute(proto_record_.add_attributes(), key, value);
diff --git a/exporters/otlp/src/otlp_metric_utils.cc b/exporters/otlp/src/otlp_metric_utils.cc
index e75b17ddd7..da162d117e 100644
--- a/exporters/otlp/src/otlp_metric_utils.cc
+++ b/exporters/otlp/src/otlp_metric_utils.cc
@@ -1,9 +1,32 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <stdint.h>
+#include <chrono>
+#include <map>
+#include <utility>
+#include <vector>
+
+#include "opentelemetry/common/timestamp.h"
 #include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
 #include "opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h"
+#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
+#include "opentelemetry/nostd/variant.h"
+#include "opentelemetry/sdk/common/attribute_utils.h"
 #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
+#include "opentelemetry/sdk/metrics/data/metric_data.h"
+#include "opentelemetry/sdk/metrics/data/point_data.h"
+#include "opentelemetry/sdk/metrics/export/metric_producer.h"
+#include "opentelemetry/sdk/metrics/instruments.h"
+#include "opentelemetry/version.h"
+
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
+#include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
+#include "opentelemetry/proto/common/v1/common.pb.h"
+#include "opentelemetry/proto/metrics/v1/metrics.pb.h"
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
+// clang-format on
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 
diff --git a/exporters/otlp/src/otlp_populate_attribute_utils.cc b/exporters/otlp/src/otlp_populate_attribute_utils.cc
index 69a284835a..a2ef2edafa 100644
--- a/exporters/otlp/src/otlp_populate_attribute_utils.cc
+++ b/exporters/otlp/src/otlp_populate_attribute_utils.cc
@@ -1,7 +1,29 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <stdint.h>
+#include <string>
+#include <type_traits>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "opentelemetry/common/attribute_value.h"
 #include "opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/utility.h"
+#include "opentelemetry/nostd/variant.h"
+#include "opentelemetry/sdk/common/attribute_utils.h"
+#include "opentelemetry/sdk/resource/resource.h"
+#include "opentelemetry/version.h"
+
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
+#include "opentelemetry/proto/common/v1/common.pb.h"
+#include "opentelemetry/proto/resource/v1/resource.pb.h"
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
+// clang-format on
 
 namespace nostd = opentelemetry::nostd;
 
diff --git a/exporters/otlp/src/otlp_recordable.cc b/exporters/otlp/src/otlp_recordable.cc
index f9cee24677..356472fb48 100644
--- a/exporters/otlp/src/otlp_recordable.cc
+++ b/exporters/otlp/src/otlp_recordable.cc
@@ -1,10 +1,36 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/exporters/otlp/otlp_recordable.h"
+#include <stdint.h>
+#include <chrono>
+#include <string>
 
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/common/key_value_iterable.h"
+#include "opentelemetry/common/timestamp.h"
 #include "opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
+#include "opentelemetry/exporters/otlp/otlp_recordable.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/utility.h"
+#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
+#include "opentelemetry/sdk/resource/resource.h"
+#include "opentelemetry/trace/span_context.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/span_metadata.h"
+#include "opentelemetry/trace/trace_flags.h"
+#include "opentelemetry/trace/trace_id.h"
+#include "opentelemetry/trace/trace_state.h"
+#include "opentelemetry/version.h"
+
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
+#include "opentelemetry/proto/common/v1/common.pb.h"
+#include "opentelemetry/proto/resource/v1/resource.pb.h"
+#include "opentelemetry/proto/trace/v1/trace.pb.h"
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
+// clang-format on
 
 namespace nostd = opentelemetry::nostd;
 
diff --git a/exporters/otlp/src/otlp_recordable_utils.cc b/exporters/otlp/src/otlp_recordable_utils.cc
index 59e4aadf4e..df29cca838 100644
--- a/exporters/otlp/src/otlp_recordable_utils.cc
+++ b/exporters/otlp/src/otlp_recordable_utils.cc
@@ -1,23 +1,36 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
-
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-
-#include "opentelemetry/proto/logs/v1/logs.pb.h"
-#include "opentelemetry/proto/trace/v1/trace.pb.h"
-
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
+#include <algorithm>
+#include <cstddef>
+#include <list>
+#include <memory>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include "opentelemetry/exporters/otlp/otlp_log_recordable.h"
 #include "opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h"
 #include "opentelemetry/exporters/otlp/otlp_recordable.h"
-
-#include <list>
-#include <unordered_map>
-
-namespace nostd = opentelemetry::nostd;
+#include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/sdk/common/attribute_utils.h"
+#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
+#include "opentelemetry/sdk/logs/recordable.h"
+#include "opentelemetry/sdk/resource/resource.h"
+#include "opentelemetry/sdk/trace/recordable.h"
+#include "opentelemetry/version.h"
+
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"  // IWYU pragma: keep
+#include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
+#include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
+#include "opentelemetry/proto/common/v1/common.pb.h"
+#include "opentelemetry/proto/logs/v1/logs.pb.h"
+#include "opentelemetry/proto/resource/v1/resource.pb.h"
+#include "opentelemetry/proto/trace/v1/trace.pb.h"
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"  // IWYU pragma: keep
+// clang-format on
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
@@ -48,7 +61,7 @@ struct InstrumentationScopePointerEqual
 }  // namespace
 
 void OtlpRecordableUtils::PopulateRequest(
-    const nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans,
+    const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans,
     proto::collector::trace::v1::ExportTraceServiceRequest *request) noexcept
 {
   if (nullptr == request)
@@ -108,7 +121,7 @@ void OtlpRecordableUtils::PopulateRequest(
 }
 
 void OtlpRecordableUtils::PopulateRequest(
-    const nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &logs,
+    const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &logs,
     proto::collector::logs::v1::ExportLogsServiceRequest *request) noexcept
 {
   if (nullptr == request)
diff --git a/exporters/otlp/test/otlp_recordable_test.cc b/exporters/otlp/test/otlp_recordable_test.cc
index 9f3ba62b16..caa17c8a46 100644
--- a/exporters/otlp/test/otlp_recordable_test.cc
+++ b/exporters/otlp/test/otlp_recordable_test.cc
@@ -13,6 +13,12 @@
 
 #include <gtest/gtest.h>
 
+// clang-format off
+#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
+#include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
+#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
+// clang-format on
+
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
 {
diff --git a/exporters/zipkin/include/opentelemetry/exporters/zipkin/recordable.h b/exporters/zipkin/include/opentelemetry/exporters/zipkin/recordable.h
index 09955711e3..0331178f2a 100644
--- a/exporters/zipkin/include/opentelemetry/exporters/zipkin/recordable.h
+++ b/exporters/zipkin/include/opentelemetry/exporters/zipkin/recordable.h
@@ -3,8 +3,22 @@
 
 #pragma once
 
+#include <chrono>
+#include <string>
+
 #include "nlohmann/json.hpp"
+
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/common/key_value_iterable.h"
+#include "opentelemetry/common/timestamp.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
+#include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/sdk/trace/recordable.h"
+#include "opentelemetry/trace/span_context.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/span_metadata.h"
+#include "opentelemetry/trace/trace_flags.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
diff --git a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h b/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h
index effa2dfe75..19e7af9cf6 100644
--- a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h
+++ b/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h
@@ -3,16 +3,20 @@
 
 #pragma once
 
-#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
-#include "opentelemetry/ext/http/client/http_client_factory.h"
-#include "opentelemetry/ext/http/common/url_parser.h"
-#include "opentelemetry/sdk/common/env_variables.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/span_data.h"
+#include <atomic>
+#include <chrono>
+#include <memory>
 
 #include "nlohmann/json.hpp"
 
-#include <atomic>
+#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
+#include "opentelemetry/ext/http/client/http_client.h"
+#include "opentelemetry/ext/http/common/url_parser.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/trace/exporter.h"
+#include "opentelemetry/sdk/trace/recordable.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter_factory.h b/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter_factory.h
index 3f84c6041b..b1564a7977 100644
--- a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter_factory.h
+++ b/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter_factory.h
@@ -7,6 +7,7 @@
 
 #include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
 #include "opentelemetry/sdk/trace/exporter.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/zipkin/src/recordable.cc b/exporters/zipkin/src/recordable.cc
index ed43cb8a2d..69899e7fad 100644
--- a/exporters/zipkin/src/recordable.cc
+++ b/exporters/zipkin/src/recordable.cc
@@ -1,12 +1,33 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <stdint.h>
+#include <chrono>
+#include <map>
+#include <string>
+#include <type_traits>
+#include <unordered_map>
+#include <utility>
+
+#include "nlohmann/json.hpp"
+
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/common/key_value_iterable.h"
+#include "opentelemetry/common/timestamp.h"
 #include "opentelemetry/exporters/zipkin/recordable.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/variant.h"
+#include "opentelemetry/sdk/common/attribute_utils.h"
+#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
 #include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/sdk/resource/semantic_conventions.h"
-
-#include <map>
-#include <string>
+#include "opentelemetry/trace/span_context.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/span_metadata.h"
+#include "opentelemetry/trace/trace_flags.h"
+#include "opentelemetry/trace/trace_id.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
diff --git a/exporters/zipkin/src/zipkin_exporter.cc b/exporters/zipkin/src/zipkin_exporter.cc
index a8a97b58af..e6d3ce8b26 100644
--- a/exporters/zipkin/src/zipkin_exporter.cc
+++ b/exporters/zipkin/src/zipkin_exporter.cc
@@ -2,12 +2,27 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #define _WINSOCKAPI_  // stops including winsock.h
-#include "opentelemetry/exporters/zipkin/zipkin_exporter.h"
-#include <mutex>
+
+#include <stdint.h>
+#include <atomic>
+#include <chrono>
+#include <memory>
+#include <ostream>
+#include <string>
+
+#include "nlohmann/json.hpp"
+
 #include "opentelemetry/exporters/zipkin/recordable.h"
+#include "opentelemetry/exporters/zipkin/zipkin_exporter.h"
+#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
+#include "opentelemetry/ext/http/client/http_client.h"
 #include "opentelemetry/ext/http/client/http_client_factory.h"
 #include "opentelemetry/ext/http/common/url_parser.h"
-#include "opentelemetry/sdk_config.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
+#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/sdk/trace/recordable.h"
+#include "opentelemetry/version.h"
 
 namespace http_client = opentelemetry::ext::http::client;
 
diff --git a/exporters/zipkin/src/zipkin_exporter_factory.cc b/exporters/zipkin/src/zipkin_exporter_factory.cc
index 5003dbb0a0..edacb79842 100644
--- a/exporters/zipkin/src/zipkin_exporter_factory.cc
+++ b/exporters/zipkin/src/zipkin_exporter_factory.cc
@@ -4,6 +4,8 @@
 #include "opentelemetry/exporters/zipkin/zipkin_exporter_factory.h"
 #include "opentelemetry/exporters/zipkin/zipkin_exporter.h"
 #include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
+#include "opentelemetry/ext/http/client/http_client.h"
+#include "opentelemetry/version.h"
 
 namespace http_client = opentelemetry::ext::http::client;
 
diff --git a/ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h b/ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h
index 63702be09a..902981f392 100644
--- a/ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h
+++ b/ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h
@@ -3,20 +3,27 @@
 
 #pragma once
 
-#include "opentelemetry/ext/http/client/curl/http_operation_curl.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/ext/http/common/url_parser.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/version.h"
-
+#include <curl/curl.h>
 #include <atomic>
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
 #include <list>
+#include <map>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
 #include <unordered_map>
 #include <unordered_set>
-#include <vector>
+#include <utility>
+
+#include "opentelemetry/ext/http/client/curl/http_operation_curl.h"
+#include "opentelemetry/ext/http/client/http_client.h"
+#include "opentelemetry/nostd/function_ref.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace ext
diff --git a/ext/src/http/client/curl/http_client_curl.cc b/ext/src/http/client/curl/http_client_curl.cc
index 11c1435b1f..38ca2e7348 100644
--- a/ext/src/http/client/curl/http_client_curl.cc
+++ b/ext/src/http/client/curl/http_client_curl.cc
@@ -1,15 +1,35 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <curl/curl.h>
+#include <curl/curlver.h>
+#include <zconf.h>
+#include <atomic>
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <list>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+
 #include "opentelemetry/ext/http/client/curl/http_client_curl.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/ext/http/client/curl/http_operation_curl.h"
+#include "opentelemetry/ext/http/client/http_client.h"
+#include "opentelemetry/ext/http/common/url_parser.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/version.h"
 
 #ifdef ENABLE_OTLP_COMPRESSION_PREVIEW
 #  include <zlib.h>
+#else
+#  include "opentelemetry/sdk/common/global_log_handler.h"
 #endif
 
-#include <list>
-
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace ext
 {
diff --git a/ext/src/http/client/curl/http_client_factory_curl.cc b/ext/src/http/client/curl/http_client_factory_curl.cc
index f6266c2931..fd0a7d6a81 100644
--- a/ext/src/http/client/curl/http_client_factory_curl.cc
+++ b/ext/src/http/client/curl/http_client_factory_curl.cc
@@ -1,6 +1,8 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <memory>
+
 #include "opentelemetry/ext/http/client/curl/http_client_curl.h"
 #include "opentelemetry/ext/http/client/http_client.h"
 #include "opentelemetry/ext/http/client/http_client_factory.h"
diff --git a/ext/src/http/client/curl/http_operation_curl.cc b/ext/src/http/client/curl/http_operation_curl.cc
index fe06384414..f82c17ccc5 100644
--- a/ext/src/http/client/curl/http_operation_curl.cc
+++ b/ext/src/http/client/curl/http_operation_curl.cc
@@ -1,12 +1,29 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <curl/curl.h>
+#include <curl/curlver.h>
+#include <curl/system.h>
+#include <algorithm>
+#include <atomic>
+#include <chrono>
+#include <cstdint>
 #include <cstring>
-
-#include "opentelemetry/ext/http/client/curl/http_operation_curl.h"
+#include <functional>
+#include <future>
+#include <istream>
+#include <map>
+#include <memory>
+#include <string>
+#include <thread>
+#include <utility>
+#include <vector>
 
 #include "opentelemetry/ext/http/client/curl/http_client_curl.h"
+#include "opentelemetry/ext/http/client/curl/http_operation_curl.h"
+#include "opentelemetry/ext/http/client/http_client.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/version.h"
 
 // CURL_VERSION_BITS was added in CURL 7.43.0
 #ifndef CURL_VERSION_BITS
diff --git a/functional/otlp/func_http_main.cc b/functional/otlp/func_http_main.cc
index 08b7807998..4f6c144a43 100644
--- a/functional/otlp/func_http_main.cc
+++ b/functional/otlp/func_http_main.cc
@@ -1,16 +1,29 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <stdio.h>
+#include <string.h>
+#include <iostream>
+#include <string>
+#include <utility>
+
+#include "opentelemetry/exporters/otlp/otlp_environment.h"
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/sdk/common/attribute_utils.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/trace/processor.h"
+#include "opentelemetry/sdk/trace/recordable.h"
 #include "opentelemetry/sdk/trace/simple_processor_factory.h"
+#include "opentelemetry/sdk/trace/tracer_provider.h"
 #include "opentelemetry/sdk/trace/tracer_provider_factory.h"
 #include "opentelemetry/trace/provider.h"
-
-#include <iostream>
-#include <string>
+#include "opentelemetry/trace/span.h"
+#include "opentelemetry/trace/span_id.h"
+#include "opentelemetry/trace/tracer.h"
+#include "opentelemetry/trace/tracer_provider.h"
 
 namespace trace     = opentelemetry::trace;
 namespace trace_sdk = opentelemetry::sdk::trace;
diff --git a/sdk/src/logs/logger.cc b/sdk/src/logs/logger.cc
index d3555ba4ec..e9935c5107 100644
--- a/sdk/src/logs/logger.cc
+++ b/sdk/src/logs/logger.cc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <chrono>
-#include <memory>
 #include <string>
 #include <utility>
 
diff --git a/sdk/src/logs/logger_provider.cc b/sdk/src/logs/logger_provider.cc
index c3b1fb7dd4..1eaa0d186e 100644
--- a/sdk/src/logs/logger_provider.cc
+++ b/sdk/src/logs/logger_provider.cc
@@ -3,7 +3,6 @@
 
 #include <algorithm>
 #include <chrono>
-#include <memory>
 #include <mutex>
 #include <utility>
 #include <vector>
@@ -12,7 +11,6 @@
 #include "opentelemetry/logs/logger.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
 #include "opentelemetry/sdk/logs/logger.h"
diff --git a/sdk/src/logs/readable_log_record.cc b/sdk/src/logs/readable_log_record.cc
index 4c8d119347..8d35c1eb2e 100644
--- a/sdk/src/logs/readable_log_record.cc
+++ b/sdk/src/logs/readable_log_record.cc
@@ -7,7 +7,6 @@
 
 #include "opentelemetry/logs/severity.h"
 #include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
 #include "opentelemetry/sdk/logs/readable_log_record.h"
 #include "opentelemetry/sdk/resource/resource.h"
diff --git a/sdk/src/metrics/meter.cc b/sdk/src/metrics/meter.cc
index f472ac726e..8b4413113b 100644
--- a/sdk/src/metrics/meter.cc
+++ b/sdk/src/metrics/meter.cc
@@ -3,7 +3,6 @@
 
 #include <algorithm>
 #include <cstdint>
-#include <memory>
 #include <mutex>
 #include <ostream>
 #include <string>
diff --git a/sdk/src/metrics/meter_provider.cc b/sdk/src/metrics/meter_provider.cc
index 959ff32800..6ddba6aa7c 100644
--- a/sdk/src/metrics/meter_provider.cc
+++ b/sdk/src/metrics/meter_provider.cc
@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <chrono>
-#include <memory>
 #include <mutex>
-#include <type_traits>
 #include <utility>
 
 #include "opentelemetry/common/key_value_iterable.h"
diff --git a/sdk/src/metrics/state/observable_registry.cc b/sdk/src/metrics/state/observable_registry.cc
index 4da46ddfe3..8db11d4605 100644
--- a/sdk/src/metrics/state/observable_registry.cc
+++ b/sdk/src/metrics/state/observable_registry.cc
@@ -4,7 +4,6 @@
 #include <algorithm>
 #include <cstdint>
 #include <map>
-#include <memory>
 #include <mutex>
 #include <ostream>
 #include <string>
diff --git a/sdk/src/trace/tracer.cc b/sdk/src/trace/tracer.cc
index f23ce5f628..fd02548c7b 100644
--- a/sdk/src/trace/tracer.cc
+++ b/sdk/src/trace/tracer.cc
@@ -4,7 +4,6 @@
 #include <stdint.h>
 #include <chrono>
 #include <map>
-#include <memory>
 #include <new>
 #include <utility>
 
@@ -12,7 +11,6 @@
 #include "opentelemetry/context/context.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
 #include "opentelemetry/sdk/trace/id_generator.h"
diff --git a/sdk/src/trace/tracer_provider.cc b/sdk/src/trace/tracer_provider.cc
index 7421e07de4..9440e3d469 100644
--- a/sdk/src/trace/tracer_provider.cc
+++ b/sdk/src/trace/tracer_provider.cc
@@ -3,9 +3,7 @@
 
 #include <algorithm>
 #include <chrono>
-#include <memory>
 #include <mutex>
-#include <type_traits>
 #include <utility>
 #include <vector>
 

From eb2b9753ea2df64079e07d40489388ea1b323108 Mon Sep 17 00:00:00 2001
From: Siddhartha Malladi <msiddhu45@gmail.com>
Date: Thu, 11 Jul 2024 05:45:17 -0400
Subject: [PATCH 09/13] [Code Health] clang-tidy cleanup, part 1  (#2990)

---
 .clang-tidy                                   |  69 ++++
 api/test/baggage/baggage_benchmark.cc         |   2 +-
 api/test/baggage/baggage_test.cc              |   2 +-
 .../propagation/baggage_propagator_test.cc    |   2 +-
 api/test/common/kv_properties_test.cc         |   2 +-
 api/test/context/context_test.cc              |   6 +-
 api/test/context/runtime_context_test.cc      |   2 +
 api/test/logs/logger_benchmark.cc             |  10 +-
 api/test/logs/logger_test.cc                  |   1 -
 api/test/metrics/meter_provider_test.cc       |   1 -
 api/test/nostd/shared_ptr_test.cc             |  10 +-
 api/test/nostd/unique_ptr_test.cc             |  12 +-
 api/test/trace/trace_state_test.cc            |   4 +-
 examples/etw_threads/main.cc                  |   2 +-
 examples/grpc/client.cc                       |   7 +-
 examples/grpc/server.cc                       |   9 +-
 examples/logs_simple/main.cc                  |   4 +-
 examples/multi_processor/main.cc              |  18 +-
 examples/multithreaded/main.cc                |   1 +
 examples/otlp/http_log_main.cc                |   4 +-
 examples/simple/main.cc                       |   2 +-
 .../elasticsearch/es_log_recordable.h         |   6 +-
 .../elasticsearch/src/es_log_recordable.cc    |   6 +-
 .../memory/test/in_memory_span_data_test.cc   |   1 -
 .../exporters/ostream/log_record_exporter.h   |   4 +-
 .../exporters/ostream/metric_exporter.h       |   2 +-
 .../exporters/ostream/span_exporter.h         |   2 +-
 exporters/ostream/src/log_record_exporter.cc  |  10 +-
 exporters/ostream/src/metric_exporter.cc      |   2 +-
 exporters/ostream/src/span_exporter.cc        |   8 +-
 exporters/ostream/test/ostream_log_test.cc    |  60 ++-
 exporters/ostream/test/ostream_span_test.cc   |   2 +-
 exporters/otlp/src/otlp_file_client.cc        |   9 +-
 exporters/otlp/src/otlp_grpc_client.cc        |   6 +-
 exporters/otlp/src/otlp_http_client.cc        |  10 +-
 .../otlp/test/otlp_http_exporter_test.cc      | 215 ++++++-----
 .../otlp_http_log_record_exporter_test.cc     | 363 +++++++++---------
 .../test/otlp_http_metric_exporter_test.cc    | 265 ++++++-------
 .../test/otlp_metrics_serialization_test.cc   |   6 +-
 exporters/otlp/test/otlp_recordable_test.cc   |   6 +-
 exporters/prometheus/src/exporter_utils.cc    |   4 +-
 exporters/prometheus/test/exporter_test.cc    |   1 -
 .../prometheus/test/exporter_utils_test.cc    |   7 +-
 exporters/zipkin/src/zipkin_exporter.cc       |   2 +-
 exporters/zipkin/test/zipkin_exporter_test.cc |   3 +-
 .../http/client/curl/http_operation_curl.h    |   3 +-
 ext/src/dll/dllmain.cc                        |   2 +-
 ext/src/http/client/curl/http_client_curl.cc  |   2 +-
 .../http/client/curl/http_operation_curl.cc   |   8 +-
 ext/test/http/curl_http_test.cc               |   5 +-
 ext/test/w3c_tracecontext_test/main.cc        |   6 +-
 functional/otlp/func_http_main.cc             |  24 +-
 .../opentelemetry/sdk/logs/logger_context.h   |   2 +-
 .../opentelemetry/sdk/logs/logger_provider.h  |   4 +-
 .../opentelemetry/sdk/metrics/meter_context.h |   4 +-
 .../sdk/metrics/meter_provider.h              |   4 +-
 .../metrics/state/temporal_metric_storage.h   |   2 +-
 .../sdk/metrics/sync_instruments.h            |  12 +-
 .../opentelemetry/sdk/trace/samplers/parent.h |   2 +-
 .../sdk/trace/samplers/parent_factory.h       |   2 +-
 .../opentelemetry/sdk/trace/tracer_context.h  |   2 +-
 .../opentelemetry/sdk/trace/tracer_provider.h |   4 +-
 sdk/src/common/global_log_handler.cc          |   2 +-
 sdk/src/logs/event_logger.cc                  |   2 +-
 sdk/src/logs/logger.cc                        |   2 +-
 sdk/src/logs/logger_context.cc                |   2 +-
 sdk/src/logs/logger_provider.cc               |   4 +-
 sdk/src/metrics/async_instruments.cc          |   4 +-
 sdk/src/metrics/exemplar/reservoir.cc         |  10 +-
 sdk/src/metrics/meter.cc                      |   4 +-
 sdk/src/metrics/meter_context.cc              |   6 +-
 sdk/src/metrics/meter_provider.cc             |   4 +-
 sdk/src/metrics/state/metric_collector.cc     |   4 +-
 .../metrics/state/temporal_metric_storage.cc  |   4 +-
 sdk/src/metrics/sync_instruments.cc           |  12 +-
 sdk/src/metrics/view/view_factory.cc          |   5 +-
 sdk/src/trace/batch_span_processor.cc         |   1 -
 sdk/src/trace/samplers/parent.cc              |   2 +-
 sdk/src/trace/samplers/parent_factory.cc      |   8 +-
 sdk/src/trace/span.cc                         |   2 +-
 sdk/src/trace/tracer.cc                       |   2 +-
 sdk/src/trace/tracer_context.cc               |   2 +-
 sdk/src/trace/tracer_provider.cc              |   4 +-
 sdk/test/common/empty_attributes_test.cc      |   2 +-
 .../logs/batch_log_record_processor_test.cc   |  12 +-
 sdk/test/logs/logger_sdk_test.cc              |   3 +-
 .../logs/simple_log_record_processor_test.cc  |   3 +-
 sdk/test/metrics/async_instruments_test.cc    |   1 +
 sdk/test/metrics/async_metric_storage_test.cc |   4 +-
 sdk/test/metrics/cardinality_limit_test.cc    |   4 +-
 .../instrument_metadata_validator_test.cc     |   6 +-
 sdk/test/metrics/meter_test.cc                |   2 +-
 ...ync_metric_storage_up_down_counter_test.cc |  12 +-
 sdk/test/resource/resource_test.cc            |  11 +-
 sdk/test/trace/batch_span_processor_test.cc   |  11 +-
 sdk/test/trace/span_data_test.cc              |   4 +-
 sdk/test/trace/tracer_test.cc                 |   1 -
 97 files changed, 759 insertions(+), 661 deletions(-)
 create mode 100644 .clang-tidy

diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644
index 0000000000..5abedb62fd
--- /dev/null
+++ b/.clang-tidy
@@ -0,0 +1,69 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+Checks: >
+  -*,
+  abseil-*,
+  -abseil-string-find-str-contains,
+  bugprone-*,
+  -bugprone-easily-swappable-parameters,
+  -bugprone-implicit-widening-of-multiplication-result,
+  -bugprone-inc-dec-in-conditions,
+  -bugprone-narrowing-conversions,
+  -bugprone-unchecked-optional-access,
+  -bugprone-unhandled-exception-at-new,
+  -bugprone-unused-local-non-trivial-variable,
+  -bugprone-unused-return-value,
+  google-*,
+  -google-build-using-namespace,
+  -google-default-arguments,
+  -google-explicit-constructor,
+  -google-readability-avoid-underscore-in-googletest-name,
+  -google-readability-braces-around-statements,
+  -google-readability-namespace-comments,
+  -google-readability-todo,
+  -google-runtime-references,
+  misc-*,
+  -misc-const-correctness,
+  -misc-include-cleaner,
+  -misc-non-private-member-variables-in-classes,
+  -misc-unused-alias-decls,
+  -misc-use-anonymous-namespace,
+  performance-*,
+  -performance-move-const-arg,
+  portability-*
+#  readability-*,
+#  -readability-convert-member-functions-to-static,
+#  -readability-else-after-return,
+#  -readability-function-cognitive-complexity,
+#  -readability-identifier-length,
+#  -readability-implicit-bool-conversion,
+#  -readability-isolate-declaration,
+#  -readability-magic-numbers,
+#  -readability-named-parameter,
+#  -readability-redundant-*,
+#  -readability-string-compare,
+#  cppcoreguidelines-*,
+#  -cppcoreguidelines-avoid-c-arrays,
+#  -cppcoreguidelines-avoid-magic-numbers,
+#  -cppcoreguidelines-init-variables,
+#  -cppcoreguidelines-macro-usage,
+#  -cppcoreguidelines-non-private-member-variables-in-classes,
+#  -cppcoreguidelines-pro-*,
+#  modernize-*,
+#  -modernize-use-default-member-init,
+#  -modernize-use-nodiscard,
+#  -modernize-use-trailing-return-type,
+#  -modernize-avoid-c-arrays,
+#  -modernize-use-using
+
+# Use existing clang-format for formatting the code
+# FormatStyle: 'file'
+
+# TODO: include checks: readability, cppcoreguidelines, modernize , google-readability-namespace-comments, google-readability-avoid-underscore-in-googletest-name, performance-move-const-arg
+
+
+
+
+
+
diff --git a/api/test/baggage/baggage_benchmark.cc b/api/test/baggage/baggage_benchmark.cc
index 0f2efa9939..4ced142327 100644
--- a/api/test/baggage/baggage_benchmark.cc
+++ b/api/test/baggage/baggage_benchmark.cc
@@ -22,7 +22,7 @@ std::string header_with_custom_entries(size_t num_entries)
   {
     std::string key   = "ADecentlyLargekey" + std::to_string(i);
     std::string value = "ADecentlyLargeValue" + std::to_string(i);
-    header += key + "=" + value;
+    header.append(key).append("=").append(value);
     if (i != num_entries - 1)
     {
       header += ",";
diff --git a/api/test/baggage/baggage_test.cc b/api/test/baggage/baggage_test.cc
index 9c14fc892f..f29615c983 100644
--- a/api/test/baggage/baggage_test.cc
+++ b/api/test/baggage/baggage_test.cc
@@ -19,7 +19,7 @@ std::string header_with_custom_entries(size_t num_entries)
   {
     std::string key   = "key" + std::to_string(i);
     std::string value = "value" + std::to_string(i);
-    header += key + "=" + value;
+    header.append(key).append("=").append(value);
     if (i != num_entries - 1)
     {
       header += ",";
diff --git a/api/test/baggage/propagation/baggage_propagator_test.cc b/api/test/baggage/propagation/baggage_propagator_test.cc
index 94fe8b005b..83de75757b 100644
--- a/api/test/baggage/propagation/baggage_propagator_test.cc
+++ b/api/test/baggage/propagation/baggage_propagator_test.cc
@@ -62,7 +62,7 @@ TEST(BaggagePropagatorTest, ExtractAndInjectBaggage)
       {"invalid_header", ""},                                 // invalid header
       {very_large_baggage_header, ""}};  // baggage header larger than allowed size.
 
-  for (auto baggage : baggages)
+  for (const auto &baggage : baggages)
   {
     BaggageCarrierTest carrier1;
     carrier1.headers_[baggage::kBaggageHeader.data()] = baggage.first;
diff --git a/api/test/common/kv_properties_test.cc b/api/test/common/kv_properties_test.cc
index e5d9a2439e..f616664265 100644
--- a/api/test/common/kv_properties_test.cc
+++ b/api/test/common/kv_properties_test.cc
@@ -31,7 +31,7 @@ TEST(EntryTest, KeyValueConstruction)
 TEST(EntryTest, Copy)
 {
   KeyValueProperties::Entry e("test_key", "test_value");
-  KeyValueProperties::Entry copy(e);
+  const KeyValueProperties::Entry &copy(e);
   EXPECT_EQ(copy.GetKey(), e.GetKey());
   EXPECT_EQ(copy.GetValue(), e.GetValue());
 }
diff --git a/api/test/context/context_test.cc b/api/test/context/context_test.cc
index 764dac6477..294f1cd180 100644
--- a/api/test/context/context_test.cc
+++ b/api/test/context/context_test.cc
@@ -105,8 +105,8 @@ TEST(ContextTest, ContextCopyOperator)
       {"foo_key", static_cast<int64_t>(456)},
       {"other_key", static_cast<int64_t>(789)}};
 
-  context::Context test_context   = context::Context(test_map);
-  context::Context copied_context = test_context;
+  context::Context test_context          = context::Context(test_map);
+  const context::Context &copied_context = test_context;
 
   EXPECT_EQ(nostd::get<int64_t>(copied_context.GetValue("test_key")), 123);
   EXPECT_EQ(nostd::get<int64_t>(copied_context.GetValue("foo_key")), 456);
@@ -135,7 +135,7 @@ TEST(ContextTest, ContextCopyCompare)
 {
   std::map<std::string, context::ContextValue> map_test = {{"test_key", static_cast<int64_t>(123)}};
   context::Context context_test                         = context::Context(map_test);
-  context::Context copied_test                          = context_test;
+  const context::Context &copied_test                   = context_test;
   EXPECT_TRUE(context_test == copied_test);
 }
 
diff --git a/api/test/context/runtime_context_test.cc b/api/test/context/runtime_context_test.cc
index c2ec732fe0..cd551c599c 100644
--- a/api/test/context/runtime_context_test.cc
+++ b/api/test/context/runtime_context_test.cc
@@ -113,6 +113,7 @@ TEST(RuntimeContextTest, DetachOutOfOrder)
   indices.push_back(3);
 
   std::vector<context::Context> contexts;
+  contexts.reserve(indices.size());
   for (auto i : indices)
   {
     contexts.push_back(context::Context("index", static_cast<int64_t>(i)));
@@ -122,6 +123,7 @@ TEST(RuntimeContextTest, DetachOutOfOrder)
   {
     std::vector<nostd::unique_ptr<context::Token>> tokens;
 
+    tokens.reserve(contexts.size());
     for (auto &c : contexts)
     {
       tokens.push_back(context::RuntimeContext::Attach(c));
diff --git a/api/test/logs/logger_benchmark.cc b/api/test/logs/logger_benchmark.cc
index 098b9c7df8..db225d496a 100644
--- a/api/test/logs/logger_benchmark.cc
+++ b/api/test/logs/logger_benchmark.cc
@@ -16,13 +16,8 @@
 #include <benchmark/benchmark.h>
 
 using opentelemetry::logs::EventId;
-using opentelemetry::logs::Logger;
-using opentelemetry::logs::LoggerProvider;
 using opentelemetry::logs::Provider;
 using opentelemetry::logs::Severity;
-using opentelemetry::nostd::shared_ptr;
-using opentelemetry::nostd::span;
-using opentelemetry::nostd::string_view;
 
 namespace common  = opentelemetry::common;
 namespace nostd   = opentelemetry::nostd;
@@ -66,7 +61,7 @@ class Barrier
 static void ThreadRoutine(Barrier &barrier,
                           benchmark::State &state,
                           int thread_id,
-                          std::function<void()> func)
+                          const std::function<void()> &func)
 {
   barrier.Wait();
 
@@ -87,7 +82,7 @@ static void ThreadRoutine(Barrier &barrier,
   barrier.Wait();
 }
 
-void MultiThreadRunner(benchmark::State &state, std::function<void()> func)
+void MultiThreadRunner(benchmark::State &state, const std::function<void()> &func)
 {
   int num_threads = std::thread::hardware_concurrency();
 
@@ -95,6 +90,7 @@ void MultiThreadRunner(benchmark::State &state, std::function<void()> func)
 
   std::vector<std::thread> threads;
 
+  threads.reserve(num_threads);
   for (int i = 0; i < num_threads; i++)
   {
     threads.emplace_back(ThreadRoutine, std::ref(barrier), std::ref(state), i, func);
diff --git a/api/test/logs/logger_test.cc b/api/test/logs/logger_test.cc
index 43d7afc685..848f053453 100644
--- a/api/test/logs/logger_test.cc
+++ b/api/test/logs/logger_test.cc
@@ -16,7 +16,6 @@ using opentelemetry::logs::LoggerProvider;
 using opentelemetry::logs::Provider;
 using opentelemetry::logs::Severity;
 using opentelemetry::nostd::shared_ptr;
-using opentelemetry::nostd::span;
 using opentelemetry::nostd::string_view;
 namespace common = opentelemetry::common;
 namespace nostd  = opentelemetry::nostd;
diff --git a/api/test/metrics/meter_provider_test.cc b/api/test/metrics/meter_provider_test.cc
index 878c5e9a3b..b8fb083799 100644
--- a/api/test/metrics/meter_provider_test.cc
+++ b/api/test/metrics/meter_provider_test.cc
@@ -6,7 +6,6 @@
 #include "opentelemetry/metrics/provider.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 
-using opentelemetry::metrics::Meter;
 using opentelemetry::metrics::MeterProvider;
 using opentelemetry::metrics::NoopMeterProvider;
 using opentelemetry::metrics::Provider;
diff --git a/api/test/nostd/shared_ptr_test.cc b/api/test/nostd/shared_ptr_test.cc
index 0c79c7efd2..5c290c6284 100644
--- a/api/test/nostd/shared_ptr_test.cc
+++ b/api/test/nostd/shared_ptr_test.cc
@@ -63,7 +63,7 @@ TEST(SharedPtrTest, MoveConstruction)
   auto value = new int{123};
   shared_ptr<int> ptr1{value};
   shared_ptr<int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);
+  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
   EXPECT_EQ(ptr2.get(), value);
 }
 
@@ -72,7 +72,7 @@ TEST(SharedPtrTest, MoveConstructionFromDifferentType)
   auto value = new int{123};
   shared_ptr<int> ptr1{value};
   shared_ptr<const int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);
+  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
   EXPECT_EQ(ptr2.get(), value);
 }
 
@@ -81,14 +81,14 @@ TEST(SharedPtrTest, MoveConstructionFromStdSharedPtr)
   auto value = new int{123};
   std::shared_ptr<int> ptr1{value};
   shared_ptr<int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);
+  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
   EXPECT_EQ(ptr2.get(), value);
 }
 
 TEST(SharedPtrTest, Destruction)
 {
   bool was_destructed;
-  shared_ptr<A>{new A{was_destructed}};
+  shared_ptr<A>{new A{was_destructed}};  // NOLINT
   EXPECT_TRUE(was_destructed);
 }
 
@@ -173,7 +173,7 @@ static void SharedPtrTest_Sort(size_t size = 10)
   auto nums2 = nums;
 
   std::sort(nums.begin(), nums.end(),
-            [](shared_ptr<const int> a, shared_ptr<const int> b) { return *a < *b; });
+            [](const shared_ptr<const int> &a, const shared_ptr<const int> &b) { return *a < *b; });
 
   EXPECT_NE(nums, nums2);
 
diff --git a/api/test/nostd/unique_ptr_test.cc b/api/test/nostd/unique_ptr_test.cc
index f3684be0b8..893525c266 100644
--- a/api/test/nostd/unique_ptr_test.cc
+++ b/api/test/nostd/unique_ptr_test.cc
@@ -49,7 +49,7 @@ TEST(UniquePtrTest, MoveConstruction)
   auto value = new int{123};
   unique_ptr<int> ptr1{value};
   unique_ptr<int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);
+  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
   EXPECT_EQ(ptr2.get(), value);
 }
 
@@ -58,7 +58,7 @@ TEST(UniquePtrTest, MoveConstructionFromDifferentType)
   auto value = new int{123};
   unique_ptr<int> ptr1{value};
   unique_ptr<const int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);
+  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
   EXPECT_EQ(ptr2.get(), value);
 }
 
@@ -67,14 +67,14 @@ TEST(UniquePtrTest, MoveConstructionFromStdUniquePtr)
   auto value = new int{123};
   std::unique_ptr<int> ptr1{value};
   unique_ptr<int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);
+  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
   EXPECT_EQ(ptr2.get(), value);
 }
 
 TEST(UniquePtrTest, Destruction)
 {
   bool was_destructed;
-  unique_ptr<A>{new A{was_destructed}};
+  unique_ptr<A>{new A{was_destructed}};  // NOLINT
   EXPECT_TRUE(was_destructed);
 }
 
@@ -83,13 +83,13 @@ TEST(UniquePtrTest, StdUniquePtrConversionOperator)
   auto value = new int{123};
   unique_ptr<int> ptr1{value};
   std::unique_ptr<int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);
+  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
   EXPECT_EQ(ptr2.get(), value);
 
   value = new int{456};
   ptr1  = unique_ptr<int>{value};
   ptr2  = std::move(ptr1);
-  EXPECT_EQ(ptr1.get(), nullptr);
+  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
   EXPECT_EQ(ptr2.get(), value);
 
   ptr2 = nullptr;
diff --git a/api/test/trace/trace_state_test.cc b/api/test/trace/trace_state_test.cc
index 7f5a05cfe6..e6ed73c1f4 100644
--- a/api/test/trace/trace_state_test.cc
+++ b/api/test/trace/trace_state_test.cc
@@ -20,7 +20,7 @@ const char *kLongString =
 
 // -------------------------- TraceState class tests ---------------------------
 
-std::string create_ts_return_header(std::string header)
+std::string create_ts_return_header(const std::string &header)
 {
   auto ts = TraceState::FromHeader(header);
   return ts->ToHeader();
@@ -34,7 +34,7 @@ std::string header_with_max_members()
   {
     std::string key   = "key" + std::to_string(i);
     std::string value = "value" + std::to_string(i);
-    header += key + "=" + value;
+    header.append(key).append("=").append(value);
     if (i != max_members - 1)
     {
       header += ",";
diff --git a/examples/etw_threads/main.cc b/examples/etw_threads/main.cc
index d25883d1d1..e5b8dbac9f 100644
--- a/examples/etw_threads/main.cc
+++ b/examples/etw_threads/main.cc
@@ -113,7 +113,7 @@ void beep()
 // Max number of threads to spawn
 constexpr int kMaxThreads = 10;
 
-int main(int arc, char **argv)
+int main(int /*arc*/, char ** /*argv*/)
 {
   std::thread pool[kMaxThreads];
 
diff --git a/examples/grpc/client.cc b/examples/grpc/client.cc
index b8f233dcc7..9ca41c6958 100644
--- a/examples/grpc/client.cc
+++ b/examples/grpc/client.cc
@@ -20,7 +20,6 @@
 
 using grpc::Channel;
 using grpc::ClientContext;
-using grpc::ClientReader;
 using grpc::Status;
 
 using grpc_example::Greeter;
@@ -34,7 +33,7 @@ using namespace opentelemetry::trace;
 class GreeterClient
 {
 public:
-  GreeterClient(std::shared_ptr<Channel> channel) : stub_(Greeter::NewStub(channel)) {}
+  GreeterClient(const std::shared_ptr<Channel> &channel) : stub_(Greeter::NewStub(channel)) {}
 
   std::string Greet(std::string ip, uint16_t port)
   {
@@ -77,7 +76,7 @@ class GreeterClient
     }
     else
     {
-      std::cout << status.error_code() << ": " << status.error_message() << std::endl;
+      std::cout << status.error_code() << ": " << status.error_message() << '\n';
       span->SetStatus(StatusCode::kError);
       span->SetAttribute(SemanticConventions::kRpcGrpcStatusCode, status.error_code());
       // Make sure to end your spans!
@@ -95,7 +94,7 @@ void RunClient(uint16_t port)
   GreeterClient greeter(
       grpc::CreateChannel("0.0.0.0:" + std::to_string(port), grpc::InsecureChannelCredentials()));
   std::string response = greeter.Greet("0.0.0.0", port);
-  std::cout << "grpc_server says: " << response << std::endl;
+  std::cout << "grpc_server says: " << response << '\n';
 }
 }  // namespace
 
diff --git a/examples/grpc/server.cc b/examples/grpc/server.cc
index a8fac8b5f0..3c3fcede4f 100644
--- a/examples/grpc/server.cc
+++ b/examples/grpc/server.cc
@@ -27,7 +27,6 @@
 using grpc::Server;
 using grpc::ServerBuilder;
 using grpc::ServerContext;
-using grpc::ServerWriter;
 using grpc::Status;
 
 using grpc_example::Greeter;
@@ -49,7 +48,7 @@ class GreeterServer final : public Greeter::Service
                const GreetRequest *request,
                GreetResponse *response) override
   {
-    for (auto elem : context->client_metadata())
+    for (const auto &elem : context->client_metadata())
     {
       std::cout << "ELEM: " << elem.first << " " << elem.second << "\n";
     }
@@ -78,8 +77,8 @@ class GreeterServer final : public Greeter::Service
     // Fetch and parse whatever HTTP headers we can from the gRPC request.
     span->AddEvent("Processing client attributes");
 
-    std::string req = request->request();
-    std::cout << std::endl << "grpc_client says: " << req << std::endl;
+    const std::string &req = request->request();
+    std::cout << '\n' << "grpc_client says: " << req << '\n';
     std::string message = "The pleasure is mine.";
     // Send response to client
     response->set_response(message);
@@ -102,7 +101,7 @@ void RunServer(uint16_t port)
   builder.AddListeningPort(address, grpc::InsecureServerCredentials());
 
   std::unique_ptr<Server> server(builder.BuildAndStart());
-  std::cout << "Server listening on port: " << address << std::endl;
+  std::cout << "Server listening on port: " << address << '\n';
   server->Wait();
   server->Shutdown();
 }
diff --git a/examples/logs_simple/main.cc b/examples/logs_simple/main.cc
index 35827b6502..444775dc59 100644
--- a/examples/logs_simple/main.cc
+++ b/examples/logs_simple/main.cc
@@ -53,7 +53,7 @@ void InitTracer()
 #endif /* OPENTELEMETRY_DEPRECATED_SDK_FACTORY */
 
   // Set the global trace provider
-  std::shared_ptr<trace_api::TracerProvider> api_provider = provider;
+  const std::shared_ptr<trace_api::TracerProvider> &api_provider = provider;
   trace_api::Provider::SetTracerProvider(api_provider);
 }
 
@@ -79,7 +79,7 @@ void InitLogger()
 #endif /* OPENTELEMETRY_DEPRECATED_SDK_FACTORY */
 
   // Set the global logger provider
-  std::shared_ptr<logs_api::LoggerProvider> api_provider = provider;
+  const std::shared_ptr<logs_api::LoggerProvider> &api_provider = provider;
   logs_api::Provider::SetLoggerProvider(api_provider);
 }
 
diff --git a/examples/multi_processor/main.cc b/examples/multi_processor/main.cc
index ceb7cdfcf9..d99d77de7d 100644
--- a/examples/multi_processor/main.cc
+++ b/examples/multi_processor/main.cc
@@ -70,29 +70,29 @@ void dumpSpans(std::vector<std::unique_ptr<trace_sdk::SpanData>> &spans)
   char span_buf[trace_api::SpanId::kSize * 2];
   char trace_buf[trace_api::TraceId::kSize * 2];
   char parent_span_buf[trace_api::SpanId::kSize * 2];
-  std::cout << "\nSpans from memory :" << std::endl;
+  std::cout << "\nSpans from memory :" << '\n';
 
   for (auto &span : spans)
   {
-    std::cout << "\n\tSpan: " << std::endl;
-    std::cout << "\t\tName: " << span->GetName() << std::endl;
+    std::cout << "\n\tSpan: " << '\n';
+    std::cout << "\t\tName: " << span->GetName() << '\n';
     span->GetSpanId().ToLowerBase16(span_buf);
     span->GetTraceId().ToLowerBase16(trace_buf);
     span->GetParentSpanId().ToLowerBase16(parent_span_buf);
-    std::cout << "\t\tTraceId: " << std::string(trace_buf, sizeof(trace_buf)) << std::endl;
-    std::cout << "\t\tSpanId: " << std::string(span_buf, sizeof(span_buf)) << std::endl;
+    std::cout << "\t\tTraceId: " << std::string(trace_buf, sizeof(trace_buf)) << '\n';
+    std::cout << "\t\tSpanId: " << std::string(span_buf, sizeof(span_buf)) << '\n';
     std::cout << "\t\tParentSpanId: " << std::string(parent_span_buf, sizeof(parent_span_buf))
-              << std::endl;
+              << '\n';
 
-    std::cout << "\t\tDescription: " << span->GetDescription() << std::endl;
+    std::cout << "\t\tDescription: " << span->GetDescription() << '\n';
     std::cout << "\t\tSpan kind:"
               << static_cast<typename std::underlying_type<trace_api::SpanKind>::type>(
                      span->GetSpanKind())
-              << std::endl;
+              << '\n';
     std::cout << "\t\tSpan Status: "
               << static_cast<typename std::underlying_type<trace_api::StatusCode>::type>(
                      span->GetStatus())
-              << std::endl;
+              << '\n';
   }
 }
 }  // namespace
diff --git a/examples/multithreaded/main.cc b/examples/multithreaded/main.cc
index d92a4ab2ac..675a6053ec 100644
--- a/examples/multithreaded/main.cc
+++ b/examples/multithreaded/main.cc
@@ -55,6 +55,7 @@ void run_threads()
   auto thread_span = get_tracer()->StartSpan(__func__);
 
   std::vector<std::thread> threads;
+  threads.reserve(5);
   for (int thread_num = 0; thread_num < 5; ++thread_num)
   {
     // This shows how one can effectively use Scope objects to correctly
diff --git a/examples/otlp/http_log_main.cc b/examples/otlp/http_log_main.cc
index 38aa009d04..37bace2b0f 100644
--- a/examples/otlp/http_log_main.cc
+++ b/examples/otlp/http_log_main.cc
@@ -71,7 +71,7 @@ void InitTracer()
       trace_opts.url = opentelemetry::exporter::otlp::GetOtlpDefaultHttpTracesEndpoint();
     }
   }
-  std::cout << "Using " << trace_opts.url << " to export trace spans." << std::endl;
+  std::cout << "Using " << trace_opts.url << " to export trace spans." << '\n';
 
   // Create OTLP exporter instance
   auto exporter   = otlp::OtlpHttpExporterFactory::Create(trace_opts);
@@ -110,7 +110,7 @@ std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> logger_provider;
 
 void InitLogger()
 {
-  std::cout << "Using " << logger_opts.url << " to export log records." << std::endl;
+  std::cout << "Using " << logger_opts.url << " to export log records." << '\n';
   logger_opts.console_debug = true;
   // Create OTLP exporter instance
   auto exporter   = otlp::OtlpHttpLogRecordExporterFactory::Create(logger_opts);
diff --git a/examples/simple/main.cc b/examples/simple/main.cc
index a872816ba1..349aec500a 100644
--- a/examples/simple/main.cc
+++ b/examples/simple/main.cc
@@ -40,7 +40,7 @@ void InitTracer()
 #endif /* OPENTELEMETRY_DEPRECATED_SDK_FACTORY */
 
   // Set the global trace provider
-  std::shared_ptr<opentelemetry::trace::TracerProvider> api_provider = provider;
+  const std::shared_ptr<opentelemetry::trace::TracerProvider> &api_provider = provider;
   trace_api::Provider::SetTracerProvider(api_provider);
 }
 
diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h
index feb68f7f9c..af4ccb16ef 100644
--- a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h
+++ b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h
@@ -33,13 +33,13 @@ class ElasticSearchRecordable final : public sdk::logs::Recordable
    */
   void WriteKeyValue(nostd::string_view key,
                      const opentelemetry::common::AttributeValue &value,
-                     std::string name);
+                     const std::string &name);
 
   void WriteKeyValue(nostd::string_view key,
                      const opentelemetry::sdk::common::OwnedAttributeValue &value,
-                     std::string name);
+                     const std::string &name);
 
-  void WriteValue(const opentelemetry::common::AttributeValue &value, std::string name);
+  void WriteValue(const opentelemetry::common::AttributeValue &value, const std::string &name);
 
 public:
   /**
diff --git a/exporters/elasticsearch/src/es_log_recordable.cc b/exporters/elasticsearch/src/es_log_recordable.cc
index 139d22e863..663691273b 100644
--- a/exporters/elasticsearch/src/es_log_recordable.cc
+++ b/exporters/elasticsearch/src/es_log_recordable.cc
@@ -16,7 +16,7 @@ namespace logs
 {
 void ElasticSearchRecordable::WriteKeyValue(nostd::string_view key,
                                             const opentelemetry::common::AttributeValue &value,
-                                            std::string name)
+                                            const std::string &name)
 {
   switch (value.index())
   {
@@ -53,7 +53,7 @@ void ElasticSearchRecordable::WriteKeyValue(nostd::string_view key,
 void ElasticSearchRecordable::WriteKeyValue(
     nostd::string_view key,
     const opentelemetry::sdk::common::OwnedAttributeValue &value,
-    std::string name)
+    const std::string &name)
 {
   namespace common = opentelemetry::sdk::common;
   switch (value.index())
@@ -85,7 +85,7 @@ void ElasticSearchRecordable::WriteKeyValue(
 }
 
 void ElasticSearchRecordable::WriteValue(const opentelemetry::common::AttributeValue &value,
-                                         std::string name)
+                                         const std::string &name)
 {
 
   // Assert size of variant to ensure that this method gets updated if the variant
diff --git a/exporters/memory/test/in_memory_span_data_test.cc b/exporters/memory/test/in_memory_span_data_test.cc
index bc19550264..be013734ef 100644
--- a/exporters/memory/test/in_memory_span_data_test.cc
+++ b/exporters/memory/test/in_memory_span_data_test.cc
@@ -8,7 +8,6 @@
 #include <gtest/gtest.h>
 
 using opentelemetry::exporter::memory::InMemorySpanData;
-using opentelemetry::sdk::trace::Recordable;
 using opentelemetry::sdk::trace::SpanData;
 
 TEST(InMemorySpanData, AddRecordable)
diff --git a/exporters/ostream/include/opentelemetry/exporters/ostream/log_record_exporter.h b/exporters/ostream/include/opentelemetry/exporters/ostream/log_record_exporter.h
index 24bc8e5be7..840d7d5b8a 100644
--- a/exporters/ostream/include/opentelemetry/exporters/ostream/log_record_exporter.h
+++ b/exporters/ostream/include/opentelemetry/exporters/ostream/log_record_exporter.h
@@ -66,10 +66,10 @@ class OStreamLogRecordExporter final : public opentelemetry::sdk::logs::LogRecor
   bool isShutdown() const noexcept;
   void printAttributes(
       const std::unordered_map<std::string, opentelemetry::sdk::common::OwnedAttributeValue> &map,
-      const std::string prefix = "\n\t");
+      const std::string &prefix = "\n\t");
   void printAttributes(
       const std::unordered_map<std::string, opentelemetry::common::AttributeValue> &map,
-      const std::string prefix = "\n\t");
+      const std::string &prefix = "\n\t");
 };
 }  // namespace logs
 }  // namespace exporter
diff --git a/exporters/ostream/include/opentelemetry/exporters/ostream/metric_exporter.h b/exporters/ostream/include/opentelemetry/exporters/ostream/metric_exporter.h
index 1ad124a9ab..f1b2cd6ef9 100644
--- a/exporters/ostream/include/opentelemetry/exporters/ostream/metric_exporter.h
+++ b/exporters/ostream/include/opentelemetry/exporters/ostream/metric_exporter.h
@@ -79,7 +79,7 @@ class OStreamMetricExporter final : public opentelemetry::sdk::metrics::PushMetr
   void printPointData(const opentelemetry::sdk::metrics::PointType &point_data);
   void printPointAttributes(const opentelemetry::sdk::metrics::PointAttributes &point_attributes);
   void printAttributes(const std::map<std::string, sdk::common::OwnedAttributeValue> &map,
-                       const std::string prefix);
+                       const std::string &prefix);
   void printResources(const opentelemetry::sdk::resource::Resource &resources);
 };
 }  // namespace metrics
diff --git a/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h b/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h
index a7de9a5eb4..e22eb77f3e 100644
--- a/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h
+++ b/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h
@@ -69,7 +69,7 @@ class OStreamSpanExporter final : public opentelemetry::sdk::trace::SpanExporter
   // various print helpers
   void printAttributes(
       const std::unordered_map<std::string, opentelemetry::sdk::common::OwnedAttributeValue> &map,
-      const std::string prefix = "\n\t");
+      const std::string &prefix = "\n\t");
 
   void printEvents(const std::vector<opentelemetry::sdk::trace::SpanDataEvent> &events);
 
diff --git a/exporters/ostream/src/log_record_exporter.cc b/exporters/ostream/src/log_record_exporter.cc
index 7f661276c8..26266161c3 100644
--- a/exporters/ostream/src/log_record_exporter.cc
+++ b/exporters/ostream/src/log_record_exporter.cc
@@ -75,11 +75,11 @@ sdk::common::ExportResult OStreamLogRecordExporter::Export(
 
     // Convert trace, spanid, traceflags into exportable representation
     constexpr int trace_id_len    = 32;
-    constexpr int span_id__len    = 16;
+    constexpr int span_id_len     = 16;
     constexpr int trace_flags_len = 2;
 
     char trace_id[trace_id_len]       = {0};
-    char span_id[span_id__len]        = {0};
+    char span_id[span_id_len]         = {0};
     char trace_flags[trace_flags_len] = {0};
 
     log_record->GetTraceId().ToLowerBase16(trace_id);
@@ -120,7 +120,7 @@ sdk::common::ExportResult OStreamLogRecordExporter::Export(
           << "  event_id           : " << event_id << "\n"
           << "  event_name         : " << log_record->GetEventName() << "\n"
           << "  trace_id           : " << std::string(trace_id, trace_id_len) << "\n"
-          << "  span_id            : " << std::string(span_id, span_id__len) << "\n"
+          << "  span_id            : " << std::string(span_id, span_id_len) << "\n"
           << "  trace_flags        : " << std::string(trace_flags, trace_flags_len) << "\n"
           << "  scope              : \n"
           << "    name             : " << log_record->GetInstrumentationScope().GetName() << "\n"
@@ -155,7 +155,7 @@ bool OStreamLogRecordExporter::isShutdown() const noexcept
 
 void OStreamLogRecordExporter::printAttributes(
     const std::unordered_map<std::string, sdkcommon::OwnedAttributeValue> &map,
-    const std::string prefix)
+    const std::string &prefix)
 {
   for (const auto &kv : map)
   {
@@ -166,7 +166,7 @@ void OStreamLogRecordExporter::printAttributes(
 
 void OStreamLogRecordExporter::printAttributes(
     const std::unordered_map<std::string, opentelemetry::common::AttributeValue> &map,
-    const std::string prefix)
+    const std::string &prefix)
 {
   for (const auto &kv : map)
   {
diff --git a/exporters/ostream/src/metric_exporter.cc b/exporters/ostream/src/metric_exporter.cc
index 08bfe340c7..4bdd122492 100644
--- a/exporters/ostream/src/metric_exporter.cc
+++ b/exporters/ostream/src/metric_exporter.cc
@@ -117,7 +117,7 @@ sdk::common::ExportResult OStreamMetricExporter::Export(
 
 void OStreamMetricExporter::printAttributes(
     const std::map<std::string, sdk::common::OwnedAttributeValue> &map,
-    const std::string prefix)
+    const std::string &prefix)
 {
   for (const auto &kv : map)
   {
diff --git a/exporters/ostream/src/span_exporter.cc b/exporters/ostream/src/span_exporter.cc
index 9437ae561a..f41d33ae6c 100644
--- a/exporters/ostream/src/span_exporter.cc
+++ b/exporters/ostream/src/span_exporter.cc
@@ -100,7 +100,7 @@ sdk::common::ExportResult OStreamSpanExporter::Export(
             << "\n  duration      : " << span->GetDuration().count()
             << "\n  description   : " << span->GetDescription()
             << "\n  span kind     : " << span->GetSpanKind()
-            << "\n  status        : " << statusMap[int(span->GetStatus())]
+            << "\n  status        : " << statusMap[static_cast<int>(span->GetStatus())]
             << "\n  attributes    : ";
       printAttributes(span->GetAttributes());
       sout_ << "\n  events        : ";
@@ -137,7 +137,7 @@ bool OStreamSpanExporter::isShutdown() const noexcept
 
 void OStreamSpanExporter::printAttributes(
     const std::unordered_map<std::string, sdkcommon::OwnedAttributeValue> &map,
-    const std::string prefix)
+    const std::string &prefix)
 {
   for (const auto &kv : map)
   {
@@ -177,7 +177,7 @@ void OStreamSpanExporter::printLinks(const std::vector<trace_sdk::SpanDataLink>
 
 void OStreamSpanExporter::printResources(const opentelemetry::sdk::resource::Resource &resources)
 {
-  auto attributes = resources.GetAttributes();
+  const auto &attributes = resources.GetAttributes();
   if (attributes.size())
   {
     printAttributes(attributes, "\n\t");
@@ -188,7 +188,7 @@ void OStreamSpanExporter::printInstrumentationScope(
     const opentelemetry::sdk::instrumentationscope::InstrumentationScope &instrumentation_scope)
 {
   sout_ << instrumentation_scope.GetName();
-  auto version = instrumentation_scope.GetVersion();
+  const auto &version = instrumentation_scope.GetVersion();
   if (version.size())
   {
     sout_ << "-" << version;
diff --git a/exporters/ostream/test/ostream_log_test.cc b/exporters/ostream/test/ostream_log_test.cc
index 7b22d9b3fd..b7708f3153 100644
--- a/exporters/ostream/test/ostream_log_test.cc
+++ b/exporters/ostream/test/ostream_log_test.cc
@@ -97,17 +97,17 @@ TEST(OstreamLogExporter, DefaultLogRecordToCout)
   std::cout.rdbuf(original);
 
   std::vector<std::string> expected_output{
-      "{\n"
+      "{\n",
       "  timestamp          : 0\n",
-      "  severity_num       : 0\n"
-      "  severity_text      : INVALID\n"
+      "  severity_num       : 0\n",
+      "  severity_text      : INVALID\n",
       "  body               : \n",
       "  resource           : \n",
       "    telemetry.sdk.version: " OPENTELEMETRY_VERSION "\n",
       "    telemetry.sdk.name: opentelemetry\n",
       "    telemetry.sdk.language: cpp\n",
       "  attributes         : \n",
-      "  event_id           : 0\n"
+      "  event_id           : 0\n",
       "  event_name         : \n",
       "  trace_id           : 00000000000000000000000000000000\n",
       "  span_id            : 0000000000000000\n",
@@ -126,7 +126,7 @@ TEST(OstreamLogExporter, DefaultLogRecordToCout)
     std::string::size_type result = ostream_output.find(expected);
     if (result == std::string::npos)
     {
-      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << std::endl;
+      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << '\n';
     }
     ASSERT_NE(result, std::string::npos);
   }
@@ -167,9 +167,8 @@ TEST(OStreamLogRecordExporter, SimpleLogToCout)
   std::cout.rdbuf(original);
 
   std::vector<std::string> expected_output{
-      "{\n"
-      "  timestamp          : " +
-          std::to_string(now.time_since_epoch().count()) +
+      "{\n",
+      "  timestamp          : " + std::to_string(now.time_since_epoch().count()) +
           "\n"
           "  observed_timestamp : " +
           std::to_string(now.time_since_epoch().count()) +
@@ -182,7 +181,7 @@ TEST(OStreamLogRecordExporter, SimpleLogToCout)
       "    telemetry.sdk.name: opentelemetry\n",
       "    telemetry.sdk.language: cpp\n",
       "  attributes         : \n",
-      "  event_id           : 0\n"
+      "  event_id           : 0\n",
       "  event_name         : \n",
       "  trace_id           : 00000000000000000000000000000000\n",
       "  span_id            : 0000000000000000\n",
@@ -201,7 +200,7 @@ TEST(OStreamLogRecordExporter, SimpleLogToCout)
     std::string::size_type result = ostream_output.find(expected);
     if (result == std::string::npos)
     {
-      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << std::endl;
+      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << '\n';
     }
     ASSERT_NE(result, std::string::npos);
   }
@@ -243,10 +242,10 @@ TEST(OStreamLogRecordExporter, LogWithStringAttributesToCerr)
   std::cerr.rdbuf(original);
 
   std::vector<std::string> expected_output{
-      "{\n"
+      "{\n",
       "  timestamp          : 0\n",
-      "  severity_num       : 0\n"
-      "  severity_text      : INVALID\n"
+      "  severity_num       : 0\n",
+      "  severity_text      : INVALID\n",
       "  body               : \n",
       "  resource           : \n",
       "    telemetry.sdk.version: " OPENTELEMETRY_VERSION "\n",
@@ -256,7 +255,7 @@ TEST(OStreamLogRecordExporter, LogWithStringAttributesToCerr)
       "    key1: val1\n",
       "  attributes         : \n",
       "    a: 1\n",
-      "  event_id           : 0\n"
+      "  event_id           : 0\n",
       "  event_name         : \n",
       "  trace_id           : 00000000000000000000000000000000\n",
       "  span_id            : 0000000000000000\n",
@@ -275,7 +274,7 @@ TEST(OStreamLogRecordExporter, LogWithStringAttributesToCerr)
     std::string::size_type result = ostream_output.find(expected);
     if (result == std::string::npos)
     {
-      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << std::endl;
+      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << '\n';
     }
     ASSERT_NE(result, std::string::npos);
   }
@@ -324,10 +323,10 @@ TEST(OStreamLogRecordExporter, LogWithVariantTypesToClog)
   std::clog.rdbuf(original);
 
   std::vector<std::string> expected_output{
-      "{\n"
+      "{\n",
       "  timestamp          : 0\n",
-      "  severity_num       : 0\n"
-      "  severity_text      : INVALID\n"
+      "  severity_num       : 0\n",
+      "  severity_text      : INVALID\n",
       "  body               : \n",
       "  resource           : \n",
       "    service.name: unknown_service\n",
@@ -337,7 +336,7 @@ TEST(OStreamLogRecordExporter, LogWithVariantTypesToClog)
       "    res1: [1,2,3]\n",
       "  attributes         : \n",
       "    attr1: [0,1,0]\n",
-      "  event_id           : 0\n"
+      "  event_id           : 0\n",
       "  event_name         : \n",
       "  trace_id           : 00000000000000000000000000000000\n",
       "  span_id            : 0000000000000000\n",
@@ -356,7 +355,7 @@ TEST(OStreamLogRecordExporter, LogWithVariantTypesToClog)
     std::string::size_type result = ostream_output.find(expected);
     if (result == std::string::npos)
     {
-      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << std::endl;
+      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << '\n';
     }
     ASSERT_NE(result, std::string::npos);
   }
@@ -398,11 +397,10 @@ TEST(OStreamLogRecordExporter, IntegrationTest)
 
   // Compare actual vs expected outputs
   std::vector<std::string> expected_output{
-      "{\n"
-      "  timestamp          : " +
-          std::to_string(now.time_since_epoch().count()) + "\n",
-      "  severity_num       : 5\n"
-      "  severity_text      : DEBUG\n"
+      "{\n",
+      "  timestamp          : " + std::to_string(now.time_since_epoch().count()) + "\n",
+      "  severity_num       : 5\n",
+      "  severity_text      : DEBUG\n",
       "  body               : Hello\n",
       "  resource           : \n",
       "    telemetry.sdk.version: " OPENTELEMETRY_VERSION "\n",
@@ -410,7 +408,7 @@ TEST(OStreamLogRecordExporter, IntegrationTest)
       "    telemetry.sdk.name: opentelemetry\n",
       "    telemetry.sdk.language: cpp\n",
       "  attributes         : \n",
-      "  event_id           : 0\n"
+      "  event_id           : 0\n",
       "  event_name         : \n",
       "  trace_id           : 00000000000000000000000000000000\n",
       "  span_id            : 0000000000000000\n",
@@ -429,7 +427,7 @@ TEST(OStreamLogRecordExporter, IntegrationTest)
     std::string::size_type result = ostream_output.find(expected);
     if (result == std::string::npos)
     {
-      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << std::endl;
+      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << '\n';
     }
     ASSERT_NE(result, std::string::npos);
   }
@@ -472,8 +470,8 @@ TEST(OStreamLogRecordExporter, IntegrationTestWithEventId)
 
   // Compare actual vs expected outputs
   std::vector<std::string> expected_output{
-      "  severity_num       : 5\n"
-      "  severity_text      : DEBUG\n"
+      "  severity_num       : 5\n",
+      "  severity_text      : DEBUG\n",
       "  body               : Hello {key1} {key2}\n",
       "  resource           : \n",
       "    telemetry.sdk.version: " OPENTELEMETRY_VERSION "\n",
@@ -481,7 +479,7 @@ TEST(OStreamLogRecordExporter, IntegrationTestWithEventId)
       "    telemetry.sdk.name: opentelemetry\n",
       "    telemetry.sdk.language: cpp\n",
       "  attributes         : \n",
-      "  event_id           : 12345678\n"
+      "  event_id           : 12345678\n",
       "  event_name         : test_event_id\n",
       "  trace_id           : 00000000000000000000000000000000\n",
       "  span_id            : 0000000000000000\n",
@@ -500,7 +498,7 @@ TEST(OStreamLogRecordExporter, IntegrationTestWithEventId)
     std::string::size_type result = ostream_output.find(expected);
     if (result == std::string::npos)
     {
-      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << std::endl;
+      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << '\n';
     }
     ASSERT_NE(result, std::string::npos);
   }
diff --git a/exporters/ostream/test/ostream_span_test.cc b/exporters/ostream/test/ostream_span_test.cc
index f92f1bbffd..cadc1b9d38 100644
--- a/exporters/ostream/test/ostream_span_test.cc
+++ b/exporters/ostream/test/ostream_span_test.cc
@@ -31,7 +31,7 @@ using Attributes = std::initializer_list<std::pair<nostd::string_view, common::A
 class TestResource : public resource::Resource
 {
 public:
-  TestResource(resource::ResourceAttributes attributes = resource::ResourceAttributes())
+  TestResource(const resource::ResourceAttributes &attributes = resource::ResourceAttributes())
       : resource::Resource(attributes)
   {}
 };
diff --git a/exporters/otlp/src/otlp_file_client.cc b/exporters/otlp/src/otlp_file_client.cc
index bd36a602c4..62552bdeff 100644
--- a/exporters/otlp/src/otlp_file_client.cc
+++ b/exporters/otlp/src/otlp_file_client.cc
@@ -172,11 +172,11 @@ static std::size_t FormatPath(char *buff,
   {                                     \
     tm_obj_cache = GetLocalTime();      \
     tm_obj_ptr   = &tm_obj_cache;       \
-    VAR          = tm_obj_ptr->EXPRESS; \
+    (VAR)        = tm_obj_ptr->EXPRESS; \
   }                                     \
   else                                  \
   {                                     \
-    VAR = tm_obj_ptr->EXPRESS;          \
+    (VAR) = tm_obj_ptr->EXPRESS;        \
   }
 
   for (size_t i = 0; i < fmt.size() && ret < bufz && running; ++i)
@@ -619,7 +619,7 @@ class OPENTELEMETRY_LOCAL_SYMBOL FileSystemUtil
   }
 
 #if !defined(UTIL_FS_DISABLE_LINK)
-  enum class LinkOption : int32_t
+  enum class LinkOption : uint8_t
   {
     kDefault       = 0x00,  // hard link for default
     kSymbolicLink  = 0x01,  // or soft link
@@ -749,6 +749,7 @@ static void ConvertListFieldToJson(nlohmann::json &value,
                                    const google::protobuf::Message &message,
                                    const google::protobuf::FieldDescriptor *field_descriptor);
 
+// NOLINTBEGIN(misc-no-recursion)
 static void ConvertGenericMessageToJson(nlohmann::json &value,
                                         const google::protobuf::Message &message)
 {
@@ -952,6 +953,8 @@ void ConvertListFieldToJson(nlohmann::json &value,
   }
 }
 
+// NOLINTEND(misc-no-recursion) suppressing for performance as if implemented with stack needs
+// Dynamic memory allocation
 }  // namespace
 
 class OPENTELEMETRY_LOCAL_SYMBOL OtlpFileSystemBackend : public OtlpFileAppender
diff --git a/exporters/otlp/src/otlp_grpc_client.cc b/exporters/otlp/src/otlp_grpc_client.cc
index 3410726cf8..a5760bdd81 100644
--- a/exporters/otlp/src/otlp_grpc_client.cc
+++ b/exporters/otlp/src/otlp_grpc_client.cc
@@ -132,7 +132,7 @@ static std::string GetFileContentsOrInMemoryContents(const std::string &file_pat
 #ifdef ENABLE_ASYNC_EXPORT
 template <class StubType, class RequestType, class ResponseType>
 static sdk::common::ExportResult InternalDelegateAsyncExport(
-    std::shared_ptr<OtlpGrpcClientAsyncData> async_data,
+    const std::shared_ptr<OtlpGrpcClientAsyncData> &async_data,
     StubType *stub,
     std::unique_ptr<grpc::ClientContext> &&context,
     std::unique_ptr<google::protobuf::Arena> &&arena,
@@ -163,8 +163,8 @@ static sdk::common::ExportResult InternalDelegateAsyncExport(
   call_data->arena.swap(arena);
   call_data->result_callback.swap(result_callback);
 
-  call_data->request =
-      google::protobuf::Arena::Create<RequestType>(call_data->arena.get(), std::move(request));
+  call_data->request = google::protobuf::Arena::Create<RequestType>(
+      call_data->arena.get(), std::forward<RequestType>(request));
   call_data->response = google::protobuf::Arena::Create<ResponseType>(call_data->arena.get());
 
   if (call_data->request == nullptr || call_data->response == nullptr)
diff --git a/exporters/otlp/src/otlp_http_client.cc b/exporters/otlp/src/otlp_http_client.cc
index 03eb5fb434..94f02a9967 100644
--- a/exporters/otlp/src/otlp_http_client.cc
+++ b/exporters/otlp/src/otlp_http_client.cc
@@ -434,6 +434,7 @@ static void ConvertListFieldToJson(nlohmann::json &value,
                                    const google::protobuf::FieldDescriptor *field_descriptor,
                                    const OtlpHttpClientOptions &options);
 
+// NOLINTBEGIN(misc-no-recursion)
 static void ConvertGenericMessageToJson(nlohmann::json &value,
                                         const google::protobuf::Message &message,
                                         const OtlpHttpClientOptions &options)
@@ -654,6 +655,9 @@ void ConvertListFieldToJson(nlohmann::json &value,
   }
 }
 
+// NOLINTEND(misc-no-recursion) suppressing for performance, if implemented iterative process needs
+// Dynamic memory allocation
+
 }  // namespace
 
 OtlpHttpClient::OtlpHttpClient(OtlpHttpClientOptions &&options)
@@ -696,7 +700,7 @@ OtlpHttpClient::~OtlpHttpClient()
 
 OtlpHttpClient::OtlpHttpClient(OtlpHttpClientOptions &&options,
                                std::shared_ptr<ext::http::client::HttpClient> http_client)
-    : is_shutdown_(false), options_(options), http_client_(http_client)
+    : is_shutdown_(false), options_(options), http_client_(std::move(http_client))
 {
   http_client_->SetMaxSessionsPerConnection(options_.max_requests_per_connection);
 }
@@ -881,7 +885,7 @@ OtlpHttpClient::createSession(
       std::string error_message = "[OTLP HTTP Client] Export failed, invalid url: " + options_.url;
       if (options_.console_debug)
       {
-        std::cerr << error_message << std::endl;
+        std::cerr << error_message << '\n';
       }
       OTEL_INTERNAL_LOG_ERROR(error_message.c_str());
 
@@ -946,7 +950,7 @@ OtlpHttpClient::createSession(
     const char *error_message = "[OTLP HTTP Client] Export failed, exporter is shutdown";
     if (options_.console_debug)
     {
-      std::cerr << error_message << std::endl;
+      std::cerr << error_message << '\n';
     }
     OTEL_INTERNAL_LOG_ERROR(error_message);
 
diff --git a/exporters/otlp/test/otlp_http_exporter_test.cc b/exporters/otlp/test/otlp_http_exporter_test.cc
index e4f69f502b..4c4a6dbeb2 100644
--- a/exporters/otlp/test/otlp_http_exporter_test.cc
+++ b/exporters/otlp/test/otlp_http_exporter_test.cc
@@ -58,8 +58,7 @@ OtlpHttpClientOptions MakeOtlpHttpClientOptions(HttpRequestContentType content_t
   options.content_type  = content_type;
   options.console_debug = true;
   options.timeout       = std::chrono::system_clock::duration::zero();
-  options.http_headers.insert(
-      std::make_pair<const std::string, std::string>("Custom-Header-Key", "Custom-Header-Value"));
+  options.http_headers.insert(std::make_pair("Custom-Header-Key", "Custom-Header-Value"));
   OtlpHttpClientOptions otlp_http_client_options(
       options.url, false,                 /* ssl_insecure_skip_verify */
       "", /* ssl_ca_cert_path */ "",      /* ssl_ca_cert_string */
@@ -158,34 +157,35 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session, report_trace_id](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
-          auto check_json =
-              nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-          auto resource_span     = *check_json["resourceSpans"].begin();
-          auto scope_span        = *resource_span["scopeSpans"].begin();
-          auto span              = *scope_span["spans"].begin();
-          auto received_trace_id = span["traceId"].get<std::string>();
-          EXPECT_EQ(received_trace_id, report_trace_id);
-
-          auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-          ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-          if (custom_header != mock_session->GetRequest()->headers_.end())
-          {
-            EXPECT_EQ("Custom-Header-Value", custom_header->second);
-          }
-
-          auto user_agent_header = mock_session->GetRequest()->headers_.find("User-Agent");
-          ASSERT_TRUE(user_agent_header != mock_session->GetRequest()->headers_.end());
-          if (user_agent_header != mock_session->GetRequest()->headers_.end())
-          {
-            EXPECT_EQ(GetOtlpDefaultUserAgent(), user_agent_header->second);
-          }
-
-          // let the otlp_http_client to continue
-          http_client::nosend::Response response;
-          response.Finish(*callback.get());
-        });
+        .WillOnce(
+            [&mock_session, report_trace_id](
+                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
+              auto check_json =
+                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
+              auto resource_span     = *check_json["resourceSpans"].begin();
+              auto scope_span        = *resource_span["scopeSpans"].begin();
+              auto span              = *scope_span["spans"].begin();
+              auto received_trace_id = span["traceId"].get<std::string>();
+              EXPECT_EQ(received_trace_id, report_trace_id);
+
+              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
+              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
+              if (custom_header != mock_session->GetRequest()->headers_.end())
+              {
+                EXPECT_EQ("Custom-Header-Value", custom_header->second);
+              }
+
+              auto user_agent_header = mock_session->GetRequest()->headers_.find("User-Agent");
+              ASSERT_TRUE(user_agent_header != mock_session->GetRequest()->headers_.end());
+              if (user_agent_header != mock_session->GetRequest()->headers_.end())
+              {
+                EXPECT_EQ(GetOtlpDefaultUserAgent(), user_agent_header->second);
+              }
+
+              // let the otlp_http_client to continue
+              http_client::nosend::Response response;
+              response.Finish(*callback.get());
+            });
 
     child_span->End();
     parent_span->End();
@@ -249,38 +249,39 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session, report_trace_id](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
-          auto check_json =
-              nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-          auto resource_span     = *check_json["resourceSpans"].begin();
-          auto scope_span        = *resource_span["scopeSpans"].begin();
-          auto span              = *scope_span["spans"].begin();
-          auto received_trace_id = span["traceId"].get<std::string>();
-          EXPECT_EQ(received_trace_id, report_trace_id);
-
-          auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-          ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-          if (custom_header != mock_session->GetRequest()->headers_.end())
-          {
-            EXPECT_EQ("Custom-Header-Value", custom_header->second);
-          }
-
-          auto user_agent_header = mock_session->GetRequest()->headers_.find("User-Agent");
-          ASSERT_TRUE(user_agent_header != mock_session->GetRequest()->headers_.end());
-          if (user_agent_header != mock_session->GetRequest()->headers_.end())
-          {
-            EXPECT_EQ(GetOtlpDefaultUserAgent(), user_agent_header->second);
-          }
-
-          // let the otlp_http_client to continue
-          std::thread async_finish{[callback]() {
-            std::this_thread::sleep_for(std::chrono::milliseconds(100));
-            http_client::nosend::Response response;
-            response.Finish(*callback.get());
-          }};
-          async_finish.detach();
-        });
+        .WillOnce(
+            [&mock_session, report_trace_id](
+                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
+              auto check_json =
+                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
+              auto resource_span     = *check_json["resourceSpans"].begin();
+              auto scope_span        = *resource_span["scopeSpans"].begin();
+              auto span              = *scope_span["spans"].begin();
+              auto received_trace_id = span["traceId"].get<std::string>();
+              EXPECT_EQ(received_trace_id, report_trace_id);
+
+              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
+              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
+              if (custom_header != mock_session->GetRequest()->headers_.end())
+              {
+                EXPECT_EQ("Custom-Header-Value", custom_header->second);
+              }
+
+              auto user_agent_header = mock_session->GetRequest()->headers_.find("User-Agent");
+              ASSERT_TRUE(user_agent_header != mock_session->GetRequest()->headers_.end());
+              if (user_agent_header != mock_session->GetRequest()->headers_.end())
+              {
+                EXPECT_EQ(GetOtlpDefaultUserAgent(), user_agent_header->second);
+              }
+
+              // let the otlp_http_client to continue
+              std::thread async_finish{[callback]() {
+                std::this_thread::sleep_for(std::chrono::milliseconds(100));
+                http_client::nosend::Response response;
+                response.Finish(*callback.get());
+              }};
+              async_finish.detach();
+            });
 
     child_span->End();
     parent_span->End();
@@ -343,25 +344,27 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session, report_trace_id](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
-          opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request_body;
-          request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
-                                      static_cast<int>(mock_session->GetRequest()->body_.size()));
-          auto received_trace_id =
-              request_body.resource_spans(0).scope_spans(0).spans(0).trace_id();
-          EXPECT_EQ(received_trace_id, report_trace_id);
-
-          auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-          ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-          if (custom_header != mock_session->GetRequest()->headers_.end())
-          {
-            EXPECT_EQ("Custom-Header-Value", custom_header->second);
-          }
-
-          http_client::nosend::Response response;
-          response.Finish(*callback.get());
-        });
+        .WillOnce(
+            [&mock_session, report_trace_id](
+                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
+              opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request_body;
+              request_body.ParseFromArray(
+                  &mock_session->GetRequest()->body_[0],
+                  static_cast<int>(mock_session->GetRequest()->body_.size()));
+              auto received_trace_id =
+                  request_body.resource_spans(0).scope_spans(0).spans(0).trace_id();
+              EXPECT_EQ(received_trace_id, report_trace_id);
+
+              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
+              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
+              if (custom_header != mock_session->GetRequest()->headers_.end())
+              {
+                EXPECT_EQ("Custom-Header-Value", custom_header->second);
+              }
+
+              http_client::nosend::Response response;
+              response.Finish(*callback.get());
+            });
 
     child_span->End();
     parent_span->End();
@@ -424,30 +427,32 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session, report_trace_id](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
-          opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request_body;
-          request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
-                                      static_cast<int>(mock_session->GetRequest()->body_.size()));
-          auto received_trace_id =
-              request_body.resource_spans(0).scope_spans(0).spans(0).trace_id();
-          EXPECT_EQ(received_trace_id, report_trace_id);
-
-          auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-          ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-          if (custom_header != mock_session->GetRequest()->headers_.end())
-          {
-            EXPECT_EQ("Custom-Header-Value", custom_header->second);
-          }
-
-          // let the otlp_http_client to continue
-          std::thread async_finish{[callback]() {
-            std::this_thread::sleep_for(std::chrono::milliseconds(100));
-            http_client::nosend::Response response;
-            response.Finish(*callback.get());
-          }};
-          async_finish.detach();
-        });
+        .WillOnce(
+            [&mock_session, report_trace_id](
+                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
+              opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request_body;
+              request_body.ParseFromArray(
+                  &mock_session->GetRequest()->body_[0],
+                  static_cast<int>(mock_session->GetRequest()->body_.size()));
+              auto received_trace_id =
+                  request_body.resource_spans(0).scope_spans(0).spans(0).trace_id();
+              EXPECT_EQ(received_trace_id, report_trace_id);
+
+              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
+              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
+              if (custom_header != mock_session->GetRequest()->headers_.end())
+              {
+                EXPECT_EQ("Custom-Header-Value", custom_header->second);
+              }
+
+              // let the otlp_http_client to continue
+              std::thread async_finish{[callback]() {
+                std::this_thread::sleep_for(std::chrono::milliseconds(100));
+                http_client::nosend::Response response;
+                response.Finish(*callback.get());
+              }};
+              async_finish.detach();
+            });
 
     child_span->End();
     parent_span->End();
diff --git a/exporters/otlp/test/otlp_http_log_record_exporter_test.cc b/exporters/otlp/test/otlp_http_log_record_exporter_test.cc
index 5fbf95798f..35a0bb62e2 100644
--- a/exporters/otlp/test/otlp_http_log_record_exporter_test.cc
+++ b/exporters/otlp/test/otlp_http_log_record_exporter_test.cc
@@ -57,8 +57,7 @@ OtlpHttpClientOptions MakeOtlpHttpClientOptions(HttpRequestContentType content_t
   OtlpHttpLogRecordExporterOptions options;
   options.content_type  = content_type;
   options.console_debug = true;
-  options.http_headers.insert(
-      std::make_pair<const std::string, std::string>("Custom-Header-Key", "Custom-Header-Value"));
+  options.http_headers.insert(std::make_pair("Custom-Header-Key", "Custom-Header-Value"));
   OtlpHttpClientOptions otlp_http_client_options(
       options.url, false,                 /* ssl_insecure_skip_verify */
       "", /* ssl_ca_cert_path */ "",      /* ssl_ca_cert_string */
@@ -151,46 +150,47 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session, report_trace_id, report_span_id](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
-          auto check_json =
-              nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-          auto resource_logs     = *check_json["resourceLogs"].begin();
-          auto scope_logs        = *resource_logs["scopeLogs"].begin();
-          auto scope             = scope_logs["scope"];
-          auto log               = *scope_logs["logRecords"].begin();
-          auto received_trace_id = log["traceId"].get<std::string>();
-          auto received_span_id  = log["spanId"].get<std::string>();
-          EXPECT_EQ(received_trace_id, report_trace_id);
-          EXPECT_EQ(received_span_id, report_span_id);
-          EXPECT_EQ("Log message", log["body"]["stringValue"].get<std::string>());
-          EXPECT_LE(15, log["attributes"].size());
-          auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-          ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-          if (custom_header != mock_session->GetRequest()->headers_.end())
-          {
-            EXPECT_EQ("Custom-Header-Value", custom_header->second);
-          }
-
-          bool check_scope_attribute = false;
-          auto scope_attributes      = scope["attributes"];
-          for (auto &attribute : scope_attributes)
-          {
-            if (!attribute.is_object())
-            {
-              continue;
-            }
-            if ("scope_key1" == attribute["key"])
-            {
-              check_scope_attribute = true;
-              EXPECT_EQ("scope_value", attribute["value"]["stringValue"].get<std::string>());
-            }
-          }
-          ASSERT_TRUE(check_scope_attribute);
-
-          http_client::nosend::Response response;
-          response.Finish(*callback.get());
-        });
+        .WillOnce(
+            [&mock_session, report_trace_id, report_span_id](
+                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
+              auto check_json =
+                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
+              auto resource_logs     = *check_json["resourceLogs"].begin();
+              auto scope_logs        = *resource_logs["scopeLogs"].begin();
+              auto scope             = scope_logs["scope"];
+              auto log               = *scope_logs["logRecords"].begin();
+              auto received_trace_id = log["traceId"].get<std::string>();
+              auto received_span_id  = log["spanId"].get<std::string>();
+              EXPECT_EQ(received_trace_id, report_trace_id);
+              EXPECT_EQ(received_span_id, report_span_id);
+              EXPECT_EQ("Log message", log["body"]["stringValue"].get<std::string>());
+              EXPECT_LE(15, log["attributes"].size());
+              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
+              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
+              if (custom_header != mock_session->GetRequest()->headers_.end())
+              {
+                EXPECT_EQ("Custom-Header-Value", custom_header->second);
+              }
+
+              bool check_scope_attribute = false;
+              auto scope_attributes      = scope["attributes"];
+              for (auto &attribute : scope_attributes)
+              {
+                if (!attribute.is_object())
+                {
+                  continue;
+                }
+                if ("scope_key1" == attribute["key"])
+                {
+                  check_scope_attribute = true;
+                  EXPECT_EQ("scope_value", attribute["value"]["stringValue"].get<std::string>());
+                }
+              }
+              ASSERT_TRUE(check_scope_attribute);
+
+              http_client::nosend::Response response;
+              response.Finish(*callback.get());
+            });
 
     logger->EmitLogRecord(
         opentelemetry::logs::Severity::kInfo, "Log message",
@@ -268,57 +268,58 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session, report_trace_id, report_span_id](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
-          auto check_json =
-              nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-          auto resource_logs     = *check_json["resourceLogs"].begin();
-          auto scope_logs        = *resource_logs["scopeLogs"].begin();
-          auto schema_url        = scope_logs["schemaUrl"].get<std::string>();
-          auto scope             = scope_logs["scope"];
-          auto scope_name        = scope["name"];
-          auto scope_version     = scope["version"];
-          auto log               = *scope_logs["logRecords"].begin();
-          auto received_trace_id = log["traceId"].get<std::string>();
-          auto received_span_id  = log["spanId"].get<std::string>();
-          EXPECT_EQ(schema_url, "https://opentelemetry.io/schemas/1.2.0");
-          EXPECT_EQ(scope_name, "opentelelemtry_library");
-          EXPECT_EQ(scope_version, "1.2.0");
-          EXPECT_EQ(received_trace_id, report_trace_id);
-          EXPECT_EQ(received_span_id, report_span_id);
-          EXPECT_EQ("Log message", log["body"]["stringValue"].get<std::string>());
-          EXPECT_LE(15, log["attributes"].size());
-          auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-          ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-          if (custom_header != mock_session->GetRequest()->headers_.end())
-          {
-            EXPECT_EQ("Custom-Header-Value", custom_header->second);
-          }
-
-          bool check_scope_attribute = false;
-          auto scope_attributes      = scope["attributes"];
-          for (auto &attribute : scope_attributes)
-          {
-            if (!attribute.is_object())
-            {
-              continue;
-            }
-            if ("scope_key1" == attribute["key"])
-            {
-              check_scope_attribute = true;
-              EXPECT_EQ("scope_value", attribute["value"]["stringValue"].get<std::string>());
-            }
-          }
-          ASSERT_TRUE(check_scope_attribute);
-
-          // let the otlp_http_client to continue
-          std::thread async_finish{[callback]() {
-            std::this_thread::sleep_for(std::chrono::milliseconds(100));
-            http_client::nosend::Response response;
-            response.Finish(*callback.get());
-          }};
-          async_finish.detach();
-        });
+        .WillOnce(
+            [&mock_session, report_trace_id, report_span_id](
+                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
+              auto check_json =
+                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
+              auto resource_logs     = *check_json["resourceLogs"].begin();
+              auto scope_logs        = *resource_logs["scopeLogs"].begin();
+              auto schema_url        = scope_logs["schemaUrl"].get<std::string>();
+              auto scope             = scope_logs["scope"];
+              auto scope_name        = scope["name"];
+              auto scope_version     = scope["version"];
+              auto log               = *scope_logs["logRecords"].begin();
+              auto received_trace_id = log["traceId"].get<std::string>();
+              auto received_span_id  = log["spanId"].get<std::string>();
+              EXPECT_EQ(schema_url, "https://opentelemetry.io/schemas/1.2.0");
+              EXPECT_EQ(scope_name, "opentelelemtry_library");
+              EXPECT_EQ(scope_version, "1.2.0");
+              EXPECT_EQ(received_trace_id, report_trace_id);
+              EXPECT_EQ(received_span_id, report_span_id);
+              EXPECT_EQ("Log message", log["body"]["stringValue"].get<std::string>());
+              EXPECT_LE(15, log["attributes"].size());
+              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
+              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
+              if (custom_header != mock_session->GetRequest()->headers_.end())
+              {
+                EXPECT_EQ("Custom-Header-Value", custom_header->second);
+              }
+
+              bool check_scope_attribute = false;
+              auto scope_attributes      = scope["attributes"];
+              for (auto &attribute : scope_attributes)
+              {
+                if (!attribute.is_object())
+                {
+                  continue;
+                }
+                if ("scope_key1" == attribute["key"])
+                {
+                  check_scope_attribute = true;
+                  EXPECT_EQ("scope_value", attribute["value"]["stringValue"].get<std::string>());
+                }
+              }
+              ASSERT_TRUE(check_scope_attribute);
+
+              // let the otlp_http_client to continue
+              std::thread async_finish{[callback]() {
+                std::this_thread::sleep_for(std::chrono::milliseconds(100));
+                http_client::nosend::Response response;
+                response.Finish(*callback.get());
+              }};
+              async_finish.detach();
+            });
 
     logger->EmitLogRecord(
         opentelemetry::logs::Severity::kInfo, "Log message",
@@ -390,47 +391,49 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session, report_trace_id, report_span_id](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
-          opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest request_body;
-          request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
-                                      static_cast<int>(mock_session->GetRequest()->body_.size()));
-          auto scope_log = request_body.resource_logs(0).scope_logs(0);
-          EXPECT_EQ(scope_log.schema_url(), "https://opentelemetry.io/schemas/1.2.0");
-          EXPECT_EQ(scope_log.scope().name(), "opentelelemtry_library");
-          EXPECT_EQ(scope_log.scope().version(), "1.2.0");
-          auto received_log = scope_log.log_records(0);
-          EXPECT_EQ(received_log.trace_id(), report_trace_id);
-          EXPECT_EQ(received_log.span_id(), report_span_id);
-          EXPECT_EQ("Log message", received_log.body().string_value());
-          EXPECT_LE(15, received_log.attributes_size());
-          bool check_service_name = false;
-          for (auto &attribute : received_log.attributes())
-          {
-            if ("service.name" == attribute.key())
-            {
-              check_service_name = true;
-              EXPECT_EQ("unit_test_service", attribute.value().string_value());
-            }
-          }
-          ASSERT_TRUE(check_service_name);
-
-          bool check_scope_attribute = false;
-          for (auto &attribute : scope_log.scope().attributes())
-          {
-            if ("scope_key1" == attribute.key())
-            {
-              check_scope_attribute = true;
-              EXPECT_EQ("scope_value", attribute.value().string_value());
-            }
-          }
-          ASSERT_TRUE(check_scope_attribute);
-
-          // let the otlp_http_client to continue
-
-          http_client::nosend::Response response;
-          response.Finish(*callback.get());
-        });
+        .WillOnce(
+            [&mock_session, report_trace_id, report_span_id](
+                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
+              opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest request_body;
+              request_body.ParseFromArray(
+                  &mock_session->GetRequest()->body_[0],
+                  static_cast<int>(mock_session->GetRequest()->body_.size()));
+              auto scope_log = request_body.resource_logs(0).scope_logs(0);
+              EXPECT_EQ(scope_log.schema_url(), "https://opentelemetry.io/schemas/1.2.0");
+              EXPECT_EQ(scope_log.scope().name(), "opentelelemtry_library");
+              EXPECT_EQ(scope_log.scope().version(), "1.2.0");
+              const auto &received_log = scope_log.log_records(0);
+              EXPECT_EQ(received_log.trace_id(), report_trace_id);
+              EXPECT_EQ(received_log.span_id(), report_span_id);
+              EXPECT_EQ("Log message", received_log.body().string_value());
+              EXPECT_LE(15, received_log.attributes_size());
+              bool check_service_name = false;
+              for (auto &attribute : received_log.attributes())
+              {
+                if ("service.name" == attribute.key())
+                {
+                  check_service_name = true;
+                  EXPECT_EQ("unit_test_service", attribute.value().string_value());
+                }
+              }
+              ASSERT_TRUE(check_service_name);
+
+              bool check_scope_attribute = false;
+              for (auto &attribute : scope_log.scope().attributes())
+              {
+                if ("scope_key1" == attribute.key())
+                {
+                  check_scope_attribute = true;
+                  EXPECT_EQ("scope_value", attribute.value().string_value());
+                }
+              }
+              ASSERT_TRUE(check_scope_attribute);
+
+              // let the otlp_http_client to continue
+
+              http_client::nosend::Response response;
+              response.Finish(*callback.get());
+            });
 
     logger->EmitLogRecord(
         opentelemetry::logs::Severity::kInfo, "Log message",
@@ -503,51 +506,53 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session, report_trace_id, report_span_id, schema_url](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
-          opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest request_body;
-          request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
-                                      static_cast<int>(mock_session->GetRequest()->body_.size()));
-          auto &scope_log   = request_body.resource_logs(0).scope_logs(0);
-          auto received_log = scope_log.log_records(0);
-          EXPECT_EQ(received_log.trace_id(), report_trace_id);
-          EXPECT_EQ(received_log.span_id(), report_span_id);
-          EXPECT_EQ("Log message", received_log.body().string_value());
-          EXPECT_LE(15, received_log.attributes_size());
-          bool check_service_name = false;
-          for (auto &attribute : received_log.attributes())
-          {
-            if ("service.name" == attribute.key())
-            {
-              check_service_name = true;
-              EXPECT_EQ("unit_test_service", attribute.value().string_value());
-            }
-          }
-          ASSERT_TRUE(check_service_name);
-
-          auto &scope = scope_log.scope();
-          EXPECT_EQ(scope.name(), "opentelelemtry_library");
-          EXPECT_EQ(scope_log.schema_url(), schema_url);
-          bool check_scope_attribute = false;
-          for (auto &attribute : scope.attributes())
-          {
-            if ("scope_key1" == attribute.key())
-            {
-              check_scope_attribute = true;
-              EXPECT_EQ("scope_value", attribute.value().string_value());
-            }
-          }
-          ASSERT_TRUE(check_scope_attribute);
-
-          // let the otlp_http_client to continue
-
-          std::thread async_finish{[callback]() {
-            std::this_thread::sleep_for(std::chrono::milliseconds(100));
-            http_client::nosend::Response response;
-            response.Finish(*callback.get());
-          }};
-          async_finish.detach();
-        });
+        .WillOnce(
+            [&mock_session, report_trace_id, report_span_id, schema_url](
+                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
+              opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest request_body;
+              request_body.ParseFromArray(
+                  &mock_session->GetRequest()->body_[0],
+                  static_cast<int>(mock_session->GetRequest()->body_.size()));
+              auto &scope_log   = request_body.resource_logs(0).scope_logs(0);
+              auto received_log = scope_log.log_records(0);
+              EXPECT_EQ(received_log.trace_id(), report_trace_id);
+              EXPECT_EQ(received_log.span_id(), report_span_id);
+              EXPECT_EQ("Log message", received_log.body().string_value());
+              EXPECT_LE(15, received_log.attributes_size());
+              bool check_service_name = false;
+              for (auto &attribute : received_log.attributes())
+              {
+                if ("service.name" == attribute.key())
+                {
+                  check_service_name = true;
+                  EXPECT_EQ("unit_test_service", attribute.value().string_value());
+                }
+              }
+              ASSERT_TRUE(check_service_name);
+
+              auto &scope = scope_log.scope();
+              EXPECT_EQ(scope.name(), "opentelelemtry_library");
+              EXPECT_EQ(scope_log.schema_url(), schema_url);
+              bool check_scope_attribute = false;
+              for (auto &attribute : scope.attributes())
+              {
+                if ("scope_key1" == attribute.key())
+                {
+                  check_scope_attribute = true;
+                  EXPECT_EQ("scope_value", attribute.value().string_value());
+                }
+              }
+              ASSERT_TRUE(check_scope_attribute);
+
+              // let the otlp_http_client to continue
+
+              std::thread async_finish{[callback]() {
+                std::this_thread::sleep_for(std::chrono::milliseconds(100));
+                http_client::nosend::Response response;
+                response.Finish(*callback.get());
+              }};
+              async_finish.detach();
+            });
 
     logger->EmitLogRecord(
         opentelemetry::logs::Severity::kInfo, "Log message",
diff --git a/exporters/otlp/test/otlp_http_metric_exporter_test.cc b/exporters/otlp/test/otlp_http_metric_exporter_test.cc
index 1e5fe6469f..174597248b 100644
--- a/exporters/otlp/test/otlp_http_metric_exporter_test.cc
+++ b/exporters/otlp/test/otlp_http_metric_exporter_test.cc
@@ -64,8 +64,7 @@ OtlpHttpClientOptions MakeOtlpHttpClientOptions(HttpRequestContentType content_t
   OtlpHttpMetricExporterOptions options;
   options.content_type  = content_type;
   options.console_debug = true;
-  options.http_headers.insert(
-      std::make_pair<const std::string, std::string>("Custom-Header-Key", "Custom-Header-Value"));
+  options.http_headers.insert(std::make_pair("Custom-Header-Key", "Custom-Header-Value"));
   OtlpHttpClientOptions otlp_http_client_options(
       options.url, false,                 /* ssl_insecure_skip_verify */
       "", /* ssl_ca_cert_path */ "",      /* ssl_ca_cert_string */
@@ -154,36 +153,37 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
-          auto check_json =
-              nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-
-          auto resource_metrics = *check_json["resourceMetrics"].begin();
-          auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
-          auto scope            = scope_metrics["scope"];
-          EXPECT_EQ("library_name", scope["name"].get<std::string>());
-          EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
-
-          auto metric = *scope_metrics["metrics"].begin();
-          EXPECT_EQ("metrics_library_name", metric["name"].get<std::string>());
-          EXPECT_EQ("metrics_description", metric["description"].get<std::string>());
-          EXPECT_EQ("metrics_unit", metric["unit"].get<std::string>());
-
-          auto data_points = metric["sum"]["dataPoints"];
-          EXPECT_EQ(10.0, data_points[0]["asDouble"].get<double>());
-          EXPECT_EQ(20.0, data_points[1]["asDouble"].get<double>());
-
-          auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-          ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-          if (custom_header != mock_session->GetRequest()->headers_.end())
-          {
-            EXPECT_EQ("Custom-Header-Value", custom_header->second);
-          }
-
-          http_client::nosend::Response response;
-          response.Finish(*callback.get());
-        });
+        .WillOnce(
+            [&mock_session](
+                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
+              auto check_json =
+                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
+
+              auto resource_metrics = *check_json["resourceMetrics"].begin();
+              auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
+              auto scope            = scope_metrics["scope"];
+              EXPECT_EQ("library_name", scope["name"].get<std::string>());
+              EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
+
+              auto metric = *scope_metrics["metrics"].begin();
+              EXPECT_EQ("metrics_library_name", metric["name"].get<std::string>());
+              EXPECT_EQ("metrics_description", metric["description"].get<std::string>());
+              EXPECT_EQ("metrics_unit", metric["unit"].get<std::string>());
+
+              auto data_points = metric["sum"]["dataPoints"];
+              EXPECT_EQ(10.0, data_points[0]["asDouble"].get<double>());
+              EXPECT_EQ(20.0, data_points[1]["asDouble"].get<double>());
+
+              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
+              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
+              if (custom_header != mock_session->GetRequest()->headers_.end())
+              {
+                EXPECT_EQ("Custom-Header-Value", custom_header->second);
+              }
+
+              http_client::nosend::Response response;
+              response.Finish(*callback.get());
+            });
 
     auto result = exporter->Export(data);
     EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
@@ -237,7 +237,8 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
 
     EXPECT_CALL(*mock_session, SendRequest)
         .WillOnce([&mock_session](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
+                      const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
+                          &callback) {
           opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest request_body;
           request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
                                       static_cast<int>(mock_session->GetRequest()->body_.size()));
@@ -335,36 +336,37 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
-          auto check_json =
-              nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-
-          auto resource_metrics = *check_json["resourceMetrics"].begin();
-          auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
-          auto scope            = scope_metrics["scope"];
-          EXPECT_EQ("library_name", scope["name"].get<std::string>());
-          EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
-
-          auto metric = *scope_metrics["metrics"].begin();
-          EXPECT_EQ("metrics_library_name", metric["name"].get<std::string>());
-          EXPECT_EQ("metrics_description", metric["description"].get<std::string>());
-          EXPECT_EQ("metrics_unit", metric["unit"].get<std::string>());
-
-          auto data_points = metric["gauge"]["dataPoints"];
-          EXPECT_EQ(10.0, data_points[0]["asDouble"].get<double>());
-          EXPECT_EQ(20l, JsonToInteger<int64_t>(data_points[1]["asInt"]));
-
-          auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-          ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-          if (custom_header != mock_session->GetRequest()->headers_.end())
-          {
-            EXPECT_EQ("Custom-Header-Value", custom_header->second);
-          }
-
-          http_client::nosend::Response response;
-          response.Finish(*callback.get());
-        });
+        .WillOnce(
+            [&mock_session](
+                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
+              auto check_json =
+                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
+
+              auto resource_metrics = *check_json["resourceMetrics"].begin();
+              auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
+              auto scope            = scope_metrics["scope"];
+              EXPECT_EQ("library_name", scope["name"].get<std::string>());
+              EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
+
+              auto metric = *scope_metrics["metrics"].begin();
+              EXPECT_EQ("metrics_library_name", metric["name"].get<std::string>());
+              EXPECT_EQ("metrics_description", metric["description"].get<std::string>());
+              EXPECT_EQ("metrics_unit", metric["unit"].get<std::string>());
+
+              auto data_points = metric["gauge"]["dataPoints"];
+              EXPECT_EQ(10.0, data_points[0]["asDouble"].get<double>());
+              EXPECT_EQ(20l, JsonToInteger<int64_t>(data_points[1]["asInt"]));
+
+              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
+              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
+              if (custom_header != mock_session->GetRequest()->headers_.end())
+              {
+                EXPECT_EQ("Custom-Header-Value", custom_header->second);
+              }
+
+              http_client::nosend::Response response;
+              response.Finish(*callback.get());
+            });
 
     auto result = exporter->Export(data);
     EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
@@ -427,7 +429,8 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
 
     EXPECT_CALL(*mock_session, SendRequest)
         .WillOnce([&mock_session](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
+                      const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
+                          &callback) {
           opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest request_body;
           request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
                                       static_cast<int>(mock_session->GetRequest()->body_.size()));
@@ -530,71 +533,72 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     auto mock_session =
         std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
     EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
-          auto check_json =
-              nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-
-          auto resource_metrics = *check_json["resourceMetrics"].begin();
-          auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
-          auto scope            = scope_metrics["scope"];
-          EXPECT_EQ("library_name", scope["name"].get<std::string>());
-          EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
-
-          auto metric = *scope_metrics["metrics"].begin();
-          EXPECT_EQ("metrics_library_name", metric["name"].get<std::string>());
-          EXPECT_EQ("metrics_description", metric["description"].get<std::string>());
-          EXPECT_EQ("metrics_unit", metric["unit"].get<std::string>());
-
-          auto data_points = metric["histogram"]["dataPoints"];
-          EXPECT_EQ(3, JsonToInteger<int64_t>(data_points[0]["count"]));
-          EXPECT_EQ(900.5, data_points[0]["sum"].get<double>());
-          EXPECT_EQ(1.8, data_points[0]["min"].get<double>());
-          EXPECT_EQ(19, data_points[0]["max"].get<double>());
-          EXPECT_EQ(4, data_points[0]["bucketCounts"].size());
-          if (4 == data_points[0]["bucketCounts"].size())
-          {
-            EXPECT_EQ(200, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][0]));
-            EXPECT_EQ(300, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][1]));
-            EXPECT_EQ(400, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][2]));
-            EXPECT_EQ(500, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][3]));
-          }
-          EXPECT_EQ(3, data_points[0]["explicitBounds"].size());
-          if (3 == data_points[0]["explicitBounds"].size())
-          {
-            EXPECT_EQ(10.1, data_points[0]["explicitBounds"][0].get<double>());
-            EXPECT_EQ(20.2, data_points[0]["explicitBounds"][1].get<double>());
-            EXPECT_EQ(30.2, data_points[0]["explicitBounds"][2].get<double>());
-          }
-
-          EXPECT_EQ(3, JsonToInteger<int64_t>(data_points[1]["count"]));
-          EXPECT_EQ(900.0, data_points[1]["sum"].get<double>());
-          EXPECT_EQ(4, data_points[1]["bucketCounts"].size());
-          if (4 == data_points[1]["bucketCounts"].size())
-          {
-            EXPECT_EQ(200, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][0]));
-            EXPECT_EQ(300, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][1]));
-            EXPECT_EQ(400, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][2]));
-            EXPECT_EQ(500, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][3]));
-          }
-          EXPECT_EQ(3, data_points[1]["explicitBounds"].size());
-          if (3 == data_points[1]["explicitBounds"].size())
-          {
-            EXPECT_EQ(10.0, data_points[1]["explicitBounds"][0].get<double>());
-            EXPECT_EQ(20.0, data_points[1]["explicitBounds"][1].get<double>());
-            EXPECT_EQ(30.0, data_points[1]["explicitBounds"][2].get<double>());
-          }
-
-          auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-          ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-          if (custom_header != mock_session->GetRequest()->headers_.end())
-          {
-            EXPECT_EQ("Custom-Header-Value", custom_header->second);
-          }
-
-          http_client::nosend::Response response;
-          response.Finish(*callback.get());
-        });
+        .WillOnce(
+            [&mock_session](
+                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
+              auto check_json =
+                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
+
+              auto resource_metrics = *check_json["resourceMetrics"].begin();
+              auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
+              auto scope            = scope_metrics["scope"];
+              EXPECT_EQ("library_name", scope["name"].get<std::string>());
+              EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
+
+              auto metric = *scope_metrics["metrics"].begin();
+              EXPECT_EQ("metrics_library_name", metric["name"].get<std::string>());
+              EXPECT_EQ("metrics_description", metric["description"].get<std::string>());
+              EXPECT_EQ("metrics_unit", metric["unit"].get<std::string>());
+
+              auto data_points = metric["histogram"]["dataPoints"];
+              EXPECT_EQ(3, JsonToInteger<int64_t>(data_points[0]["count"]));
+              EXPECT_EQ(900.5, data_points[0]["sum"].get<double>());
+              EXPECT_EQ(1.8, data_points[0]["min"].get<double>());
+              EXPECT_EQ(19, data_points[0]["max"].get<double>());
+              EXPECT_EQ(4, data_points[0]["bucketCounts"].size());
+              if (4 == data_points[0]["bucketCounts"].size())
+              {
+                EXPECT_EQ(200, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][0]));
+                EXPECT_EQ(300, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][1]));
+                EXPECT_EQ(400, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][2]));
+                EXPECT_EQ(500, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][3]));
+              }
+              EXPECT_EQ(3, data_points[0]["explicitBounds"].size());
+              if (3 == data_points[0]["explicitBounds"].size())
+              {
+                EXPECT_EQ(10.1, data_points[0]["explicitBounds"][0].get<double>());
+                EXPECT_EQ(20.2, data_points[0]["explicitBounds"][1].get<double>());
+                EXPECT_EQ(30.2, data_points[0]["explicitBounds"][2].get<double>());
+              }
+
+              EXPECT_EQ(3, JsonToInteger<int64_t>(data_points[1]["count"]));
+              EXPECT_EQ(900.0, data_points[1]["sum"].get<double>());
+              EXPECT_EQ(4, data_points[1]["bucketCounts"].size());
+              if (4 == data_points[1]["bucketCounts"].size())
+              {
+                EXPECT_EQ(200, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][0]));
+                EXPECT_EQ(300, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][1]));
+                EXPECT_EQ(400, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][2]));
+                EXPECT_EQ(500, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][3]));
+              }
+              EXPECT_EQ(3, data_points[1]["explicitBounds"].size());
+              if (3 == data_points[1]["explicitBounds"].size())
+              {
+                EXPECT_EQ(10.0, data_points[1]["explicitBounds"][0].get<double>());
+                EXPECT_EQ(20.0, data_points[1]["explicitBounds"][1].get<double>());
+                EXPECT_EQ(30.0, data_points[1]["explicitBounds"][2].get<double>());
+              }
+
+              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
+              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
+              if (custom_header != mock_session->GetRequest()->headers_.end())
+              {
+                EXPECT_EQ("Custom-Header-Value", custom_header->second);
+              }
+
+              http_client::nosend::Response response;
+              response.Finish(*callback.get());
+            });
 
     auto result = exporter->Export(data);
     EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
@@ -661,7 +665,8 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
 
     EXPECT_CALL(*mock_session, SendRequest)
         .WillOnce([&mock_session](
-                      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) {
+                      const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
+                          &callback) {
           opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest request_body;
           request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
                                       static_cast<int>(mock_session->GetRequest()->body_.size()));
diff --git a/exporters/otlp/test/otlp_metrics_serialization_test.cc b/exporters/otlp/test/otlp_metrics_serialization_test.cc
index b945cb28fe..2ad76dfd1d 100644
--- a/exporters/otlp/test/otlp_metrics_serialization_test.cc
+++ b/exporters/otlp/test/otlp_metrics_serialization_test.cc
@@ -200,7 +200,7 @@ TEST(OtlpMetricSerializationTest, Counter)
   EXPECT_EQ(sum.is_monotonic(), true);
   for (size_t i = 0; i < 1; i++)
   {
-    auto proto_number_point = sum.data_points(i);
+    const auto &proto_number_point = sum.data_points(i);
     EXPECT_EQ(proto_number_point.as_double(), i == 0 ? 10.2 : 20.2);
   }
 
@@ -230,7 +230,7 @@ TEST(OtlpMetricSerializationTest, Histogram)
             proto::metrics::v1::AggregationTemporality::AGGREGATION_TEMPORALITY_CUMULATIVE);
   for (size_t i = 0; i < 1; i++)
   {
-    auto proto_number_point = histogram.data_points(i);
+    const auto &proto_number_point = histogram.data_points(i);
     EXPECT_EQ(proto_number_point.sum(), i == 0 ? 100.2 : 200.2);
   }
 
@@ -244,7 +244,7 @@ TEST(OtlpMetricSerializationTest, ObservableGauge)
   otlp_exporter::OtlpMetricUtils::ConvertGaugeMetric(data, &gauge);
   for (size_t i = 0; i < 1; i++)
   {
-    auto proto_number_point = gauge.data_points(i);
+    const auto &proto_number_point = gauge.data_points(i);
     EXPECT_EQ(proto_number_point.as_double(), i == 0 ? 30.2 : 50.2);
   }
 
diff --git a/exporters/otlp/test/otlp_recordable_test.cc b/exporters/otlp/test/otlp_recordable_test.cc
index caa17c8a46..537f10340d 100644
--- a/exporters/otlp/test/otlp_recordable_test.cc
+++ b/exporters/otlp/test/otlp_recordable_test.cc
@@ -216,7 +216,7 @@ TEST(OtlpRecordable, SetResource)
   bool found_service_name = false;
   for (int i = 0; i < proto_resource.attributes_size(); i++)
   {
-    auto attr = proto_resource.attributes(static_cast<int>(i));
+    const auto &attr = proto_resource.attributes(static_cast<int>(i));
     if (attr.key() == service_name_key && attr.value().string_value() == service_name)
     {
       found_service_name = true;
@@ -322,7 +322,7 @@ TEST(OtlpRecordable, PopulateRequest)
   OtlpRecordableUtils::PopulateRequest(spans_span, &req);
 
   EXPECT_EQ(req.resource_spans().size(), 2);
-  for (auto resource_spans : req.resource_spans())
+  for (const auto &resource_spans : req.resource_spans())
   {
     auto service_name     = resource_spans.resource().attributes(0).value().string_value();
     auto scope_spans_size = resource_spans.scope_spans().size();
@@ -359,7 +359,7 @@ TEST(OtlpRecordable, PopulateRequestMissing)
   OtlpRecordableUtils::PopulateRequest(spans_span, &req);
 
   EXPECT_EQ(req.resource_spans().size(), 2);
-  for (auto resource_spans : req.resource_spans())
+  for (const auto &resource_spans : req.resource_spans())
   {
     // Both should have scope spans
     EXPECT_EQ(resource_spans.scope_spans().size(), 1);
diff --git a/exporters/prometheus/src/exporter_utils.cc b/exporters/prometheus/src/exporter_utils.cc
index 68d8586bcc..35ee748273 100644
--- a/exporters/prometheus/src/exporter_utils.cc
+++ b/exporters/prometheus/src/exporter_utils.cc
@@ -88,7 +88,7 @@ inline std::string Sanitize(std::string name, const T &valid)
  */
 std::string SanitizeLabel(std::string label_key)
 {
-  return Sanitize(label_key, [](int i, char c) {
+  return Sanitize(std::move(label_key), [](int i, char c) {
     return (c >= 'a' && c <= 'z') ||  //
            (c >= 'A' && c <= 'Z') ||  //
            c == '_' ||                //
@@ -396,7 +396,7 @@ std::string PrometheusExporterUtils::RemoveUnitPortionInBraces(const std::string
 std::string PrometheusExporterUtils::ConvertRateExpressedToPrometheusUnit(
     const std::string &rate_expressed_unit)
 {
-  size_t pos = rate_expressed_unit.find("/");
+  size_t pos = rate_expressed_unit.find('/');
   if (pos == std::string::npos)
   {
     return rate_expressed_unit;
diff --git a/exporters/prometheus/test/exporter_test.cc b/exporters/prometheus/test/exporter_test.cc
index 3bda4c3d7b..b268ac8514 100644
--- a/exporters/prometheus/test/exporter_test.cc
+++ b/exporters/prometheus/test/exporter_test.cc
@@ -16,7 +16,6 @@
  * private constructor is only to be used here for testing
  */
 
-using opentelemetry::exporter::metrics::PrometheusCollector;
 using opentelemetry::exporter::metrics::PrometheusExporter;
 using opentelemetry::exporter::metrics::PrometheusExporterOptions;
 using opentelemetry::sdk::metrics::AggregationTemporality;
diff --git a/exporters/prometheus/test/exporter_utils_test.cc b/exporters/prometheus/test/exporter_utils_test.cc
index b876e7369c..7ad5eee1fd 100644
--- a/exporters/prometheus/test/exporter_utils_test.cc
+++ b/exporters/prometheus/test/exporter_utils_test.cc
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
+
+#include <utility>
 #include "prometheus/metric_family.h"
 #include "prometheus/metric_type.h"
 
@@ -24,7 +26,7 @@ class SanitizeNameTester
 public:
   static std::string sanitize(std::string name)
   {
-    return PrometheusExporterUtils::SanitizeNames(name);
+    return PrometheusExporterUtils::SanitizeNames(std::move(name));
   }
   static std::string getPrometheusUnit(const std::string &unit_abbreviation)
   {
@@ -104,14 +106,13 @@ void assert_basic(prometheus_client::MetricFamily &metric,
       ASSERT_TRUE(false);
       break;
     case prometheus::MetricType::Untyped:
-      break;
     default:
       break;
   }
 }
 
 void assert_histogram(prometheus_client::MetricFamily &metric,
-                      std::list<double> boundaries,
+                      const std::list<double> &boundaries,
                       std::vector<int> correct)
 {
   int cumulative_count = 0;
diff --git a/exporters/zipkin/src/zipkin_exporter.cc b/exporters/zipkin/src/zipkin_exporter.cc
index e6d3ce8b26..a554cbf4cc 100644
--- a/exporters/zipkin/src/zipkin_exporter.cc
+++ b/exporters/zipkin/src/zipkin_exporter.cc
@@ -1,6 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+// NOLINTNEXTLINE
 #define _WINSOCKAPI_  // stops including winsock.h
 
 #include <stdint.h>
@@ -105,7 +106,6 @@ sdk::common::ExportResult ZipkinExporter::Export(
     }
     return sdk::common::ExportResult::kFailure;
   }
-  return sdk::common::ExportResult::kSuccess;
 }
 
 void ZipkinExporter::InitializeLocalEndpoint()
diff --git a/exporters/zipkin/test/zipkin_exporter_test.cc b/exporters/zipkin/test/zipkin_exporter_test.cc
index 18c47bcab5..8e58f83d2e 100644
--- a/exporters/zipkin/test/zipkin_exporter_test.cc
+++ b/exporters/zipkin/test/zipkin_exporter_test.cc
@@ -17,6 +17,7 @@
 #  include "nlohmann/json.hpp"
 
 #  include <string>
+#  include <utility>
 
 #  if defined(_MSC_VER)
 #    include "opentelemetry/sdk/common/env_variables.h"
@@ -47,7 +48,7 @@ class ZipkinExporterTestPeer : public ::testing::Test
   std::unique_ptr<sdk::trace::SpanExporter> GetExporter(
       std::shared_ptr<opentelemetry::ext::http::client::HttpClientSync> http_client)
   {
-    return std::unique_ptr<sdk::trace::SpanExporter>(new ZipkinExporter(http_client));
+    return std::unique_ptr<sdk::trace::SpanExporter>(new ZipkinExporter(std::move(http_client)));
   }
 
   // Get the options associated with the given exporter.
diff --git a/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h b/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h
index 58dd154bb7..b6654ce3ad 100644
--- a/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h
+++ b/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h
@@ -124,7 +124,8 @@ class HttpOperation
                                 double ulnow);
 #endif
 public:
-  void DispatchEvent(opentelemetry::ext::http::client::SessionState type, std::string reason = "");
+  void DispatchEvent(opentelemetry::ext::http::client::SessionState type,
+                     const std::string &reason = "");
 
   /**
    * Create local CURL instance for url and body
diff --git a/ext/src/dll/dllmain.cc b/ext/src/dll/dllmain.cc
index 1812377374..df1d2bc70d 100644
--- a/ext/src/dll/dllmain.cc
+++ b/ext/src/dll/dllmain.cc
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include <windows.h>
+#include <windows.h>  // NOLINT
 
 // Include API header files here for exporting
 #include <opentelemetry/trace/provider.h>
diff --git a/ext/src/http/client/curl/http_client_curl.cc b/ext/src/http/client/curl/http_client_curl.cc
index 38ca2e7348..67b0b93a54 100644
--- a/ext/src/http/client/curl/http_client_curl.cc
+++ b/ext/src/http/client/curl/http_client_curl.cc
@@ -562,7 +562,7 @@ bool HttpClient::doAbortSessions()
   }
 
   bool has_data = false;
-  for (auto session : pending_to_abort_sessions)
+  for (const auto &session : pending_to_abort_sessions)
   {
     if (!session.second)
     {
diff --git a/ext/src/http/client/curl/http_operation_curl.cc b/ext/src/http/client/curl/http_operation_curl.cc
index f82c17ccc5..4de014fd82 100644
--- a/ext/src/http/client/curl/http_operation_curl.cc
+++ b/ext/src/http/client/curl/http_operation_curl.cc
@@ -240,7 +240,7 @@ int HttpOperation::OnProgressCallback(void *clientp,
 #endif
 
 void HttpOperation::DispatchEvent(opentelemetry::ext::http::client::SessionState type,
-                                  std::string reason)
+                                  const std::string &reason)
 {
   if (event_handle_ != nullptr)
   {
@@ -273,7 +273,7 @@ HttpOperation::HttpOperation(opentelemetry::ext::http::client::Method method,
       last_curl_result_(CURLE_OK),
       event_handle_(event_handle),
       method_(method),
-      url_(url),
+      url_(std::move(url)),
       ssl_options_(ssl_options),
       // Local vars
       request_headers_(request_headers),
@@ -453,7 +453,7 @@ void HttpOperation::Cleanup()
 #  define HAVE_TLS_VERSION
 #endif
 
-static long parse_min_ssl_version(std::string version)
+static long parse_min_ssl_version(const std::string &version)
 {
 #ifdef HAVE_TLS_VERSION
   if (version == "1.2")
@@ -470,7 +470,7 @@ static long parse_min_ssl_version(std::string version)
   return 0;
 }
 
-static long parse_max_ssl_version(std::string version)
+static long parse_max_ssl_version(const std::string &version)
 {
 #ifdef HAVE_TLS_VERSION
   if (version == "1.2")
diff --git a/ext/test/http/curl_http_test.cc b/ext/test/http/curl_http_test.cc
index 6e30323eeb..0dc6e5d5e8 100644
--- a/ext/test/http/curl_http_test.cc
+++ b/ext/test/http/curl_http_test.cc
@@ -12,6 +12,7 @@
 #include <fstream>
 #include <memory>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #define HTTP_PORT 19000
@@ -74,7 +75,9 @@ class PostEventHandler : public CustomEventHandler
 class FinishInCallbackHandler : public CustomEventHandler
 {
 public:
-  FinishInCallbackHandler(std::shared_ptr<http_client::Session> session) : session_(session) {}
+  FinishInCallbackHandler(std::shared_ptr<http_client::Session> session)
+      : session_(std::move(session))
+  {}
 
   void OnResponse(http_client::Response &response) noexcept override
   {
diff --git a/ext/test/w3c_tracecontext_test/main.cc b/ext/test/w3c_tracecontext_test/main.cc
index 349626e219..d9819cde0d 100644
--- a/ext/test/w3c_tracecontext_test/main.cc
+++ b/ext/test/w3c_tracecontext_test/main.cc
@@ -75,10 +75,10 @@ struct Uri
   uint16_t port;
   std::string path;
 
-  Uri(std::string uri)
+  Uri(const std::string &uri)
   {
-    size_t host_end = uri.substr(7, std::string::npos).find(":");
-    size_t port_end = uri.substr(host_end + 1, std::string::npos).find("/");
+    size_t host_end = uri.substr(7, std::string::npos).find(':');
+    size_t port_end = uri.substr(host_end + 1, std::string::npos).find('/');
 
     host = uri.substr(0, host_end + 7);
     port = std::stoi(uri.substr(7 + host_end + 1, port_end));
diff --git a/functional/otlp/func_http_main.cc b/functional/otlp/func_http_main.cc
index 4f6c144a43..ece1588425 100644
--- a/functional/otlp/func_http_main.cc
+++ b/functional/otlp/func_http_main.cc
@@ -39,7 +39,7 @@ const int TEST_FAILED = 1;
   Command line parameters.
 */
 
-enum test_mode
+enum test_mode : std::uint8_t
 {
   MODE_NONE,
   MODE_HTTP,
@@ -84,7 +84,7 @@ struct TestResult
 
 struct TestResult g_test_result;
 
-void parse_error_msg(TestResult *result, std::string msg)
+void parse_error_msg(TestResult *result, const std::string &msg)
 {
   static std::string connection_failed("Session state: connection failed.");
 
@@ -129,11 +129,11 @@ void parse_error_msg(TestResult *result, std::string msg)
   }
 }
 
-void parse_warning_msg(TestResult * /* result */, std::string /* msg */) {}
+void parse_warning_msg(TestResult * /* result */, const std::string & /* msg */) {}
 
-void parse_info_msg(TestResult * /* result */, std::string /* msg */) {}
+void parse_info_msg(TestResult * /* result */, const std::string & /* msg */) {}
 
-void parse_debug_msg(TestResult *result, std::string msg)
+void parse_debug_msg(TestResult *result, const std::string &msg)
 {
   static std::string export_success("Export 1 trace span(s) success");
 
@@ -162,19 +162,19 @@ class TestLogHandler : public opentelemetry::sdk::common::internal_log::LogHandl
       case opentelemetry::sdk::common::internal_log::LogLevel::None:
         break;
       case opentelemetry::sdk::common::internal_log::LogLevel::Error:
-        std::cout << " - [E] " << msg << std::endl;
+        std::cout << " - [E] " << msg << '\n';
         parse_error_msg(&g_test_result, msg);
         break;
       case opentelemetry::sdk::common::internal_log::LogLevel::Warning:
-        std::cout << " - [W] " << msg << std::endl;
+        std::cout << " - [W] " << msg << '\n';
         parse_warning_msg(&g_test_result, msg);
         break;
       case opentelemetry::sdk::common::internal_log::LogLevel::Info:
-        std::cout << " - [I] " << msg << std::endl;
+        std::cout << " - [I] " << msg << '\n';
         parse_info_msg(&g_test_result, msg);
         break;
       case opentelemetry::sdk::common::internal_log::LogLevel::Debug:
-        std::cout << " - [D] " << msg << std::endl;
+        std::cout << " - [D] " << msg << '\n';
         parse_debug_msg(&g_test_result, msg);
         break;
     }
@@ -429,12 +429,12 @@ void list_test_cases()
 
   while (current->m_func != nullptr)
   {
-    std::cout << current->m_name << std::endl;
+    std::cout << current->m_name << '\n';
     current++;
   }
 }
 
-int run_test_case(std::string name)
+int run_test_case(const std::string &name)
 {
   const test_case *current = all_tests;
 
@@ -448,7 +448,7 @@ int run_test_case(std::string name)
     current++;
   }
 
-  std::cerr << "Unknown test <" << name << ">" << std::endl;
+  std::cerr << "Unknown test <" << name << ">" << '\n';
   return 1;
 }
 
diff --git a/sdk/include/opentelemetry/sdk/logs/logger_context.h b/sdk/include/opentelemetry/sdk/logs/logger_context.h
index bab002b231..11eca41d16 100644
--- a/sdk/include/opentelemetry/sdk/logs/logger_context.h
+++ b/sdk/include/opentelemetry/sdk/logs/logger_context.h
@@ -34,7 +34,7 @@ class LoggerContext
 {
 public:
   explicit LoggerContext(std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-                         opentelemetry::sdk::resource::Resource resource =
+                         const opentelemetry::sdk::resource::Resource &resource =
                              opentelemetry::sdk::resource::Resource::Create({})) noexcept;
 
   /**
diff --git a/sdk/include/opentelemetry/sdk/logs/logger_provider.h b/sdk/include/opentelemetry/sdk/logs/logger_provider.h
index 6c035ad5e9..dd2a52789d 100644
--- a/sdk/include/opentelemetry/sdk/logs/logger_provider.h
+++ b/sdk/include/opentelemetry/sdk/logs/logger_provider.h
@@ -38,11 +38,11 @@ class OPENTELEMETRY_EXPORT LoggerProvider final : public opentelemetry::logs::Lo
    * @param resource  The resources for this logger provider.
    */
   explicit LoggerProvider(std::unique_ptr<LogRecordProcessor> &&processor,
-                          opentelemetry::sdk::resource::Resource resource =
+                          const opentelemetry::sdk::resource::Resource &resource =
                               opentelemetry::sdk::resource::Resource::Create({})) noexcept;
 
   explicit LoggerProvider(std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-                          opentelemetry::sdk::resource::Resource resource =
+                          const opentelemetry::sdk::resource::Resource &resource =
                               opentelemetry::sdk::resource::Resource::Create({})) noexcept;
 
   /**
diff --git a/sdk/include/opentelemetry/sdk/metrics/meter_context.h b/sdk/include/opentelemetry/sdk/metrics/meter_context.h
index 40a57a6f88..fe85fe04cc 100644
--- a/sdk/include/opentelemetry/sdk/metrics/meter_context.h
+++ b/sdk/include/opentelemetry/sdk/metrics/meter_context.h
@@ -54,7 +54,7 @@ class MeterContext : public std::enable_shared_from_this<MeterContext>
    */
   MeterContext(
       std::unique_ptr<ViewRegistry> views = std::unique_ptr<ViewRegistry>(new ViewRegistry()),
-      opentelemetry::sdk::resource::Resource resource =
+      const opentelemetry::sdk::resource::Resource &resource =
           opentelemetry::sdk::resource::Resource::Create({})) noexcept;
 
   /**
@@ -131,7 +131,7 @@ class MeterContext : public std::enable_shared_from_this<MeterContext>
    *
    * @param meter
    */
-  void AddMeter(std::shared_ptr<Meter> meter);
+  void AddMeter(const std::shared_ptr<Meter> &meter);
 
   void RemoveMeter(nostd::string_view name,
                    nostd::string_view version,
diff --git a/sdk/include/opentelemetry/sdk/metrics/meter_provider.h b/sdk/include/opentelemetry/sdk/metrics/meter_provider.h
index a838f2a96a..c34f16e0a1 100644
--- a/sdk/include/opentelemetry/sdk/metrics/meter_provider.h
+++ b/sdk/include/opentelemetry/sdk/metrics/meter_provider.h
@@ -39,8 +39,8 @@ class OPENTELEMETRY_EXPORT MeterProvider final : public opentelemetry::metrics::
    * @param resource  The resources for this meter provider.
    */
   MeterProvider(
-      std::unique_ptr<ViewRegistry> views = std::unique_ptr<ViewRegistry>(new ViewRegistry()),
-      sdk::resource::Resource resource    = sdk::resource::Resource::Create({})) noexcept;
+      std::unique_ptr<ViewRegistry> views     = std::unique_ptr<ViewRegistry>(new ViewRegistry()),
+      const sdk::resource::Resource &resource = sdk::resource::Resource::Create({})) noexcept;
 
   /**
    * Initialize a new meter provider with a specified context
diff --git a/sdk/include/opentelemetry/sdk/metrics/state/temporal_metric_storage.h b/sdk/include/opentelemetry/sdk/metrics/state/temporal_metric_storage.h
index 2d01710e47..007b3c74cd 100644
--- a/sdk/include/opentelemetry/sdk/metrics/state/temporal_metric_storage.h
+++ b/sdk/include/opentelemetry/sdk/metrics/state/temporal_metric_storage.h
@@ -40,7 +40,7 @@ class TemporalMetricStorage
                     nostd::span<std::shared_ptr<CollectorHandle>> collectors,
                     opentelemetry::common::SystemTimestamp sdk_start_ts,
                     opentelemetry::common::SystemTimestamp collection_ts,
-                    std::shared_ptr<AttributesHashMap> delta_metrics,
+                    const std::shared_ptr<AttributesHashMap> &delta_metrics,
                     nostd::function_ref<bool(MetricData)> callback) noexcept;
 
 private:
diff --git a/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h b/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h
index 1d2c5bf25f..1d5f8dbc55 100644
--- a/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h
+++ b/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h
@@ -37,7 +37,7 @@ class Synchronous
 class LongCounter : public Synchronous, public opentelemetry::metrics::Counter<uint64_t>
 {
 public:
-  LongCounter(InstrumentDescriptor instrument_descriptor,
+  LongCounter(const InstrumentDescriptor &instrument_descriptor,
               std::unique_ptr<SyncWritableMetricStorage> storage);
 
   void Add(uint64_t value,
@@ -56,7 +56,7 @@ class DoubleCounter : public Synchronous, public opentelemetry::metrics::Counter
 {
 
 public:
-  DoubleCounter(InstrumentDescriptor instrument_descriptor,
+  DoubleCounter(const InstrumentDescriptor &instrument_descriptor,
                 std::unique_ptr<SyncWritableMetricStorage> storage);
 
   void Add(double value,
@@ -72,7 +72,7 @@ class DoubleCounter : public Synchronous, public opentelemetry::metrics::Counter
 class LongUpDownCounter : public Synchronous, public opentelemetry::metrics::UpDownCounter<int64_t>
 {
 public:
-  LongUpDownCounter(InstrumentDescriptor instrument_descriptor,
+  LongUpDownCounter(const InstrumentDescriptor &instrument_descriptor,
                     std::unique_ptr<SyncWritableMetricStorage> storage);
 
   void Add(int64_t value,
@@ -88,7 +88,7 @@ class LongUpDownCounter : public Synchronous, public opentelemetry::metrics::UpD
 class DoubleUpDownCounter : public Synchronous, public opentelemetry::metrics::UpDownCounter<double>
 {
 public:
-  DoubleUpDownCounter(InstrumentDescriptor instrument_descriptor,
+  DoubleUpDownCounter(const InstrumentDescriptor &instrument_descriptor,
                       std::unique_ptr<SyncWritableMetricStorage> storage);
 
   void Add(double value,
@@ -104,7 +104,7 @@ class DoubleUpDownCounter : public Synchronous, public opentelemetry::metrics::U
 class LongHistogram : public Synchronous, public opentelemetry::metrics::Histogram<uint64_t>
 {
 public:
-  LongHistogram(InstrumentDescriptor instrument_descriptor,
+  LongHistogram(const InstrumentDescriptor &instrument_descriptor,
                 std::unique_ptr<SyncWritableMetricStorage> storage);
 
 #if OPENTELEMETRY_ABI_VERSION_NO >= 2
@@ -124,7 +124,7 @@ class LongHistogram : public Synchronous, public opentelemetry::metrics::Histogr
 class DoubleHistogram : public Synchronous, public opentelemetry::metrics::Histogram<double>
 {
 public:
-  DoubleHistogram(InstrumentDescriptor instrument_descriptor,
+  DoubleHistogram(const InstrumentDescriptor &instrument_descriptor,
                   std::unique_ptr<SyncWritableMetricStorage> storage);
 
 #if OPENTELEMETRY_ABI_VERSION_NO >= 2
diff --git a/sdk/include/opentelemetry/sdk/trace/samplers/parent.h b/sdk/include/opentelemetry/sdk/trace/samplers/parent.h
index d5054d9218..e44e9fa320 100644
--- a/sdk/include/opentelemetry/sdk/trace/samplers/parent.h
+++ b/sdk/include/opentelemetry/sdk/trace/samplers/parent.h
@@ -27,7 +27,7 @@ namespace trace
 class ParentBasedSampler : public Sampler
 {
 public:
-  explicit ParentBasedSampler(std::shared_ptr<Sampler> delegate_sampler) noexcept;
+  explicit ParentBasedSampler(const std::shared_ptr<Sampler> &delegate_sampler) noexcept;
   /** The decision either respects the parent span's sampling decision or delegates to
    * delegateSampler for root spans
    * @return Returns DROP always
diff --git a/sdk/include/opentelemetry/sdk/trace/samplers/parent_factory.h b/sdk/include/opentelemetry/sdk/trace/samplers/parent_factory.h
index 68557ace79..d5cf598311 100644
--- a/sdk/include/opentelemetry/sdk/trace/samplers/parent_factory.h
+++ b/sdk/include/opentelemetry/sdk/trace/samplers/parent_factory.h
@@ -23,7 +23,7 @@ class ParentBasedSamplerFactory
   /**
    * Create a ParentBasedSampler.
    */
-  static std::unique_ptr<Sampler> Create(std::shared_ptr<Sampler> delegate_sampler);
+  static std::unique_ptr<Sampler> Create(const std::shared_ptr<Sampler> &delegate_sampler);
 };
 
 }  // namespace trace
diff --git a/sdk/include/opentelemetry/sdk/trace/tracer_context.h b/sdk/include/opentelemetry/sdk/trace/tracer_context.h
index 73bbe4f84b..e1b2cb25d2 100644
--- a/sdk/include/opentelemetry/sdk/trace/tracer_context.h
+++ b/sdk/include/opentelemetry/sdk/trace/tracer_context.h
@@ -39,7 +39,7 @@ class TracerContext
 public:
   explicit TracerContext(
       std::vector<std::unique_ptr<SpanProcessor>> &&processor,
-      opentelemetry::sdk::resource::Resource resource =
+      const opentelemetry::sdk::resource::Resource &resource =
           opentelemetry::sdk::resource::Resource::Create({}),
       std::unique_ptr<Sampler> sampler = std::unique_ptr<AlwaysOnSampler>(new AlwaysOnSampler),
       std::unique_ptr<IdGenerator> id_generator =
diff --git a/sdk/include/opentelemetry/sdk/trace/tracer_provider.h b/sdk/include/opentelemetry/sdk/trace/tracer_provider.h
index 0d05a94043..13a65a2d87 100644
--- a/sdk/include/opentelemetry/sdk/trace/tracer_provider.h
+++ b/sdk/include/opentelemetry/sdk/trace/tracer_provider.h
@@ -43,7 +43,7 @@ class OPENTELEMETRY_EXPORT TracerProvider final : public opentelemetry::trace::T
    */
   explicit TracerProvider(
       std::unique_ptr<SpanProcessor> processor,
-      opentelemetry::sdk::resource::Resource resource =
+      const opentelemetry::sdk::resource::Resource &resource =
           opentelemetry::sdk::resource::Resource::Create({}),
       std::unique_ptr<Sampler> sampler = std::unique_ptr<AlwaysOnSampler>(new AlwaysOnSampler),
       std::unique_ptr<IdGenerator> id_generator =
@@ -51,7 +51,7 @@ class OPENTELEMETRY_EXPORT TracerProvider final : public opentelemetry::trace::T
 
   explicit TracerProvider(
       std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-      opentelemetry::sdk::resource::Resource resource =
+      const opentelemetry::sdk::resource::Resource &resource =
           opentelemetry::sdk::resource::Resource::Create({}),
       std::unique_ptr<Sampler> sampler = std::unique_ptr<AlwaysOnSampler>(new AlwaysOnSampler),
       std::unique_ptr<IdGenerator> id_generator =
diff --git a/sdk/src/common/global_log_handler.cc b/sdk/src/common/global_log_handler.cc
index 40968f2b7e..f60527eee8 100644
--- a/sdk/src/common/global_log_handler.cc
+++ b/sdk/src/common/global_log_handler.cc
@@ -31,7 +31,7 @@ void DefaultLogHandler::Handle(LogLevel level,
   {
     output_s << msg;
   }
-  output_s << std::endl;
+  output_s << '\n';
   // TBD - print attributes
 
   switch (level)
diff --git a/sdk/src/logs/event_logger.cc b/sdk/src/logs/event_logger.cc
index 6b0afacfaf..df9ba44c31 100644
--- a/sdk/src/logs/event_logger.cc
+++ b/sdk/src/logs/event_logger.cc
@@ -21,7 +21,7 @@ namespace logs
 EventLogger::EventLogger(
     opentelemetry::nostd::shared_ptr<opentelemetry::logs::Logger> delegate_logger,
     opentelemetry::nostd::string_view event_domain) noexcept
-    : delegate_logger_(delegate_logger), event_domain_(event_domain)
+    : delegate_logger_(std::move(delegate_logger)), event_domain_(event_domain)
 {}
 
 const opentelemetry::nostd::string_view EventLogger::GetName() noexcept
diff --git a/sdk/src/logs/logger.cc b/sdk/src/logs/logger.cc
index e9935c5107..2d57ab9faa 100644
--- a/sdk/src/logs/logger.cc
+++ b/sdk/src/logs/logger.cc
@@ -38,7 +38,7 @@ Logger::Logger(
     std::unique_ptr<instrumentationscope::InstrumentationScope> instrumentation_scope) noexcept
     : logger_name_(std::string(name)),
       instrumentation_scope_(std::move(instrumentation_scope)),
-      context_(context)
+      context_(std::move(context))
 {}
 
 const opentelemetry::nostd::string_view Logger::GetName() noexcept
diff --git a/sdk/src/logs/logger_context.cc b/sdk/src/logs/logger_context.cc
index 2bfb89161e..a6eb063661 100644
--- a/sdk/src/logs/logger_context.cc
+++ b/sdk/src/logs/logger_context.cc
@@ -19,7 +19,7 @@ namespace logs
 {
 
 LoggerContext::LoggerContext(std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-                             opentelemetry::sdk::resource::Resource resource) noexcept
+                             const opentelemetry::sdk::resource::Resource &resource) noexcept
     : resource_(resource),
       processor_(
           std::unique_ptr<LogRecordProcessor>(new MultiLogRecordProcessor(std::move(processors))))
diff --git a/sdk/src/logs/logger_provider.cc b/sdk/src/logs/logger_provider.cc
index 1eaa0d186e..fdea3eb51a 100644
--- a/sdk/src/logs/logger_provider.cc
+++ b/sdk/src/logs/logger_provider.cc
@@ -27,7 +27,7 @@ namespace logs
 {
 
 LoggerProvider::LoggerProvider(std::unique_ptr<LogRecordProcessor> &&processor,
-                               opentelemetry::sdk::resource::Resource resource) noexcept
+                               const opentelemetry::sdk::resource::Resource &resource) noexcept
 {
   std::vector<std::unique_ptr<LogRecordProcessor>> processors;
   processors.emplace_back(std::move(processor));
@@ -36,7 +36,7 @@ LoggerProvider::LoggerProvider(std::unique_ptr<LogRecordProcessor> &&processor,
 }
 
 LoggerProvider::LoggerProvider(std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-                               opentelemetry::sdk::resource::Resource resource) noexcept
+                               const opentelemetry::sdk::resource::Resource &resource) noexcept
     : context_{std::make_shared<LoggerContext>(std::move(processors), std::move(resource))}
 {}
 
diff --git a/sdk/src/metrics/async_instruments.cc b/sdk/src/metrics/async_instruments.cc
index 311efc1e7e..709957d68e 100644
--- a/sdk/src/metrics/async_instruments.cc
+++ b/sdk/src/metrics/async_instruments.cc
@@ -20,9 +20,9 @@ namespace metrics
 ObservableInstrument::ObservableInstrument(InstrumentDescriptor instrument_descriptor,
                                            std::unique_ptr<AsyncWritableMetricStorage> storage,
                                            std::shared_ptr<ObservableRegistry> observable_registry)
-    : instrument_descriptor_(instrument_descriptor),
+    : instrument_descriptor_(std::move(instrument_descriptor)),
       storage_(std::move(storage)),
-      observable_registry_{observable_registry}
+      observable_registry_{std::move(observable_registry)}
 
 {}
 
diff --git a/sdk/src/metrics/exemplar/reservoir.cc b/sdk/src/metrics/exemplar/reservoir.cc
index 4e7501799e..264a000828 100644
--- a/sdk/src/metrics/exemplar/reservoir.cc
+++ b/sdk/src/metrics/exemplar/reservoir.cc
@@ -3,9 +3,11 @@
 
 #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
 
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir.h"
+#  include <utility>
+
 #  include "opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h"
 #  include "opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h"
+#  include "opentelemetry/sdk/metrics/exemplar/reservoir.h"
 #  include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h"
 #  include "opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h"
 
@@ -20,8 +22,8 @@ nostd::shared_ptr<ExemplarReservoir> ExemplarReservoir::GetSimpleFixedSizeExempl
     std::shared_ptr<ReservoirCellSelector> reservoir_cell_selector,
     MapAndResetCellType map_and_reset_cell)
 {
-  return nostd::shared_ptr<ExemplarReservoir>{
-      new SimpleFixedSizeExemplarReservoir{size, reservoir_cell_selector, map_and_reset_cell}};
+  return nostd::shared_ptr<ExemplarReservoir>{new SimpleFixedSizeExemplarReservoir{
+      size, std::move(reservoir_cell_selector), map_and_reset_cell}};
 }
 
 nostd::shared_ptr<ExemplarReservoir> ExemplarReservoir::GetAlignedHistogramBucketExemplarReservoir(
@@ -30,7 +32,7 @@ nostd::shared_ptr<ExemplarReservoir> ExemplarReservoir::GetAlignedHistogramBucke
     MapAndResetCellType map_and_reset_cell)
 {
   return nostd::shared_ptr<ExemplarReservoir>{new AlignedHistogramBucketExemplarReservoir{
-      size, reservoir_cell_selector, map_and_reset_cell}};
+      size, std::move(reservoir_cell_selector), map_and_reset_cell}};
 }
 
 nostd::shared_ptr<ExemplarReservoir> ExemplarReservoir::GetNoExemplarReservoir()
diff --git a/sdk/src/metrics/meter.cc b/sdk/src/metrics/meter.cc
index 8b4413113b..c61f3a8d31 100644
--- a/sdk/src/metrics/meter.cc
+++ b/sdk/src/metrics/meter.cc
@@ -53,7 +53,7 @@ Meter::Meter(
     std::weak_ptr<MeterContext> meter_context,
     std::unique_ptr<sdk::instrumentationscope::InstrumentationScope> instrumentation_scope) noexcept
     : scope_{std::move(instrumentation_scope)},
-      meter_context_{meter_context},
+      meter_context_{std::move(meter_context)},
       observable_registry_(new ObservableRegistry())
 {}
 
@@ -455,7 +455,7 @@ std::vector<MetricData> Meter::Collect(CollectorHandle *collector,
   for (auto &metric_storage : storage_registry_)
   {
     metric_storage.second->Collect(collector, ctx->GetCollectors(), ctx->GetSDKStartTime(),
-                                   collect_ts, [&metric_data_list](MetricData metric_data) {
+                                   collect_ts, [&metric_data_list](const MetricData &metric_data) {
                                      metric_data_list.push_back(metric_data);
                                      return true;
                                    });
diff --git a/sdk/src/metrics/meter_context.cc b/sdk/src/metrics/meter_context.cc
index de32c469d8..40b9da42b2 100644
--- a/sdk/src/metrics/meter_context.cc
+++ b/sdk/src/metrics/meter_context.cc
@@ -36,7 +36,7 @@ namespace metrics
 {
 
 MeterContext::MeterContext(std::unique_ptr<ViewRegistry> views,
-                           opentelemetry::sdk::resource::Resource resource) noexcept
+                           const opentelemetry::sdk::resource::Resource &resource) noexcept
     : resource_{resource}, views_(std::move(views)), sdk_start_ts_{std::chrono::system_clock::now()}
 {}
 
@@ -82,7 +82,7 @@ opentelemetry::common::SystemTimestamp MeterContext::GetSDKStartTime() noexcept
 
 void MeterContext::AddMetricReader(std::shared_ptr<MetricReader> reader) noexcept
 {
-  auto collector = std::shared_ptr<MetricCollector>{new MetricCollector(this, reader)};
+  auto collector = std::shared_ptr<MetricCollector>{new MetricCollector(this, std::move(reader))};
   collectors_.push_back(collector);
 }
 
@@ -107,7 +107,7 @@ ExemplarFilterType MeterContext::GetExemplarFilter() const noexcept
 
 #endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
 
-void MeterContext::AddMeter(std::shared_ptr<Meter> meter)
+void MeterContext::AddMeter(const std::shared_ptr<Meter> &meter)
 {
   std::lock_guard<opentelemetry::common::SpinLockMutex> guard(meter_lock_);
   meters_.push_back(meter);
diff --git a/sdk/src/metrics/meter_provider.cc b/sdk/src/metrics/meter_provider.cc
index 6ddba6aa7c..4f2ca4b44f 100644
--- a/sdk/src/metrics/meter_provider.cc
+++ b/sdk/src/metrics/meter_provider.cc
@@ -37,7 +37,7 @@ MeterProvider::MeterProvider(std::unique_ptr<MeterContext> context) noexcept
 {}
 
 MeterProvider::MeterProvider(std::unique_ptr<ViewRegistry> views,
-                             sdk::resource::Resource resource) noexcept
+                             const sdk::resource::Resource &resource) noexcept
     : context_(std::make_shared<MeterContext>(std::move(views), resource))
 {
   OTEL_INTERNAL_LOG_DEBUG("[MeterProvider] MeterProvider created.");
@@ -110,7 +110,7 @@ const resource::Resource &MeterProvider::GetResource() const noexcept
 
 void MeterProvider::AddMetricReader(std::shared_ptr<MetricReader> reader) noexcept
 {
-  context_->AddMetricReader(reader);
+  context_->AddMetricReader(std::move(reader));
 }
 
 void MeterProvider::AddView(std::unique_ptr<InstrumentSelector> instrument_selector,
diff --git a/sdk/src/metrics/state/metric_collector.cc b/sdk/src/metrics/state/metric_collector.cc
index 5ecf41cecf..a790a6b6a1 100644
--- a/sdk/src/metrics/state/metric_collector.cc
+++ b/sdk/src/metrics/state/metric_collector.cc
@@ -27,7 +27,7 @@ namespace metrics
 
 MetricCollector::MetricCollector(opentelemetry::sdk::metrics::MeterContext *context,
                                  std::shared_ptr<MetricReader> metric_reader)
-    : meter_context_{context}, metric_reader_{metric_reader}
+    : meter_context_{context}, metric_reader_{std::move(metric_reader)}
 {
   metric_reader_->SetMetricProducer(this);
 }
@@ -48,7 +48,7 @@ bool MetricCollector::Collect(
     return false;
   }
   ResourceMetrics resource_metrics;
-  meter_context_->ForEachMeter([&](std::shared_ptr<Meter> meter) noexcept {
+  meter_context_->ForEachMeter([&](const std::shared_ptr<Meter> &meter) noexcept {
     auto collection_ts = std::chrono::system_clock::now();
     auto metric_data   = meter->Collect(this, collection_ts);
     if (!metric_data.empty())
diff --git a/sdk/src/metrics/state/temporal_metric_storage.cc b/sdk/src/metrics/state/temporal_metric_storage.cc
index 2ba74d9213..c26339a79f 100644
--- a/sdk/src/metrics/state/temporal_metric_storage.cc
+++ b/sdk/src/metrics/state/temporal_metric_storage.cc
@@ -35,7 +35,7 @@ namespace metrics
 TemporalMetricStorage::TemporalMetricStorage(InstrumentDescriptor instrument_descriptor,
                                              AggregationType aggregation_type,
                                              const AggregationConfig *aggregation_config)
-    : instrument_descriptor_(instrument_descriptor),
+    : instrument_descriptor_(std::move(instrument_descriptor)),
       aggregation_type_(aggregation_type),
       aggregation_config_(aggregation_config)
 {}
@@ -44,7 +44,7 @@ bool TemporalMetricStorage::buildMetrics(CollectorHandle *collector,
                                          nostd::span<std::shared_ptr<CollectorHandle>> collectors,
                                          opentelemetry::common::SystemTimestamp sdk_start_ts,
                                          opentelemetry::common::SystemTimestamp collection_ts,
-                                         std::shared_ptr<AttributesHashMap> delta_metrics,
+                                         const std::shared_ptr<AttributesHashMap> &delta_metrics,
                                          nostd::function_ref<bool(MetricData)> callback) noexcept
 {
   std::lock_guard<opentelemetry::common::SpinLockMutex> guard(lock_);
diff --git a/sdk/src/metrics/sync_instruments.cc b/sdk/src/metrics/sync_instruments.cc
index a99fa80868..56429a079f 100644
--- a/sdk/src/metrics/sync_instruments.cc
+++ b/sdk/src/metrics/sync_instruments.cc
@@ -20,7 +20,7 @@ namespace sdk
 {
 namespace metrics
 {
-LongCounter::LongCounter(InstrumentDescriptor instrument_descriptor,
+LongCounter::LongCounter(const InstrumentDescriptor &instrument_descriptor,
                          std::unique_ptr<SyncWritableMetricStorage> storage)
     : Synchronous(instrument_descriptor, std::move(storage))
 {
@@ -80,7 +80,7 @@ void LongCounter::Add(uint64_t value, const opentelemetry::context::Context &con
   return storage_->RecordLong(value, context);
 }
 
-DoubleCounter::DoubleCounter(InstrumentDescriptor instrument_descriptor,
+DoubleCounter::DoubleCounter(const InstrumentDescriptor &instrument_descriptor,
                              std::unique_ptr<SyncWritableMetricStorage> storage)
     : Synchronous(instrument_descriptor, std::move(storage))
 {
@@ -164,7 +164,7 @@ void DoubleCounter::Add(double value, const opentelemetry::context::Context &con
   return storage_->RecordDouble(value, context);
 }
 
-LongUpDownCounter::LongUpDownCounter(InstrumentDescriptor instrument_descriptor,
+LongUpDownCounter::LongUpDownCounter(const InstrumentDescriptor &instrument_descriptor,
                                      std::unique_ptr<SyncWritableMetricStorage> storage)
     : Synchronous(instrument_descriptor, std::move(storage))
 {
@@ -228,7 +228,7 @@ void LongUpDownCounter::Add(int64_t value, const opentelemetry::context::Context
   return storage_->RecordLong(value, context);
 }
 
-DoubleUpDownCounter::DoubleUpDownCounter(InstrumentDescriptor instrument_descriptor,
+DoubleUpDownCounter::DoubleUpDownCounter(const InstrumentDescriptor &instrument_descriptor,
                                          std::unique_ptr<SyncWritableMetricStorage> storage)
     : Synchronous(instrument_descriptor, std::move(storage))
 {
@@ -292,7 +292,7 @@ void DoubleUpDownCounter::Add(double value, const opentelemetry::context::Contex
   return storage_->RecordDouble(value, context);
 }
 
-LongHistogram::LongHistogram(InstrumentDescriptor instrument_descriptor,
+LongHistogram::LongHistogram(const InstrumentDescriptor &instrument_descriptor,
                              std::unique_ptr<SyncWritableMetricStorage> storage)
     : Synchronous(instrument_descriptor, std::move(storage))
 {
@@ -355,7 +355,7 @@ void LongHistogram::Record(uint64_t value) noexcept
 }
 #endif
 
-DoubleHistogram::DoubleHistogram(InstrumentDescriptor instrument_descriptor,
+DoubleHistogram::DoubleHistogram(const InstrumentDescriptor &instrument_descriptor,
                                  std::unique_ptr<SyncWritableMetricStorage> storage)
     : Synchronous(instrument_descriptor, std::move(storage))
 {
diff --git a/sdk/src/metrics/view/view_factory.cc b/sdk/src/metrics/view/view_factory.cc
index 36496f62d6..319c10b956 100644
--- a/sdk/src/metrics/view/view_factory.cc
+++ b/sdk/src/metrics/view/view_factory.cc
@@ -53,7 +53,7 @@ std::unique_ptr<View> ViewFactory::Create(const std::string &name,
   auto attributes_processor =
       std::unique_ptr<AttributesProcessor>(new DefaultAttributesProcessor());
 
-  return Create(name, description, unit, aggregation_type, aggregation_config,
+  return Create(name, description, unit, aggregation_type, std::move(aggregation_config),
                 std::move(attributes_processor));
 }
 
@@ -64,7 +64,8 @@ std::unique_ptr<View> ViewFactory::Create(const std::string &name,
                                           std::shared_ptr<AggregationConfig> aggregation_config,
                                           std::unique_ptr<AttributesProcessor> attributes_processor)
 {
-  std::unique_ptr<View> view(new View(name, description, unit, aggregation_type, aggregation_config,
+  std::unique_ptr<View> view(new View(name, description, unit, aggregation_type,
+                                      std::move(aggregation_config),
                                       std::move(attributes_processor)));
   return view;
 }
diff --git a/sdk/src/trace/batch_span_processor.cc b/sdk/src/trace/batch_span_processor.cc
index 03b79f6ebb..6aa6a49949 100644
--- a/sdk/src/trace/batch_span_processor.cc
+++ b/sdk/src/trace/batch_span_processor.cc
@@ -29,7 +29,6 @@
 #include "opentelemetry/version.h"
 
 using opentelemetry::sdk::common::AtomicUniquePtr;
-using opentelemetry::sdk::common::CircularBuffer;
 using opentelemetry::sdk::common::CircularBufferRange;
 using opentelemetry::trace::SpanContext;
 
diff --git a/sdk/src/trace/samplers/parent.cc b/sdk/src/trace/samplers/parent.cc
index a69ede92d4..9bffb7b030 100644
--- a/sdk/src/trace/samplers/parent.cc
+++ b/sdk/src/trace/samplers/parent.cc
@@ -22,7 +22,7 @@ namespace sdk
 {
 namespace trace
 {
-ParentBasedSampler::ParentBasedSampler(std::shared_ptr<Sampler> delegate_sampler) noexcept
+ParentBasedSampler::ParentBasedSampler(const std::shared_ptr<Sampler> &delegate_sampler) noexcept
     : delegate_sampler_(delegate_sampler),
       description_("ParentBased{" + std::string{delegate_sampler->GetDescription()} + "}")
 {}
diff --git a/sdk/src/trace/samplers/parent_factory.cc b/sdk/src/trace/samplers/parent_factory.cc
index 978fb75946..7f1bc088d6 100644
--- a/sdk/src/trace/samplers/parent_factory.cc
+++ b/sdk/src/trace/samplers/parent_factory.cc
@@ -1,8 +1,10 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/sdk/trace/samplers/parent_factory.h"
+#include <utility>
+
 #include "opentelemetry/sdk/trace/samplers/parent.h"
+#include "opentelemetry/sdk/trace/samplers/parent_factory.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -12,9 +14,9 @@ namespace trace
 {
 
 std::unique_ptr<Sampler> ParentBasedSamplerFactory::Create(
-    std::shared_ptr<Sampler> delegate_sampler)
+    const std::shared_ptr<Sampler> &delegate_sampler)
 {
-  std::unique_ptr<Sampler> sampler(new ParentBasedSampler(delegate_sampler));
+  std::unique_ptr<Sampler> sampler(new ParentBasedSampler(std::move(delegate_sampler)));
   return sampler;
 }
 
diff --git a/sdk/src/trace/span.cc b/sdk/src/trace/span.cc
index ca3a475707..2b9e9d2908 100644
--- a/sdk/src/trace/span.cc
+++ b/sdk/src/trace/span.cc
@@ -78,7 +78,7 @@ Span::Span(std::shared_ptr<Tracer> &&tracer,
     return true;
   });
 
-  links.ForEachKeyValue([&](opentelemetry::trace::SpanContext span_context,
+  links.ForEachKeyValue([&](const opentelemetry::trace::SpanContext &span_context,
                             const common::KeyValueIterable &attributes) {
     recordable_->AddLink(span_context, attributes);
     return true;
diff --git a/sdk/src/trace/tracer.cc b/sdk/src/trace/tracer.cc
index fd02548c7b..73fc08d5dc 100644
--- a/sdk/src/trace/tracer.cc
+++ b/sdk/src/trace/tracer.cc
@@ -39,7 +39,7 @@ namespace trace
 
 Tracer::Tracer(std::shared_ptr<TracerContext> context,
                std::unique_ptr<InstrumentationScope> instrumentation_scope) noexcept
-    : instrumentation_scope_{std::move(instrumentation_scope)}, context_{context}
+    : instrumentation_scope_{std::move(instrumentation_scope)}, context_{std::move(context)}
 {}
 
 nostd::shared_ptr<opentelemetry::trace::Span> Tracer::StartSpan(
diff --git a/sdk/src/trace/tracer_context.cc b/sdk/src/trace/tracer_context.cc
index 0fb4fd35cf..65300d6f22 100644
--- a/sdk/src/trace/tracer_context.cc
+++ b/sdk/src/trace/tracer_context.cc
@@ -22,7 +22,7 @@ namespace trace
 namespace resource = opentelemetry::sdk::resource;
 
 TracerContext::TracerContext(std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-                             resource::Resource resource,
+                             const resource::Resource &resource,
                              std::unique_ptr<Sampler> sampler,
                              std::unique_ptr<IdGenerator> id_generator) noexcept
     : resource_(resource),
diff --git a/sdk/src/trace/tracer_provider.cc b/sdk/src/trace/tracer_provider.cc
index 9440e3d469..3b5462a083 100644
--- a/sdk/src/trace/tracer_provider.cc
+++ b/sdk/src/trace/tracer_provider.cc
@@ -38,7 +38,7 @@ TracerProvider::TracerProvider(std::unique_ptr<TracerContext> context) noexcept
 }
 
 TracerProvider::TracerProvider(std::unique_ptr<SpanProcessor> processor,
-                               resource::Resource resource,
+                               const resource::Resource &resource,
                                std::unique_ptr<Sampler> sampler,
                                std::unique_ptr<IdGenerator> id_generator) noexcept
 {
@@ -49,7 +49,7 @@ TracerProvider::TracerProvider(std::unique_ptr<SpanProcessor> processor,
 }
 
 TracerProvider::TracerProvider(std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-                               resource::Resource resource,
+                               const resource::Resource &resource,
                                std::unique_ptr<Sampler> sampler,
                                std::unique_ptr<IdGenerator> id_generator) noexcept
 {
diff --git a/sdk/test/common/empty_attributes_test.cc b/sdk/test/common/empty_attributes_test.cc
index f37ea0a5c4..894cafc8a7 100644
--- a/sdk/test/common/empty_attributes_test.cc
+++ b/sdk/test/common/empty_attributes_test.cc
@@ -15,5 +15,5 @@ TEST(EmptyAttributesTest, TestMemory)
 {
   auto attributes1 = opentelemetry::sdk::GetEmptyAttributes();
   auto attributes2 = opentelemetry::sdk::GetEmptyAttributes();
-  EXPECT_EQ(memcmp(&attributes1, &attributes2, sizeof(attributes1)), 0);
+  EXPECT_EQ(memcmp(&attributes1, &attributes2, sizeof(attributes1)), 0);  // NOLINT
 }
diff --git a/sdk/test/logs/batch_log_record_processor_test.cc b/sdk/test/logs/batch_log_record_processor_test.cc
index 33db0da479..3bdd849938 100644
--- a/sdk/test/logs/batch_log_record_processor_test.cc
+++ b/sdk/test/logs/batch_log_record_processor_test.cc
@@ -9,6 +9,7 @@
 #include <chrono>
 #include <memory>
 #include <thread>
+#include <utility>
 
 using namespace opentelemetry::sdk::logs;
 using namespace opentelemetry::sdk::common;
@@ -74,10 +75,10 @@ class MockLogExporter final : public LogRecordExporter
                   std::shared_ptr<std::atomic<bool>> is_shutdown,
                   std::shared_ptr<std::atomic<bool>> is_export_completed,
                   const std::chrono::milliseconds export_delay = std::chrono::milliseconds(0))
-      : logs_received_(logs_received),
-        force_flush_counter_(force_flush_counter),
-        is_shutdown_(is_shutdown),
-        is_export_completed_(is_export_completed),
+      : logs_received_(std::move(logs_received)),
+        force_flush_counter_(std::move(force_flush_counter)),
+        is_shutdown_(std::move(is_shutdown)),
+        is_export_completed_(std::move(is_export_completed)),
         export_delay_(export_delay)
   {}
 
@@ -154,7 +155,8 @@ class BatchLogRecordProcessorTest : public testing::Test  // ::testing::Test
   {
     return std::shared_ptr<LogRecordProcessor>(new BatchLogRecordProcessor(
         std::unique_ptr<LogRecordExporter>(new MockLogExporter(
-            logs_received, force_flush_counter, is_shutdown, is_export_completed, export_delay)),
+            std::move(logs_received), std::move(force_flush_counter), std::move(is_shutdown),
+            std::move(is_export_completed), export_delay)),
         max_queue_size, scheduled_delay_millis, max_export_batch_size));
   }
 };
diff --git a/sdk/test/logs/logger_sdk_test.cc b/sdk/test/logs/logger_sdk_test.cc
index 62d523b92a..9e63672d3c 100644
--- a/sdk/test/logs/logger_sdk_test.cc
+++ b/sdk/test/logs/logger_sdk_test.cc
@@ -3,6 +3,7 @@
 
 #include <chrono>
 #include <string>
+#include <utility>
 
 #include "opentelemetry/logs/logger_provider.h"
 #include "opentelemetry/nostd/string_view.h"
@@ -172,7 +173,7 @@ class MockProcessor final : public LogRecordProcessor
 public:
   // A processor used for testing that keeps a track of the recordable it received
   explicit MockProcessor(std::shared_ptr<MockLogRecordable> record_received) noexcept
-      : record_received_(record_received)
+      : record_received_(std::move(record_received))
   {}
 
   std::unique_ptr<opentelemetry::sdk::logs::Recordable> MakeRecordable() noexcept override
diff --git a/sdk/test/logs/simple_log_record_processor_test.cc b/sdk/test/logs/simple_log_record_processor_test.cc
index 484cc63e71..30e5771394 100644
--- a/sdk/test/logs/simple_log_record_processor_test.cc
+++ b/sdk/test/logs/simple_log_record_processor_test.cc
@@ -10,6 +10,7 @@
 
 #include <chrono>
 #include <thread>
+#include <utility>
 
 using namespace opentelemetry::sdk::logs;
 using namespace opentelemetry::sdk::common;
@@ -75,7 +76,7 @@ class TestExporter final : public LogRecordExporter
                size_t *batch_size_received)
       : force_flush_counter_(force_flush_counter),
         shutdown_counter_(shutdown_counter),
-        logs_received_(logs_received),
+        logs_received_(std::move(logs_received)),
         batch_size_received(batch_size_received)
   {}
 
diff --git a/sdk/test/metrics/async_instruments_test.cc b/sdk/test/metrics/async_instruments_test.cc
index 10c0335559..b7ad885bbd 100644
--- a/sdk/test/metrics/async_instruments_test.cc
+++ b/sdk/test/metrics/async_instruments_test.cc
@@ -12,6 +12,7 @@ using namespace opentelemetry::sdk::metrics;
 
 using M = std::map<std::string, std::string>;
 
+// NOLINTNEXTLINE
 void asyc_generate_measurements(opentelemetry::metrics::ObserverResult /* observer */,
                                 void * /* state */)
 {}
diff --git a/sdk/test/metrics/async_metric_storage_test.cc b/sdk/test/metrics/async_metric_storage_test.cc
index 3b72e99d96..dcbe105418 100644
--- a/sdk/test/metrics/async_metric_storage_test.cc
+++ b/sdk/test/metrics/async_metric_storage_test.cc
@@ -262,7 +262,7 @@ TEST_P(WritableMetricStorageTestObservableGaugeFixture, TestAggregation)
                      opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()));
 
   storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData metric_data) {
+      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
         for (auto data_attr : metric_data.point_data_attr_)
         {
           auto data = opentelemetry::nostd::get<LastValuePointData>(data_attr.point_data);
@@ -288,7 +288,7 @@ TEST_P(WritableMetricStorageTestObservableGaugeFixture, TestAggregation)
   storage.RecordLong(measurements2,
                      opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()));
   storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData metric_data) {
+      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
         for (auto data_attr : metric_data.point_data_attr_)
         {
           auto data = opentelemetry::nostd::get<LastValuePointData>(data_attr.point_data);
diff --git a/sdk/test/metrics/cardinality_limit_test.cc b/sdk/test/metrics/cardinality_limit_test.cc
index 8c2edb4b0c..3f9483ac1c 100644
--- a/sdk/test/metrics/cardinality_limit_test.cc
+++ b/sdk/test/metrics/cardinality_limit_test.cc
@@ -26,7 +26,7 @@ TEST(CardinalityLimit, AttributesHashMapBasicTests)
     return std::unique_ptr<Aggregation>(new LongSumAggregation(true));
   };
   // add 10 unique metric points. 9 should be added to hashmap, 10th should be overflow.
-  long record_value = 100;
+  int64_t record_value = 100;
   for (auto i = 0; i < 10; i++)
   {
     FilteredOrderedAttributeMap attributes = {{"key", std::to_string(i)}};
@@ -76,7 +76,7 @@ TEST_P(WritableMetricStorageCardinalityLimitTestFixture, LongCounterSumAggregati
 #endif
                             nullptr, attributes_limit);
 
-  long record_value = 100;
+  int64_t record_value = 100;
   // add 9 unique metric points, and 6 more above limit.
   for (auto i = 0; i < 15; i++)
   {
diff --git a/sdk/test/metrics/instrument_metadata_validator_test.cc b/sdk/test/metrics/instrument_metadata_validator_test.cc
index 172df1af3c..28c6d4a4fd 100644
--- a/sdk/test/metrics/instrument_metadata_validator_test.cc
+++ b/sdk/test/metrics/instrument_metadata_validator_test.cc
@@ -19,9 +19,9 @@ TEST(InstrumentMetadataValidator, TestName)
 {
   opentelemetry::sdk::metrics::InstrumentMetaDataValidator validator;
   std::vector<std::string> invalid_names = {
-      "",                                                             // empty string
-      "1sdf",                                                         // string starting with number
-      "\x31\x32\x33\xe2\x82\xac\x41\x41\x41\xe2\x82\xac\x42\x42\x42"  // unicode characters
+      "",      // empty string
+      "1sdf",  // string starting with number
+      "\x31\x32\x33\xe2\x82\xac\x41\x41\x41\xe2\x82\xac\x42\x42\x42",  // unicode characters
       "/\\sdsd",                        // string starting with special character
       "***sSSs",                        // string starting with special character
       "a\\broken\\path",                // contains backward slash
diff --git a/sdk/test/metrics/meter_test.cc b/sdk/test/metrics/meter_test.cc
index 084f50fc09..b5ed86f55a 100644
--- a/sdk/test/metrics/meter_test.cc
+++ b/sdk/test/metrics/meter_test.cc
@@ -18,7 +18,7 @@ using namespace opentelemetry::sdk::metrics;
 namespace
 {
 nostd::shared_ptr<metrics::Meter> InitMeter(MetricReader **metricReaderPtr,
-                                            std::string meter_name = "meter_name")
+                                            const std::string &meter_name = "meter_name")
 {
   static std::shared_ptr<metrics::MeterProvider> provider(new MeterProvider());
   std::unique_ptr<MetricReader> metric_reader(new MockMetricReader());
diff --git a/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc b/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc
index 216574a587..88ae56eb3f 100644
--- a/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc
+++ b/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc
@@ -71,7 +71,7 @@ TEST_P(WritableMetricStorageTestFixture, LongUpDownCounterSumAggregation)
   auto collection_ts      = std::chrono::system_clock::now();
   size_t count_attributes = 0;
   storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
-                  [&](const MetricData data) {
+                  [&](const MetricData &data) {
                     for (auto data_attr : data.point_data_attr_)
                     {
                       auto sum_data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
@@ -105,7 +105,7 @@ TEST_P(WritableMetricStorageTestFixture, LongUpDownCounterSumAggregation)
   collection_ts    = std::chrono::system_clock::now();
   count_attributes = 0;
   storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
-                  [&](const MetricData data) {
+                  [&](const MetricData &data) {
                     if (temporality == AggregationTemporality::kCumulative)
                     {
                       EXPECT_EQ(data.start_ts, sdk_start_ts);
@@ -147,7 +147,7 @@ TEST_P(WritableMetricStorageTestFixture, LongUpDownCounterSumAggregation)
   collection_ts    = std::chrono::system_clock::now();
   count_attributes = 0;
   storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
-                  [&](const MetricData data) {
+                  [&](const MetricData &data) {
                     for (auto data_attr : data.point_data_attr_)
                     {
                       auto sum_data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
@@ -224,7 +224,7 @@ TEST_P(WritableMetricStorageTestFixture, DoubleUpDownCounterSumAggregation)
   auto collection_ts      = std::chrono::system_clock::now();
   size_t count_attributes = 0;
   storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
-                  [&](const MetricData data) {
+                  [&](const MetricData &data) {
                     for (auto data_attr : data.point_data_attr_)
                     {
                       auto sum_data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
@@ -259,7 +259,7 @@ TEST_P(WritableMetricStorageTestFixture, DoubleUpDownCounterSumAggregation)
   collection_ts    = std::chrono::system_clock::now();
   count_attributes = 0;
   storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
-                  [&](const MetricData data) {
+                  [&](const MetricData &data) {
                     if (temporality == AggregationTemporality::kCumulative)
                     {
                       EXPECT_EQ(data.start_ts, sdk_start_ts);
@@ -301,7 +301,7 @@ TEST_P(WritableMetricStorageTestFixture, DoubleUpDownCounterSumAggregation)
   collection_ts    = std::chrono::system_clock::now();
   count_attributes = 0;
   storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
-                  [&](const MetricData data) {
+                  [&](const MetricData &data) {
                     for (auto data_attr : data.point_data_attr_)
                     {
                       auto sum_data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
diff --git a/sdk/test/resource/resource_test.cc b/sdk/test/resource/resource_test.cc
index e6b56cae43..419264862c 100644
--- a/sdk/test/resource/resource_test.cc
+++ b/sdk/test/resource/resource_test.cc
@@ -25,7 +25,8 @@ namespace nostd = opentelemetry::nostd;
 class TestResource : public Resource
 {
 public:
-  TestResource(ResourceAttributes attributes = ResourceAttributes(), std::string schema_url = {})
+  TestResource(const ResourceAttributes &attributes = ResourceAttributes(),
+               const std::string &schema_url        = {})
       : Resource(attributes, schema_url)
   {}
 };
@@ -122,10 +123,10 @@ TEST(ResourceTest, create_with_emptyatrributes)
 
 TEST(ResourceTest, create_with_schemaurl)
 {
-  const std::string schema_url  = "https://opentelemetry.io/schemas/1.2.0";
-  ResourceAttributes attributes = {};
-  auto resource                 = Resource::Create(attributes, schema_url);
-  auto received_schema_url      = resource.GetSchemaURL();
+  const std::string schema_url    = "https://opentelemetry.io/schemas/1.2.0";
+  ResourceAttributes attributes   = {};
+  auto resource                   = Resource::Create(attributes, schema_url);
+  const auto &received_schema_url = resource.GetSchemaURL();
 
   EXPECT_EQ(received_schema_url, schema_url);
 }
diff --git a/sdk/test/trace/batch_span_processor_test.cc b/sdk/test/trace/batch_span_processor_test.cc
index 411b4dacfe..9bb09d6e55 100644
--- a/sdk/test/trace/batch_span_processor_test.cc
+++ b/sdk/test/trace/batch_span_processor_test.cc
@@ -16,6 +16,7 @@
 #include <list>
 #include <memory>
 #include <thread>
+#include <utility>
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 
@@ -32,10 +33,10 @@ class MockSpanExporter final : public sdk::trace::SpanExporter
       std::shared_ptr<std::atomic<bool>> is_export_completed =
           std::shared_ptr<std::atomic<bool>>(new std::atomic<bool>(false)),
       const std::chrono::milliseconds export_delay = std::chrono::milliseconds(0)) noexcept
-      : spans_received_(spans_received),
-        shut_down_counter_(shut_down_counter),
-        is_shutdown_(is_shutdown),
-        is_export_completed_(is_export_completed),
+      : spans_received_(std::move(spans_received)),
+        shut_down_counter_(std::move(shut_down_counter)),
+        is_shutdown_(std::move(is_shutdown)),
+        is_export_completed_(std::move(is_export_completed)),
         export_delay_(export_delay)
   {}
 
@@ -96,7 +97,7 @@ class BatchSpanProcessorTestPeer : public testing::Test
 {
 public:
   std::unique_ptr<std::vector<std::unique_ptr<sdk::trace::Recordable>>> GetTestSpans(
-      std::shared_ptr<sdk::trace::SpanProcessor> processor,
+      const std::shared_ptr<sdk::trace::SpanProcessor> &processor,
       const int num_spans)
   {
     std::unique_ptr<std::vector<std::unique_ptr<sdk::trace::Recordable>>> test_spans(
diff --git a/sdk/test/trace/span_data_test.cc b/sdk/test/trace/span_data_test.cc
index 98d00843dd..6dfc09bd12 100644
--- a/sdk/test/trace/span_data_test.cc
+++ b/sdk/test/trace/span_data_test.cc
@@ -96,8 +96,8 @@ TEST(SpanData, EventAttributes)
 TEST(SpanData, Resources)
 {
   SpanData data;
-  auto resource   = opentelemetry::sdk::resource::Resource::Create({});
-  auto input_attr = resource.GetAttributes();
+  auto resource          = opentelemetry::sdk::resource::Resource::Create({});
+  const auto &input_attr = resource.GetAttributes();
   data.SetResource(resource);
   auto output_attr = data.GetResource().GetAttributes();
   EXPECT_EQ(input_attr, output_attr);
diff --git a/sdk/test/trace/tracer_test.cc b/sdk/test/trace/tracer_test.cc
index 99bab95b0f..c57b638e3d 100644
--- a/sdk/test/trace/tracer_test.cc
+++ b/sdk/test/trace/tracer_test.cc
@@ -20,7 +20,6 @@ using opentelemetry::common::SystemTimestamp;
 namespace nostd     = opentelemetry::nostd;
 namespace common    = opentelemetry::common;
 namespace trace_api = opentelemetry::trace;
-using opentelemetry::common::KeyValueIterableView;
 using opentelemetry::exporter::memory::InMemorySpanData;
 using opentelemetry::exporter::memory::InMemorySpanExporter;
 using opentelemetry::trace::SpanContext;

From 63fa4fde4ec7d1151cbf4095e442ec1f96dcb4a1 Mon Sep 17 00:00:00 2001
From: Marc Alff <marc.alff@oracle.com>
Date: Fri, 12 Jul 2024 12:17:04 +0200
Subject: [PATCH 10/13] [CI] Build failures with ABSEIL 20240116 and CMAKE 3.30
 (#3002)

---
 ci/fix-abseil-cpp-issue-1536.patch | 23 +++++++++++++++++++
 ci/install_abseil.sh               | 37 ++++++++++++++++++++++++++++++
 tools/format.sh                    |  4 ++--
 3 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 ci/fix-abseil-cpp-issue-1536.patch

diff --git a/ci/fix-abseil-cpp-issue-1536.patch b/ci/fix-abseil-cpp-issue-1536.patch
new file mode 100644
index 0000000000..7004cf0479
--- /dev/null
+++ b/ci/fix-abseil-cpp-issue-1536.patch
@@ -0,0 +1,23 @@
+commit 779a3565ac6c5b69dd1ab9183e500a27633117d5
+Author: Derek Mauro <dmauro@google.com>
+Date:   Tue Jan 30 10:13:25 2024 -0800
+
+    Avoid export of testonly target absl::test_allocator in CMake builds
+    
+    Closes #1536
+    
+    PiperOrigin-RevId: 602764437
+    Change-Id: Ia5c20a3874262a2ddb8797f608af17d7e86dd6d6
+
+diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt
+index 449a2cad..ee9ca9c3 100644
+--- a/absl/container/CMakeLists.txt
++++ b/absl/container/CMakeLists.txt
+@@ -213,6 +213,7 @@ absl_cc_library(
+   DEPS
+     absl::config
+     GTest::gmock
++  TESTONLY
+ )
+ 
+ absl_cc_test(
diff --git a/ci/install_abseil.sh b/ci/install_abseil.sh
index 46a7870627..ced090cc64 100755
--- a/ci/install_abseil.sh
+++ b/ci/install_abseil.sh
@@ -7,6 +7,8 @@ set -ex
 export DEBIAN_FRONTEND=noninteractive
 [ -z "${ABSEIL_CPP_VERSION}" ] && export ABSEIL_CPP_VERSION="20240116.1"
 
+TOPDIR=`pwd`
+
 BUILD_DIR=/tmp/
 INSTALL_DIR=/usr/local/
 pushd $BUILD_DIR
@@ -22,6 +24,41 @@ if [ ! -z "${CXX_STANDARD}" ]; then
     ABSEIL_CPP_BUILD_OPTIONS=(${ABSEIL_CPP_BUILD_OPTIONS[@]} "-DCMAKE_CXX_STANDARD=${CXX_STANDARD}")
 fi
 
+#
+# ABSEIL_CPP_VERSION="20240116.1" fails to build with CMake 3.30
+# ABSEIL_CPP_VERSION="20240116.2" fails to build with CMake 3.30
+# note that somehow the same builds with CMake 3.29.6
+#
+# Error reported:
+#   CMake Error at CMake/AbseilHelpers.cmake:317 (target_link_libraries):
+#    The link interface of target "test_allocator" contains:
+#
+#      GTest::gmock
+#
+#    but the target was not found.  Possible reasons include:
+#
+#      * There is a typo in the target name.
+#      * A find_package call is missing for an IMPORTED target.
+#      * An ALIAS target is missing.
+#
+#   Call Stack (most recent call first):
+#    absl/container/CMakeLists.txt:206 (absl_cc_library)
+#
+# Root cause:
+#   https://github.com/abseil/abseil-cpp/pull/1536
+#
+# Applying fix from abseil commit 779a3565ac6c5b69dd1ab9183e500a27633117d5
+#
+# TODO(marcalff) Cleanup once abseil is upgraded to the next LTS
+
+
+if [ "${ABSEIL_CPP_VERSION}" = "20240116.1" ] || [ "${ABSEIL_CPP_VERSION}" = "20240116.2" ]; then
+  echo "Patching abseil"
+  patch -p1 < ${TOPDIR}/ci/fix-abseil-cpp-issue-1536.patch
+else
+  echo "Not patching abseil"
+fi
+
 mkdir build && pushd build
 cmake "${ABSEIL_CPP_BUILD_OPTIONS[@]}" ..
 make -j $(nproc)
diff --git a/tools/format.sh b/tools/format.sh
index 65728b385f..3a3863a8ea 100755
--- a/tools/format.sh
+++ b/tools/format.sh
@@ -23,8 +23,8 @@ fi
 # No CRLF line endings, except Windows files.
 "${SED[@]}" 's/\r$//' $($FIND -name '*.ps1' -prune -o \
   -name '*.cmd' -prune -o -type f -print)
-# No trailing spaces.
-"${SED[@]}" 's/ \+$//' $($FIND -type f -print)
+# No trailing spaces, except in patch.
+"${SED[@]}" 's/ \+$//' $($FIND -name "*.patch" -prune -o -type f -print)
 
 # If not overridden, try to use clang-format-18 or clang-format.
 if [[ -z "$CLANG_FORMAT" ]]; then

From 323a279ec5b2e91f26630830464fb45a3ad10564 Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley@gmail.com>
Date: Fri, 12 Jul 2024 14:03:17 -0700
Subject: [PATCH 11/13] [CI] Enable bzlmod (#2995)

---
 .bazelrc     | 3 ---
 MODULE.bazel | 4 ++--
 ci/do_ci.ps1 | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index fc170b0e8b..f169347647 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -4,9 +4,6 @@
 # bazel configurations for running tests under sanitizers.
 # Based on https://github.com/bazelment/trunk/blob/master/tools/bazel.rc
 
-# TODO: Remove once support is added, avoid MODULE.bazel creation for now
-common --enable_bzlmod=false
-
 # Enable automatic configs based on platform
 common --enable_platform_specific_config
 
diff --git a/MODULE.bazel b/MODULE.bazel
index 7b84c2b719..4a03753e15 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -10,8 +10,8 @@ module(
 
 bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "com_google_absl")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
-bazel_dep(name = "curl", version = "8.4.0")
-bazel_dep(name = "grpc", version = "1.62.1", repo_name = "com_github_grpc_grpc")
+bazel_dep(name = "curl", version = "8.8.0")
+bazel_dep(name = "grpc", version = "1.63.1.bcr.1", repo_name = "com_github_grpc_grpc")
 bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "github_nlohmann_json")
 bazel_dep(name = "opentelemetry-proto", version = "1.3.1", repo_name = "com_github_opentelemetry_proto")
 bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
diff --git a/ci/do_ci.ps1 b/ci/do_ci.ps1
index 62e174854e..bcae6359bb 100644
--- a/ci/do_ci.ps1
+++ b/ci/do_ci.ps1
@@ -11,8 +11,8 @@ $nproc = (Get-ComputerInfo).CsNumberOfLogicalProcessors
 $SRC_DIR = (Get-Item -Path ".\").FullName
 
 # Workaround https://github.com/bazelbuild/bazel/issues/18683
-$BAZEL_STARTUP_OPTIONS = "--output_base=C:\Out"
-$BAZEL_OPTIONS = "--copt=-DENABLE_ASYNC_EXPORT"
+$BAZEL_STARTUP_OPTIONS = "--output_base=C:\O"
+$BAZEL_OPTIONS = "--copt=-DENABLE_ASYNC_EXPORT --compilation_mode=dbg"
 $BAZEL_TEST_OPTIONS = "$BAZEL_OPTIONS --test_output=errors"
 
 if (!(test-path build)) {

From d8ae09e53d6988a063364c86a8362053432a3f9f Mon Sep 17 00:00:00 2001
From: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
Date: Wed, 17 Jul 2024 07:00:20 -0700
Subject: [PATCH 12/13] [Metrics SDK] Fix hash calculation for nostd::string 
 (#2999)

* add test to validate cardinaity limit

* format

* warning

* Format

* maint mode CI

* modify test to reproduce the issue

* Format

* remove vscode settings

* remove redundant test

* remove unused code

* fix to calculate hash on string_view

* remove iostream

* template specialization for const char *, and varous string type tests

* unused variable warning

* more warnings

* format

* fix use-after-stack-scope

* format

* another try

* format

---------

Co-authored-by: Tom Tan <Tom.Tan@microsoft.com>
---
 .../sdk/common/attributemap_hash.h            | 11 ++-
 sdk/test/metrics/attributes_hashmap_test.cc   | 76 ++++++++++++++++++-
 sdk/test/metrics/cardinality_limit_test.cc    | 41 +++++++++-
 3 files changed, 122 insertions(+), 6 deletions(-)

diff --git a/sdk/include/opentelemetry/sdk/common/attributemap_hash.h b/sdk/include/opentelemetry/sdk/common/attributemap_hash.h
index 408070255a..e09b03d08b 100644
--- a/sdk/include/opentelemetry/sdk/common/attributemap_hash.h
+++ b/sdk/include/opentelemetry/sdk/common/attributemap_hash.h
@@ -35,6 +35,15 @@ inline void GetHash(size_t &seed, const std::vector<T> &arg)
   }
 }
 
+// Specialization for const char*
+// this creates an intermediate string.
+template <>
+inline void GetHash<const char *>(size_t &seed, const char *const &arg)
+{
+  std::hash<std::string> hasher;
+  seed ^= hasher(std::string(arg)) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+}
+
 struct GetHashForAttributeValueVisitor
 {
   GetHashForAttributeValueVisitor(size_t &seed) : seed_(seed) {}
@@ -71,7 +80,7 @@ inline size_t GetHashForAttributeMap(
         {
           return true;
         }
-        GetHash(seed, key.data());
+        GetHash(seed, key);
         auto attr_val = nostd::visit(converter, value);
         nostd::visit(GetHashForAttributeValueVisitor(seed), attr_val);
         return true;
diff --git a/sdk/test/metrics/attributes_hashmap_test.cc b/sdk/test/metrics/attributes_hashmap_test.cc
index 7e03deed47..9ae8f5cfd5 100644
--- a/sdk/test/metrics/attributes_hashmap_test.cc
+++ b/sdk/test/metrics/attributes_hashmap_test.cc
@@ -13,7 +13,6 @@ namespace nostd = opentelemetry::nostd;
 
 TEST(AttributesHashMap, BasicTests)
 {
-
   // Empty map
   AttributesHashMap hash_map;
   EXPECT_EQ(hash_map.Size(), 0);
@@ -73,3 +72,78 @@ TEST(AttributesHashMap, BasicTests)
       });
   EXPECT_EQ(count, hash_map.Size());
 }
+
+std::string make_unique_string(const char *str)
+{
+  return std::string(str);
+}
+
+TEST(AttributesHashMap, HashWithKeyValueIterable)
+{
+  std::string key1   = make_unique_string("k1");
+  std::string value1 = make_unique_string("v1");
+  std::string key2   = make_unique_string("k2");
+  std::string value2 = make_unique_string("v2");
+  std::string key3   = make_unique_string("k3");
+  std::string value3 = make_unique_string("v3");
+
+  // Create mock KeyValueIterable instances with the same content but different variables
+  std::map<std::string, std::string> attributes1({{key1, value1}, {key2, value2}});
+  std::map<std::string, std::string> attributes2({{key1, value1}, {key2, value2}});
+  std::map<std::string, std::string> attributes3({{key1, value1}, {key2, value2}, {key3, value3}});
+
+  // Create a callback that filters "k3" key
+  auto is_key_filter_k3_callback = [](nostd::string_view key) {
+    if (key == "k3")
+    {
+      return false;
+    }
+    return true;
+  };
+  // Calculate hash
+  size_t hash1 = opentelemetry::sdk::common::GetHashForAttributeMap(
+      opentelemetry::common::KeyValueIterableView<std::map<std::string, std::string>>(attributes1),
+      is_key_filter_k3_callback);
+  size_t hash2 = opentelemetry::sdk::common::GetHashForAttributeMap(
+      opentelemetry::common::KeyValueIterableView<std::map<std::string, std::string>>(attributes2),
+      is_key_filter_k3_callback);
+
+  size_t hash3 = opentelemetry::sdk::common::GetHashForAttributeMap(
+      opentelemetry::common::KeyValueIterableView<std::map<std::string, std::string>>(attributes3),
+      is_key_filter_k3_callback);
+
+  // Expect the hashes to be the same because the content is the same
+  EXPECT_EQ(hash1, hash2);
+  // Expect the hashes to be the same because the content is the same
+  EXPECT_EQ(hash1, hash3);
+}
+
+TEST(AttributesHashMap, HashConsistencyAcrossStringTypes)
+{
+  const char *c_str                 = "teststring";
+  std::string std_str               = "teststring";
+  nostd::string_view nostd_str_view = "teststring";
+#if __cplusplus >= 201703L
+  std::string_view std_str_view = "teststring";
+#endif
+
+  size_t hash_c_str          = 0;
+  size_t hash_std_str        = 0;
+  size_t hash_nostd_str_view = 0;
+#if __cplusplus >= 201703L
+  size_t hash_std_str_view = 0;
+#endif
+
+  opentelemetry::sdk::common::GetHash(hash_c_str, c_str);
+  opentelemetry::sdk::common::GetHash(hash_std_str, std_str);
+  opentelemetry::sdk::common::GetHash(hash_nostd_str_view, nostd_str_view);
+#if __cplusplus >= 201703L
+  opentelemetry::sdk::common::GetHash(hash_std_str_view, std_str_view);
+#endif
+
+  EXPECT_EQ(hash_c_str, hash_std_str);
+  EXPECT_EQ(hash_c_str, hash_nostd_str_view);
+#if __cplusplus >= 201703L
+  EXPECT_EQ(hash_c_str, hash_std_str_view);
+#endif
+}
diff --git a/sdk/test/metrics/cardinality_limit_test.cc b/sdk/test/metrics/cardinality_limit_test.cc
index 3f9483ac1c..cf94112f1a 100644
--- a/sdk/test/metrics/cardinality_limit_test.cc
+++ b/sdk/test/metrics/cardinality_limit_test.cc
@@ -47,14 +47,47 @@ TEST(CardinalityLimit, AttributesHashMapBasicTests)
         ->Aggregate(record_value);
   }
   EXPECT_EQ(hash_map.Size(), 10);  // only one more metric point should be added as overflow.
+  // record 5 more measurements to already existing (and not-overflow) metric points. They
+  // should get aggregated to these existing metric points.
+  for (auto i = 0; i < 5; i++)
+  {
+    FilteredOrderedAttributeMap attributes = {{"key", std::to_string(i)}};
+    auto hash = opentelemetry::sdk::common::GetHashForAttributeMap(attributes);
+    static_cast<LongSumAggregation *>(
+        hash_map.GetOrSetDefault(attributes, aggregation_callback, hash))
+        ->Aggregate(record_value);
+  }
+  EXPECT_EQ(hash_map.Size(), 10);  // no new metric point added
+
   // get the overflow metric point
-  auto agg = hash_map.GetOrSetDefault(
+  auto agg1 = hash_map.GetOrSetDefault(
       FilteredOrderedAttributeMap({{kAttributesLimitOverflowKey, kAttributesLimitOverflowValue}}),
       aggregation_callback, kOverflowAttributesHash);
-  EXPECT_NE(agg, nullptr);
-  auto sum_agg = static_cast<LongSumAggregation *>(agg);
-  EXPECT_EQ(nostd::get<int64_t>(nostd::get<SumPointData>(sum_agg->ToPoint()).value_),
+  EXPECT_NE(agg1, nullptr);
+  auto sum_agg1 = static_cast<LongSumAggregation *>(agg1);
+  EXPECT_EQ(nostd::get<int64_t>(nostd::get<SumPointData>(sum_agg1->ToPoint()).value_),
             record_value * 6);  // 1 from previous 10, 5 from current 5.
+  // get remaining metric points
+  for (auto i = 0; i < 9; i++)
+  {
+    FilteredOrderedAttributeMap attributes = {{"key", std::to_string(i)}};
+    auto hash = opentelemetry::sdk::common::GetHashForAttributeMap(attributes);
+    auto agg2 = hash_map.GetOrSetDefault(
+        FilteredOrderedAttributeMap({{kAttributesLimitOverflowKey, kAttributesLimitOverflowValue}}),
+        aggregation_callback, hash);
+    EXPECT_NE(agg2, nullptr);
+    auto sum_agg2 = static_cast<LongSumAggregation *>(agg2);
+    if (i < 5)
+    {
+      EXPECT_EQ(nostd::get<int64_t>(nostd::get<SumPointData>(sum_agg2->ToPoint()).value_),
+                record_value * 2);  // 1 from first recording, 1 from third recording
+    }
+    else
+    {
+      EXPECT_EQ(nostd::get<int64_t>(nostd::get<SumPointData>(sum_agg2->ToPoint()).value_),
+                record_value);  // 1 from first recording
+    }
+  }
 }
 
 class WritableMetricStorageCardinalityLimitTestFixture

From baecbb95bd63df53e0af16e87bc683967962c5f8 Mon Sep 17 00:00:00 2001
From: Marc Alff <marc.alff@oracle.com>
Date: Wed, 17 Jul 2024 22:04:10 +0200
Subject: [PATCH 13/13] [RELEASE] Release opentelemetry-cpp version 1.16.1
 (#3007)

---
 CHANGELOG.md                                  | 39 ++++++++++++++++++-
 api/include/opentelemetry/version.h           |  4 +-
 docs/public/conf.py                           |  2 +-
 .../opentelemetry/sdk/version/version.h       |  2 +-
 sdk/src/version/version.cc                    |  8 ++--
 5 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92e234a77b..fad2b0cc78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,15 +15,50 @@ Increment the:
 
 ## [Unreleased]
 
+## [1.16.1 2024-07-17]
+
+* [BUILD] Add bazel missing BUILD file
+  [#2720](https://github.com/open-telemetry/opentelemetry-cpp/pull/2720)
+
+* [SDK] Added reserve for spans array in BatchSpanProcessor.
+  [#2724](https://github.com/open-telemetry/opentelemetry-cpp/pull/2724)
+
+* [DOC] Update "Using triplets" section in building-with-vcpkg documentation.
+  [#2726](https://github.com/open-telemetry/opentelemetry-cpp/pull/2726)
+
+* [DOC] Remove comment for unused LoggerProvider initialization params
+  [#2972](https://github.com/open-telemetry/opentelemetry-cpp/pull/2972)
+
 * [SECURITY] Remove OTLP HTTP support for TLS 1.0 and TLS 1.1,
   require TLS 1.2 or better
-  [#2721](https://github.com/open-telemetry/opentelemetry-cpp/pull/2721)
+  [#2722](https://github.com/open-telemetry/opentelemetry-cpp/pull/2722)
+
+* [TEST] Fix opentelemetry-collector bind address
+  [#2989](https://github.com/open-telemetry/opentelemetry-cpp/pull/2989)
+
+* [EXPORTER] Fix references in AttributeValueVisitor
+  [#2985](https://github.com/open-telemetry/opentelemetry-cpp/pull/2985)
+
+* [Code health] include-what-you-use cleanup, part 2
+  [#2704](https://github.com/open-telemetry/opentelemetry-cpp/pull/2704)
+
+* [Code Health] clang-tidy cleanup, part 1
+  [#2990](https://github.com/open-telemetry/opentelemetry-cpp/pull/2990)
+
+* [CI] Build failures with ABSEIL 20240116 and CMAKE 3.30
+  [#3002](https://github.com/open-telemetry/opentelemetry-cpp/pull/3002)
+
+* [CI] Enable bzlmod
+  [#2995](https://github.com/open-telemetry/opentelemetry-cpp/pull/2995)
+
+* [Metrics SDK] Fix hash calculation for nostd::string
+  [#2999](https://github.com/open-telemetry/opentelemetry-cpp/pull/2999)
 
 Breaking changes:
 
 * [SECURITY] Remove OTLP HTTP support for TLS 1.0 and TLS 1.1,
   require TLS 1.2 or better
-  [#2721](https://github.com/open-telemetry/opentelemetry-cpp/pull/2721)
+  [#2722](https://github.com/open-telemetry/opentelemetry-cpp/pull/2722)
   * The OTLP HTTP exporter no longer accept options like:
     * min_TLS = 1.0
     * min_TLS = 1.1
diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h
index e09c193659..d98ac978f2 100644
--- a/api/include/opentelemetry/version.h
+++ b/api/include/opentelemetry/version.h
@@ -10,10 +10,10 @@
 #  define OPENTELEMETRY_ABI_VERSION_NO 1
 #endif
 
-#define OPENTELEMETRY_VERSION "1.16.0"
+#define OPENTELEMETRY_VERSION "1.16.1"
 #define OPENTELEMETRY_VERSION_MAJOR 1
 #define OPENTELEMETRY_VERSION_MINOR 16
-#define OPENTELEMETRY_VERSION_PATCH 0
+#define OPENTELEMETRY_VERSION_PATCH 1
 
 #define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)
 
diff --git a/docs/public/conf.py b/docs/public/conf.py
index 927e07751a..96caa2b43a 100644
--- a/docs/public/conf.py
+++ b/docs/public/conf.py
@@ -24,7 +24,7 @@
 author = 'OpenTelemetry authors'
 
 # The full version, including alpha/beta/rc tags
-release = "1.16.0"
+release = "1.16.1"
 
 # Run sphinx on subprojects and copy output
 # -----------------------------------------
diff --git a/sdk/include/opentelemetry/sdk/version/version.h b/sdk/include/opentelemetry/sdk/version/version.h
index bfc93238b4..86b815e3bc 100644
--- a/sdk/include/opentelemetry/sdk/version/version.h
+++ b/sdk/include/opentelemetry/sdk/version/version.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#define OPENTELEMETRY_SDK_VERSION "1.16.0"
+#define OPENTELEMETRY_SDK_VERSION "1.16.1"
 
 #include "opentelemetry/version.h"
 
diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc
index e5fdbda99d..80f2226400 100644
--- a/sdk/src/version/version.cc
+++ b/sdk/src/version/version.cc
@@ -13,12 +13,12 @@ namespace version
 {
 const int major_version    = 1;
 const int minor_version    = 16;
-const int patch_version    = 0;
+const int patch_version    = 1;
 const char *pre_release    = "NONE";
 const char *build_metadata = "NONE";
-const char *short_version  = "1.16.0";
-const char *full_version   = "1.16.0-NONE-NONE";
-const char *build_date     = "Fri Jun 21 16:41:17 UTC 2024";
+const char *short_version  = "1.16.1";
+const char *full_version   = "1.16.1-NONE-NONE";
+const char *build_date     = "Wed Jul 17 17:34:38 UTC 2024";
 }  // namespace version
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE