feat: Upgrade io_opentelemetry_cpp to 1.20.0

This reverts commit f2c4e4d, which is the revert of "feat(deps): Upgrade io_opentelemetry_cpp to 1.17.0".

This CL also contains additional fixes needed for the upgrade to 1.20.0.

Bug: b/410654574
Change-Id: I664d8b3e5f4d4dd28b1bfae54c3b984ee327269f
GitOrigin-RevId: 058a423c6731e57bb588a2369cd61390c68d0921

Author: Privacy Sandbox Team

.bazelrc

@@ -150,11 +150,11 @@ build:ubsan --copt=-fno-sanitize=function
 build:ubsan --copt=-fno-sanitize=vptr
 build:ubsan --test_tag_filters=-noubsan
 
-# Required to build OpenTelemetry with Abseil
-build:otel --@io_opentelemetry_cpp//api:with_abseil
 # Required to build OpenTelemtry with logs API.
 # TODO(b/287675870): Delete the following when the feature is no longer experimental.
 build:otel --copt=-DENABLE_LOGS_PREVIEW
+# Ensure binary compatibility with OpenTelemetry ABI version 2.
+build:otel --@io_opentelemetry_cpp//api:abi_version_no=2
 
 build:instance_local --//:instance=local
 

src/metric/metric_router.cc

@@ -50,16 +50,17 @@ void MetricRouter::AddHistogramView(
       histogram_boundaries.begin(), histogram_boundaries.end());
   auto* sdk_meter = static_cast<sdk::Meter*>(meter_);
   static_cast<sdk::MeterProvider*>(provider_.get())
-      ->AddView(
-          std::make_unique<sdk::InstrumentSelector>(
-              sdk::InstrumentType::kHistogram, instrument_name.data()),
-          std::make_unique<sdk::MeterSelector>(
-              sdk_meter->GetInstrumentationScope()->GetName(),
-              sdk_meter->GetInstrumentationScope()->GetVersion(),
-              sdk_meter->GetInstrumentationScope()->GetSchemaURL()),
-          // First 2 arguments use empty string, so not to overwrite
-          // instrument's name and description
-          std::make_unique<sdk::View>("", "", sdk::AggregationType::kHistogram,
-                                      aggregation_config));
+      ->AddView(std::make_unique<sdk::InstrumentSelector>(
+                    sdk::InstrumentType::kHistogram,
+                    std::string(instrument_name), /*unit=*/""),
+                std::make_unique<sdk::MeterSelector>(
+                    sdk_meter->GetInstrumentationScope()->GetName(),
+                    sdk_meter->GetInstrumentationScope()->GetVersion(),
+                    sdk_meter->GetInstrumentationScope()->GetSchemaURL()),
+                // First three arguments use empty string, so not to overwrite
+                // the instrument's name, description and units
+                std::make_unique<sdk::View>(
+                    /*name=*/"", /*description=*/"", /*unit=*/"",
+                    sdk::AggregationType::kHistogram, aggregation_config));
 }
 }  // namespace privacy_sandbox::server_common::metrics

src/telemetry/init_aws.cc

@@ -15,6 +15,7 @@
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h"
+#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h"
 #include "opentelemetry/sdk/trace/random_id_generator_factory.h"
 
