Merge branch 'main' into Remove_NOMINMAX_InAPI

open-telemetry · Dec 1, 2023 · 32979c4 · 32979c4
2 parents 8f1e81f + 25343e6
commit 32979c4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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_;

diff --git a/third_party/googletest b/third_party/googletest
diff --git 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
+0 −43		.github/ISSUE_TEMPLATE/00-bug_report.md
+53 −0		.github/ISSUE_TEMPLATE/00-bug_report.yml
+0 −24		.github/ISSUE_TEMPLATE/10-feature_request.md
+33 −0		.github/ISSUE_TEMPLATE/10-feature_request.yml
+4 −0		.github/ISSUE_TEMPLATE/config.yml
+10 −7		.github/workflows/gtest-ci.yml
+6 −1		CMakeLists.txt
+2 −2		CONTRIBUTING.md
+12 −36		README.md
+20 −19		WORKSPACE
+6 −2		ci/linux-presubmit.sh
+4 −2		ci/macos-presubmit.sh
+56 −0		ci/windows-presubmit.bat
+1 −1		docs/_layouts/default.html
+17 −8		docs/advanced.md
+1 −1		docs/faq.md
+1 −1		docs/gmock_cheat_sheet.md
+15 −14		docs/gmock_cook_book.md
+1 −0		docs/primer.md
+8 −9		docs/quickstart-bazel.md
+6 −6		docs/quickstart-cmake.md
+1 −1		docs/reference/testing.md
+1 −1		docs/samples.md
+9 −5		googlemock/include/gmock/gmock-actions.h
+8 −5		googlemock/include/gmock/gmock-function-mocker.h
+34 −24		googlemock/include/gmock/gmock-matchers.h
+38 −7		googlemock/include/gmock/gmock-more-matchers.h
+31 −3		googlemock/include/gmock/gmock-spec-builders.h
+25 −11		googlemock/include/gmock/internal/gmock-internal-utils.h
+5 −4		googlemock/src/gmock-internal-utils.cc
+17 −0		googlemock/src/gmock-matchers.cc
+18 −4		googlemock/src/gmock-spec-builders.cc
+4 −4		googlemock/test/gmock-actions_test.cc
+15 −0		googlemock/test/gmock-function-mocker_test.cc
+41 −0		googlemock/test/gmock-matchers-comparisons_test.cc
+2 −2		googlemock/test/gmock-matchers-containers_test.cc
+15 −1		googlemock/test/gmock-matchers-misc_test.cc
+12 −9		googlemock/test/gmock-spec-builders_test.cc
+3 −0		googlemock/test/gmock_output_test.py
+4 −4		googlemock/test/gmock_output_test_golden.txt
+16 −0		googletest/CMakeLists.txt
+7 −7		googletest/README.md
+19 −5		googletest/cmake/internal_utils.cmake
+1 −1		googletest/include/gtest/gtest-matchers.h
+2 −0		googletest/include/gtest/gtest-message.h
+41 −6		googletest/include/gtest/gtest-param-test.h
+85 −2		googletest/include/gtest/gtest-printers.h
+2 −0		googletest/include/gtest/gtest-spi.h
+2 −0		googletest/include/gtest/gtest-test-part.h
+31 −10		googletest/include/gtest/gtest.h
+2 −1		googletest/include/gtest/internal/gtest-death-test-internal.h
+17 −0		googletest/include/gtest/internal/gtest-filepath.h
+5 −4		googletest/include/gtest/internal/gtest-internal.h
+75 −0		googletest/include/gtest/internal/gtest-param-util.h
+2 −0		googletest/include/gtest/internal/gtest-port-arch.h
+146 −99		googletest/include/gtest/internal/gtest-port.h
+1 −0		googletest/include/gtest/internal/gtest-string.h
+4 −0		googletest/include/gtest/internal/gtest-type-util.h
+2 −2		googletest/src/gtest-death-test.cc
+63 −20		googletest/src/gtest-filepath.cc
+9 −4		googletest/src/gtest-internal-inl.h
+1 −1		googletest/src/gtest-printers.cc
+121 −72		googletest/src/gtest.cc
+12 −0		googletest/src/gtest_main.cc
+1 −0		googletest/test/googletest-color-test.py
+20 −0		googletest/test/googletest-filepath-test.cc
+3 −0		googletest/test/googletest-message-test.cc
+2 −0		googletest/test/googletest-options-test.cc
+71 −11		googletest/test/googletest-param-test-test.cc
+1 −0		googletest/test/googletest-port-test.cc
+32 −1		googletest/test/googletest-printers-test.cc
+1 −0		googletest/test/gtest-typed-test_test.cc
+2 −2		googletest/test/gtest-unittest-api_test.cc
+97 −0		googletest/test/gtest_dirs_test.cc
+1 −0		googletest/test/gtest_pred_impl_unittest.cc
+7 −3		googletest/test/gtest_unittest.cc
+3 −1		googletest/test/gtest_xml_outfile2_test_.cc