Merge branch 'main' into allow_construct_grpc_exporters_with_existed_grpc_client

Author: owent

ci/do_ci.sh

@@ -484,8 +484,8 @@ elif [[ "$1" == "bazel.noexcept" ]]; then
   # there are some exceptions and error handling code from the Prometheus Client
   # as well as Opentracing shim (due to some third party code in its Opentracing dependency)
   # that make this test always fail. Ignore these packages in the noexcept test here.
-  bazel $BAZEL_STARTUP_OPTIONS build --copt=-fno-exceptions $BAZEL_OPTIONS_ASYNC -- //... -//exporters/prometheus/... -//examples/prometheus/... -//sdk/test/metrics:attributes_hashmap_test -//opentracing-shim/...
-  bazel $BAZEL_STARTUP_OPTIONS test --copt=-fno-exceptions $BAZEL_TEST_OPTIONS_ASYNC -- //... -//exporters/prometheus/... -//examples/prometheus/... -//sdk/test/metrics:attributes_hashmap_test -//opentracing-shim/...
+  bazel $BAZEL_STARTUP_OPTIONS build --copt=-fno-exceptions $BAZEL_OPTIONS_ASYNC -- //... -//exporters/prometheus/... -//examples/prometheus/... -//opentracing-shim/...
+  bazel $BAZEL_STARTUP_OPTIONS test --copt=-fno-exceptions $BAZEL_TEST_OPTIONS_ASYNC -- //... -//exporters/prometheus/... -//examples/prometheus/... -//opentracing-shim/...
   exit 0
 elif [[ "$1" == "bazel.nortti" ]]; then
   # there are some exceptions and error handling code from the Prometheus Client

examples/logs_simple/main.cc

@@ -44,18 +44,18 @@ void InitTracer()
   auto exporter  = trace_exporter::OStreamSpanExporterFactory::Create();
   auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
 
-  std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> provider =
-      opentelemetry::sdk::trace::TracerProviderFactory::Create(std::move(processor));
+  std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> sdk_provider =
+      trace_sdk::TracerProviderFactory::Create(std::move(processor));
 
   // Set the global trace provider
-  const std::shared_ptr<trace_api::TracerProvider> &api_provider = provider;
+  const std::shared_ptr<trace_api::TracerProvider> &api_provider = sdk_provider;
   trace_api::Provider::SetTracerProvider(api_provider);
 }
 
 void CleanupTracer()
 {
-  std::shared_ptr<trace_api::TracerProvider> none;
-  trace_api::Provider::SetTracerProvider(none);
+  std::shared_ptr<trace_api::TracerProvider> noop;
+  trace_api::Provider::SetTracerProvider(noop);
 }
 
 void InitLogger()
@@ -65,18 +65,18 @@ void InitLogger()
       std::unique_ptr<logs_sdk::LogRecordExporter>(new logs_exporter::OStreamLogRecordExporter);
   auto processor = logs_sdk::SimpleLogRecordProcessorFactory::Create(std::move(exporter));
 
-  std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> provider(
-      opentelemetry::sdk::logs::LoggerProviderFactory::Create(std::move(processor)));
+  std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> sdk_provider(
+      logs_sdk::LoggerProviderFactory::Create(std::move(processor)));
 
   // Set the global logger provider
-  const std::shared_ptr<logs_api::LoggerProvider> &api_provider = provider;
+  const std::shared_ptr<logs_api::LoggerProvider> &api_provider = sdk_provider;
   logs_api::Provider::SetLoggerProvider(api_provider);
 }
 
 void CleanupLogger()
 {
-  std::shared_ptr<logs_api::LoggerProvider> none;
-  logs_api::Provider::SetLoggerProvider(none);
+  std::shared_ptr<logs_api::LoggerProvider> noop;
+  logs_api::Provider::SetLoggerProvider(noop);
 }
 
 }  // namespace

examples/otlp/opentelemetry-collector-config/config.dev.yaml

@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 exporters:
-  logging:
-    loglevel: DEBUG
+  debug:
+    verbosity: detailed
 receivers:
   otlp:
     protocols:
@@ -17,14 +17,14 @@ service:
       receivers:
       - otlp
       exporters:
-      - logging
+      - debug
     logs:
       receivers:
       - otlp
       exporters:
-      - logging
+      - debug
     metrics:
       receivers:
       - otlp
       exporters:
-      - logging
+      - debug

examples/simple/main.cc

@@ -31,18 +31,18 @@ void InitTracer()
   auto exporter  = trace_exporter::OStreamSpanExporterFactory::Create();
   auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
 
-  std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> provider =
-      opentelemetry::sdk::trace::TracerProviderFactory::Create(std::move(processor));
+  std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> sdk_provider =
+      trace_sdk::TracerProviderFactory::Create(std::move(processor));
 
   // Set the global trace provider