@@ -42,7 +43,7 @@ CreatePeriodicExportingMetricReader(
     absl::optional<std::string> collector_endpoint) {
   opentelemetry::exporter::otlp::OtlpGrpcMetricExporterOptions exporter_options;
   exporter_options.aggregation_temporality =
-      opentelemetry::sdk::metrics::AggregationTemporality::kDelta;
+      opentelemetry::exporter::otlp::PreferredAggregationTemporality::kDelta;
   if (collector_endpoint.has_value() && !collector_endpoint->empty()) {
     exporter_options.endpoint = *collector_endpoint;
   }
@@ -56,7 +57,7 @@ CreatePeriodicExportingMetricReader(
 
 std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>
 CreateLogRecordExporter(absl::optional<std::string> collector_endpoint) {
-  opentelemetry::exporter::otlp::OtlpGrpcExporterOptions opts;
+  opentelemetry::exporter::otlp::OtlpGrpcLogRecordExporterOptions opts;
   if (collector_endpoint.has_value() && !collector_endpoint->empty()) {
     opts.endpoint = *collector_endpoint;
   }

src/telemetry/init_azure.cc

@@ -15,6 +15,7 @@
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h"
+#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h"
 #include "opentelemetry/sdk/trace/random_id_generator_factory.h"
 
@@ -53,7 +54,7 @@ std::unique_ptr<opentelemetry::sdk::trace::IdGenerator> CreateIdGenerator() {
 
 std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>
 CreateLogRecordExporter(absl::optional<std::string> collector_endpoint) {
-  opentelemetry::exporter::otlp::OtlpGrpcExporterOptions opts;
+  opentelemetry::exporter::otlp::OtlpGrpcLogRecordExporterOptions opts;
   if (collector_endpoint.has_value() && !collector_endpoint->empty()) {
     opts.endpoint = *collector_endpoint;
   }

src/telemetry/init_gcp.cc

@@ -15,6 +15,7 @@
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h"
+#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h"
 #include "opentelemetry/sdk/trace/random_id_generator_factory.h"
 
@@ -53,7 +54,7 @@ std::unique_ptr<opentelemetry::sdk::trace::IdGenerator> CreateIdGenerator() {
 
 std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>
 CreateLogRecordExporter(absl::optional<std::string> collector_endpoint) {
-  opentelemetry::exporter::otlp::OtlpGrpcExporterOptions opts;
+  opentelemetry::exporter::otlp::OtlpGrpcLogRecordExporterOptions opts;
   if (collector_endpoint.has_value() && !collector_endpoint->empty()) {
     opts.endpoint = *collector_endpoint;
   }

src/telemetry/metrics_recorder.cc

@@ -45,6 +45,9 @@ constexpr double kDefaultHistogramBuckets[] = {
 };
 
 class NoopMetricsRecorder : public MetricsRecorder {
+ public:
+  ~NoopMetricsRecorder() override = default;
+
   void IncrementEventStatus(std::string event, absl::Status status,
                             uint64_t count = 1) override {}
 
@@ -72,14 +75,16 @@ class MetricsRecorderImpl : public MetricsRecorder {
     event_status_count_ = meter->CreateUInt64Counter(
         "EventStatus", "Count of status code associated with events.");
 
-    // Catch all histogram, with preconfigured buckets which should work for
+    // Catch-all histogram, with preconfigured buckets which should work for
     // most latencies distribution.
-    RegisterHistogramView("Latency", "Latency View", {});
+    RegisterHistogramView("Latency", "Latency View", "ns", {});
     latency_histogram_ = meter->CreateUInt64Histogram(
         "Latency", "Histogram of latencies associated with events.",
         "nanosecond");
   }
 
+  ~MetricsRecorderImpl() override = default;
+
   void IncrementEventStatus(std::string event, absl::Status status,
                             uint64_t count = 1) override {
     absl::flat_hash_map<std::string, std::string> labels = common_labels_;
@@ -132,7 +137,7 @@ class MetricsRecorderImpl : public MetricsRecorder {
         key_iter != histograms_.end()) {
       return;
     }
-    RegisterHistogramView(event, description, bucket_boundaries);
+    RegisterHistogramView(event, description, unit, bucket_boundaries);
     auto meter = GetMeter();
     auto histogram = meter->CreateUInt64Histogram(event, description, unit);
     histograms_.insert_or_assign(std::move(event), std::move(histogram));
@@ -143,7 +148,9 @@ class MetricsRecorderImpl : public MetricsRecorder {
   }
 
  private:
-  void RegisterHistogramView(std::string name, std::string description,
+  void RegisterHistogramView(const std::string& name,
+                             const std::string& description,
+                             const std::string& unit,
                              std::vector<double> bucket_boundaries) {
     if (bucket_boundaries.empty()) {
       bucket_boundaries.insert(bucket_boundaries.begin(),
@@ -161,13 +168,13 @@ class MetricsRecorderImpl : public MetricsRecorder {
     }
     auto histogram_instrument_selector =
         std::make_unique<metric_sdk::InstrumentSelector>(
-            metric_sdk::InstrumentType::kHistogram, name);
+            metric_sdk::InstrumentType::kHistogram, name, unit);
     auto histogram_meter_selector = GetMeterSelector(std::string{kSchema});
     auto histogram_aggregation_config =
         std::make_shared<metric_sdk::HistogramAggregationConfig>();
     histogram_aggregation_config->boundaries_ = bucket_boundaries;
     auto histogram_view = std::make_unique<metric_sdk::View>(
-        name, description, metric_sdk::AggregationType::kHistogram,
+        name, description, unit, metric_sdk::AggregationType::kHistogram,
         std::move(histogram_aggregation_config));
     sdk_provider->AddView(std::move(histogram_instrument_selector),
                           std::move(histogram_meter_selector),

src/telemetry/telemetry_test.cc

@@ -19,6 +19,7 @@
 
 #include "opentelemetry/logs/provider.h"
 #include "opentelemetry/metrics/provider.h"
+#include "opentelemetry/trace/noop.h"
 
 #include "telemetry_provider.h"
 

src/telemetry/trace_generator_aws.cc

@@ -31,7 +31,8 @@ namespace {
 class XRayIdGenerator : public opentelemetry::sdk::trace::IdGenerator {
  public:
   explicit XRayIdGenerator(std::function<absl::Time()> now_func)
-      : random_generator_(
+      : opentelemetry::sdk::trace::IdGenerator(/*is_random=*/true),
+        random_generator_(
             opentelemetry::sdk::trace::RandomIdGeneratorFactory::Create()),
         now_func_(std::move(now_func)) {}
 
@@ -44,7 +45,7 @@ class XRayIdGenerator : public opentelemetry::sdk::trace::IdGenerator {
   // example:
   // https://github.com/alfianabdi/opentelemetry-cpp/blob/main/sdk/trace/aws_xray_id_generator.cc
   opentelemetry::trace::TraceId GenerateTraceId() noexcept override {
-    const uint32_t seconds_nl = htonl(absl::ToUnixSeconds(now_func_()));
+    const uint32_t seconds_nl = ::htonl(absl::ToUnixSeconds(now_func_()));
     const uint64_t lo =
         absl::Uniform(bitgen_, 0u, std::numeric_limits<decltype(lo)>::max());
     const uint32_t hi =

third_party/cpp_deps.bzl

@@ -124,10 +124,13 @@ def cpp_dependencies():
     maybe(
         http_archive,
         name = "io_opentelemetry_cpp",
-        sha256 = "c61f4c6f820b04b920f35f84a3867cd44138bac4da21d21fbc00645c97e2051e",
-        strip_prefix = "opentelemetry-cpp-1.9.1",
+        patch_args = ["-p1"],
+        # TODO(b/411264995): Remove this patch once https://github.com/open-telemetry/opentelemetry-cpp/issues/3354 is fixed.
+        patches = [Label("//third_party:io_opentelemetry_cpp.patch")],
+        sha256 = "2562959b23c8216406d13c6726aa14dc9cbbf15d9efdc8b7ce0aa5c1abb0be1c",
+        strip_prefix = "opentelemetry-cpp-1.20.0",
         urls = [
-            "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.9.1.zip",
+            "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.20.0.zip",
         ],
     )
     maybe(

third_party/io_opentelemetry_cpp.patch

@@ -0,0 +1,24 @@
+diff --git a/api/include/opentelemetry/nostd/type_traits.h b/api/include/opentelemetry/nostd/type_traits.h
+index 3a64b5db1..3517bcc52 100644
+--- a/api/include/opentelemetry/nostd/type_traits.h
++++ b/api/include/opentelemetry/nostd/type_traits.h
+@@ -3,6 +3,9 @@
+ 
+ #pragma once
+ 
++#include "opentelemetry/config.h"
++#include "opentelemetry/version.h"
++
+ #if defined(OPENTELEMETRY_STL_VERSION)
+ #  if OPENTELEMETRY_STL_VERSION >= 2011
+ #    include "opentelemetry/std/type_traits.h"
+@@ -14,9 +17,7 @@
+ #  include <array>
+ #  include <type_traits>
+ 
+-#  include "opentelemetry/config.h"
+ #  include "opentelemetry/nostd/detail/void.h"  // IWYU pragma: export
+-#  include "opentelemetry/version.h"
+ #endif
+ 
+ OPENTELEMETRY_BEGIN_NAMESPACE