From 27a58cdc259b0d5d4c0ed8732eaf7949c21559f0 Mon Sep 17 00:00:00 2001
From: Bogdan Drutu <bogdandrutu@gmail.com>
Date: Fri, 1 Dec 2023 00:25:25 -0800
Subject: [PATCH 1/2] [BUILD] Fix references to trace namespace to be fully
 qualified (#2422)

---
 .../opentelemetry/sdk/metrics/data/exemplar_data.h        | 8 ++++----
 .../opentelemetry/sdk/metrics/exemplar/reservoir_cell.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sdk/include/opentelemetry/sdk/metrics/data/exemplar_data.h b/sdk/include/opentelemetry/sdk/metrics/data/exemplar_data.h
index 0420b50aab..efad19b098 100644
--- a/sdk/include/opentelemetry/sdk/metrics/data/exemplar_data.h
+++ b/sdk/include/opentelemetry/sdk/metrics/data/exemplar_data.h
@@ -26,7 +26,7 @@ using MetricAttributes = opentelemetry::sdk::common::OrderedAttributeMap;
 class ExemplarData
 {
 public:
-  static ExemplarData Create(std::shared_ptr<trace::SpanContext> context,
+  static ExemplarData Create(std::shared_ptr<opentelemetry::trace::SpanContext> context,
                              const opentelemetry::common::SystemTimestamp &timestamp,
                              const PointDataAttributes &point_data_attr)
   {
@@ -47,7 +47,7 @@ class ExemplarData
    * Returns the SpanContext associated with this exemplar. If the exemplar was not recorded
    * inside a sampled trace, the Context will be invalid.
    */
-  const trace::SpanContext &GetSpanContext() const noexcept { return context_; }
+  const opentelemetry::trace::SpanContext &GetSpanContext() const noexcept { return context_; }
 
   static PointType CreateSumPointData(ValueType value)
   {
@@ -68,13 +68,13 @@ class ExemplarData
   static PointType CreateDropPointData() { return DropPointData{}; }
 
 private:
-  ExemplarData(std::shared_ptr<trace::SpanContext> context,
+  ExemplarData(std::shared_ptr<opentelemetry::trace::SpanContext> context,
                opentelemetry::common::SystemTimestamp timestamp,
                const PointDataAttributes &point_data_attr)
       : context_(*context.get()), timestamp_(timestamp), point_data_attr_(point_data_attr)
   {}
 
-  trace::SpanContext context_;
+  opentelemetry::trace::SpanContext context_;
   opentelemetry::common::SystemTimestamp timestamp_;
   PointDataAttributes point_data_attr_;
 };
diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h
index 6074393d2d..772c1cc1f1 100644
--- a/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h
+++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h
@@ -137,13 +137,13 @@ class ReservoirCell
       auto current_ctx = span->GetContext();
       if (current_ctx.IsValid())
       {
-        context_.reset(new trace::SpanContext{current_ctx});
+        context_.reset(new opentelemetry::trace::SpanContext{current_ctx});
       }
     }
   }
 
   // Cell stores either long or double values, but must not store both
-  std::shared_ptr<trace::SpanContext> context_;
+  std::shared_ptr<opentelemetry::trace::SpanContext> context_;
   nostd::variant<int64_t, double> value_;
   opentelemetry::common::SystemTimestamp record_time_;
   MetricAttributes attributes_;

From 25343e6e3ba5e85645684bc36d18001eddfc9700 Mon Sep 17 00:00:00 2001
From: Bogdan Drutu <bogdandrutu@gmail.com>
Date: Fri, 1 Dec 2023 01:08:25 -0800
Subject: [PATCH 2/2] Bump third_party/googletest to same version as bazel
 (#2421)

---
 third_party/googletest | 2 +-
 third_party_release    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/third_party/googletest b/third_party/googletest
index 58d77fa807..b796f7d446 160000
--- a/third_party/googletest
+++ b/third_party/googletest
@@ -1 +1 @@
-Subproject commit 58d77fa8070e8cec2dc1ed015d66b454c8d78850
+Subproject commit b796f7d44681514f58a683a3a71ff17c94edb0c1
diff --git a/third_party_release b/third_party_release
index 9fae12fc31..817d9b728e 100644
--- a/third_party_release
+++ b/third_party_release
@@ -16,7 +16,7 @@
 gRPC=v1.49.2
 abseil=20220623.1
 benchmark=v1.7.1
-googletest=release-1.13.0
+googletest=1.13.0
 ms-gsl=v3.1.0-67-g6f45293
 nlohmann-json=v3.11.2
 opentelemetry-proto=v1.0.0