-  const std::shared_ptr<opentelemetry::trace::TracerProvider> &api_provider = provider;
+  const std::shared_ptr<opentelemetry::trace::TracerProvider> &api_provider = sdk_provider;
   trace_api::Provider::SetTracerProvider(api_provider);
 }
 
 void CleanupTracer()
 {
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_api::Provider::SetTracerProvider(none);
+  std::shared_ptr<opentelemetry::trace::TracerProvider> noop;
+  trace_api::Provider::SetTracerProvider(noop);
 }
 }  // namespace
 

functional/otlp/otel-config-http.yaml

@@ -22,12 +22,12 @@ processors:
     check_interval: 5s
 
 exporters:
-  logging:
-    loglevel: debug
+  debug:
+    verbosity: detailed
 
 service:
   pipelines:
     traces:
       receivers: [otlp]
       processors: [memory_limiter, batch]
-      exporters: [logging]
+      exporters: [debug]

functional/otlp/otel-config-https.yaml

@@ -29,12 +29,12 @@ processors:
     check_interval: 5s
 
 exporters:
-  logging:
-    loglevel: debug
+  debug:
+    verbosity: detailed
 
 service:
   pipelines:
     traces:
       receivers: [otlp]
       processors: [memory_limiter, batch]
-      exporters: [logging]
+      exporters: [debug]

functional/otlp/otel-docker-config-http.yaml

@@ -21,12 +21,12 @@ processors:
     check_interval: 5s
 
 exporters:
-  logging:
-    loglevel: debug
+  debug:
+    verbosity: detailed
 
 service:
   pipelines:
     traces:
       receivers: [otlp]
       processors: [memory_limiter, batch]
-      exporters: [logging]
+      exporters: [debug]

functional/otlp/otel-docker-config-https.yaml

@@ -28,12 +28,12 @@ processors:
     check_interval: 5s
 
 exporters:
-  logging:
-    loglevel: debug
+  debug:
+    verbosity: detailed
 
 service:
   pipelines:
     traces:
       receivers: [otlp]
       processors: [memory_limiter, batch]
-      exporters: [logging]
+      exporters: [debug]

sdk/src/metrics/export/periodic_exporting_metric_reader.cc

@@ -218,7 +218,7 @@ bool PeriodicExportingMetricReader::OnForceFlush(std::chrono::microseconds timeo
     // - If original `timeout` is `zero`, use that in exporter::forceflush
     // - Else if remaining `timeout_steady` more than zero, use that in exporter::forceflush
     // - Else don't invoke exporter::forceflush ( as remaining time is zero or less)
-    if (timeout <= std::chrono::steady_clock::duration::zero())
+    if (timeout <= std::chrono::milliseconds::duration::zero())
     {
       result =
           exporter_->ForceFlush(std::chrono::duration_cast<std::chrono::microseconds>(timeout));

sdk/src/metrics/meter_context.cc

@@ -168,46 +168,36 @@ bool MeterContext::ForceFlush(std::chrono::microseconds timeout) noexcept
   bool result = true;
   // Simultaneous flush not allowed.
   const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(forceflush_lock_);
-  // Convert to nanos to prevent overflow
-  auto timeout_ns = (std::chrono::nanoseconds::max)();
-  if (std::chrono::duration_cast<std::chrono::microseconds>(timeout_ns) > timeout)
-  {
-    timeout_ns = std::chrono::duration_cast<std::chrono::nanoseconds>(timeout);
-  }
-
-  auto current_time = std::chrono::system_clock::now();
-  std::chrono::system_clock::time_point expire_time;
-  auto overflow_checker = (std::chrono::system_clock::time_point::max)();
 
-  // check if the expected expire time doesn't overflow.
-  if (overflow_checker - current_time > timeout_ns)
+  auto time_remaining = (std::chrono::steady_clock::duration::max)();
+  if (std::chrono::duration_cast<std::chrono::microseconds>(time_remaining) > timeout)
   {
-    expire_time =
-        current_time + std::chrono::duration_cast<std::chrono::system_clock::duration>(timeout_ns);
+    time_remaining = timeout;
   }
-  else
+
+  auto current_time = std::chrono::steady_clock::now();
+  auto expire_time  = (std::chrono::steady_clock::time_point::max)();
+  if (expire_time - current_time > time_remaining)
   {
-    // overflow happens, reset expire time to max.
-    expire_time = overflow_checker;
+    expire_time = current_time + time_remaining;
   }
 
   for (auto &collector : collectors_)
   {
     if (!std::static_pointer_cast<MetricCollector>(collector)->ForceFlush(
-            std::chrono::duration_cast<std::chrono::microseconds>(timeout_ns)))
+            std::chrono::duration_cast<std::chrono::microseconds>(time_remaining)))
     {
       result = false;
     }
 
-    current_time = std::chrono::system_clock::now();
-
+    current_time = std::chrono::steady_clock::now();
     if (expire_time >= current_time)
     {
-      timeout_ns = std::chrono::duration_cast<std::chrono::nanoseconds>(expire_time - current_time);
+      time_remaining = expire_time - current_time;
     }
     else
     {
-      timeout_ns = std::chrono::nanoseconds::zero();
+      time_remaining = std::chrono::steady_clock::duration::zero();
     }
   }
   if (!result)