Merge branch 'main' into legacy-gRPC

open-telemetry · Jan 4, 2023 · 15f18a1 · 15f18a1
2 parents 2d17dec + 61bc860
commit 15f18a1
Show file tree

Hide file tree

Showing 27 changed files with 193 additions and 38 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -445,6 +445,11 @@ if(OTELCPP_MAINTAINER_MODE)
  add_compile_options(/wd4267)
 
  # Enforced warnings
+ add_compile_options(/we4265) # 'class': class has virtual functions, but
+ # destructor is not virtual
+ add_compile_options(/we5204) # A class with virtual functions has
+ # non-virtual trivial destructor.
+
  elseif()
  message(FATAL_ERROR "Building with unknown compiler in maintainer mode.")
  endif()

diff --git a/api/test/nostd/span_test.cc b/api/test/nostd/span_test.cc
@@ -182,10 +182,10 @@ TEST(SpanTest, Iteration)
  std::array<int, 3> array = {1, 2, 3};
 
  span<int> s1{array.data(), array.size()};
- EXPECT_EQ(std::distance(s1.begin(), s1.end()), array.size());
+ EXPECT_EQ(std::distance(s1.begin(), s1.end()), (ptrdiff_t)array.size());
  EXPECT_TRUE(std::equal(s1.begin(), s1.end(), array.begin()));
 
  span<int, 3> s2{array.data(), array.size()};
- EXPECT_EQ(std::distance(s2.begin(), s2.end()), array.size());
+ EXPECT_EQ(std::distance(s2.begin(), s2.end()), (ptrdiff_t)array.size());
  EXPECT_TRUE(std::equal(s2.begin(), s2.end(), array.begin()));
 }
diff --git a/examples/batch/main.cc b/examples/batch/main.cc
@@ -19,7 +19,7 @@ namespace nostd = opentelemetry::nostd;
 namespace
 {
 
-void initTracer()
+void InitTracer()
 {
  auto exporter = trace_exporter::OStreamSpanExporterFactory::Create();
 
@@ -46,6 +46,12 @@ void initTracer()
  trace_api::Provider::SetTracerProvider(provider);
 }
 
+void CleanupTracer()
+{
+ std::shared_ptr<opentelemetry::trace::TracerProvider> none;
+ trace_api::Provider::SetTracerProvider(none);
+}
+
 nostd::shared_ptr<trace_api::Tracer> get_tracer()
 {
  auto provider = trace_api::Provider::GetTracerProvider();
@@ -65,7 +71,7 @@ void StartAndEndSpans()
 int main()
 {
  // Removing this line will leave the default noop TracerProvider in place.
- initTracer();
+ InitTracer();
 
  std::cout << "Creating first batch of " << kNumSpans << " spans and waiting 3 seconds ...\n";
  StartAndEndSpans();
@@ -83,7 +89,9 @@ int main()
  StartAndEndSpans();
  printf("Shutting down and draining queue.... \n");
  std::this_thread::sleep_for(std::chrono::milliseconds(2000));
- // We immediately let the program terminate which invokes the processor destructor
+
+ // We invoke the processor destructor
  // which in turn invokes the processor Shutdown(), which finally drains the queue of ALL
  // its spans.
+ CleanupTracer();
 }
diff --git a/examples/grpc/client.cc b/examples/grpc/client.cc
@@ -98,7 +98,7 @@ void RunClient(uint16_t port)
 
 int main(int argc, char **argv)
 {
- initTracer();
+ InitTracer();
  // set global propagator
  context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(
  opentelemetry::nostd::shared_ptr<context::propagation::TextMapPropagator>(
@@ -114,5 +114,6 @@ int main(int argc, char **argv)
  port = default_port;
  }
  RunClient(port);
+ CleanupTracer();
  return 0;
 }
diff --git a/examples/grpc/server.cc b/examples/grpc/server.cc
@@ -107,7 +107,7 @@ void RunServer(uint16_t port)
 
 int main(int argc, char **argv)
 {
- initTracer();
+ InitTracer();
  constexpr uint16_t default_port = 8800;
  uint16_t port;
  if (argc > 1)
@@ -120,5 +120,6 @@ int main(int argc, char **argv)
  }
 
  RunServer(port);
+ CleanupTracer();
  return 0;
 }
diff --git a/examples/grpc/tracer_common.h b/examples/grpc/tracer_common.h
@@ -69,7 +69,7 @@ class GrpcServerCarrier : public opentelemetry::context::propagation::TextMapCar
  ServerContext *context_;
 };
 
-void initTracer()
+void InitTracer()
 {
  auto exporter = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Create();
  auto processor =
@@ -90,6 +90,12 @@ void initTracer()
  new opentelemetry::trace::propagation::HttpTraceContext()));
 }
 
+void CleanupTracer()
+{
+ std::shared_ptr<opentelemetry::trace::TracerProvider> none;
+ opentelemetry::trace::Provider::SetTracerProvider(none);
+}
+
 opentelemetry::nostd::shared_ptr<opentelemetry::trace::Tracer> get_tracer(std::string tracer_name)
 {
  auto provider = opentelemetry::trace::Provider::GetTracerProvider();

diff --git a/examples/http/client.cc b/examples/http/client.cc
@@ -73,7 +73,7 @@ void sendRequest(const std::string &url)
 
 int main(int argc, char *argv[])
 {
- initTracer();
+ InitTracer();
  constexpr char default_host[] = "localhost";
  constexpr char default_path[] = "/helloworld";
  constexpr uint16_t default_port = 8800;
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
  // The port the validation service listens to can be specified via the command line.
  if (argc > 1)
  {
- port = atoi(argv[1]);
+ port = (uint16_t)(atoi(argv[1]));
  }
  else
  {
@@ -92,4 +92,5 @@ int main(int argc, char *argv[])
  std::string url = "http://" + std::string(default_host) + ":" + std::to_string(port) +
  std::string(default_path);
  sendRequest(url);
+ CleanupTracer();
 }
diff --git a/examples/http/server.cc b/examples/http/server.cc
@@ -70,12 +70,12 @@ class RequestHandler : public HTTP_SERVER_NS::HttpRequestCallback
 
 int main(int argc, char *argv[])
 {
- initTracer();
+ InitTracer();
 
  // The port the validation service listens to can be specified via the command line.
  if (argc > 1)
  {
- server_port = atoi(argv[1]);
+ server_port = (uint16_t)atoi(argv[1]);
  }
 
  HttpServer http_server(server_name, server_port);
@@ -91,5 +91,6 @@ int main(int argc, char *argv[])
  }
  http_server.Stop();
  root_span->End();
+ CleanupTracer();
  return 0;
 }
diff --git a/examples/http/tracer_common.h b/examples/http/tracer_common.h
@@ -59,7 +59,7 @@ class HttpTextMapCarrier : public opentelemetry::context::propagation::TextMapCa
  T headers_;
 };
 
-void initTracer()
+void InitTracer()
 {
  auto exporter = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Create();
  auto processor =
@@ -80,6 +80,12 @@ void initTracer()
  new opentelemetry::trace::propagation::HttpTraceContext()));
 }
 
+void CleanupTracer()
+{
+ std::shared_ptr<opentelemetry::trace::TracerProvider> none;
+ opentelemetry::trace::Provider::SetTracerProvider(none);
+}
+
 opentelemetry::nostd::shared_ptr<opentelemetry::trace::Tracer> get_tracer(std::string tracer_name)
 {
  auto provider = opentelemetry::trace::Provider::GetTracerProvider();

diff --git a/examples/jaeger/main.cc b/examples/jaeger/main.cc
@@ -30,6 +30,12 @@ void InitTracer()
  // Set the global trace provider
  trace::Provider::SetTracerProvider(provider);
 }
+
+void CleanupTracer()
+{
+ std::shared_ptr<opentelemetry::trace::TracerProvider> none;
+ trace::Provider::SetTracerProvider(none);
+}
 } // namespace
 
 int main(int argc, char *argv[])
@@ -42,4 +48,6 @@ int main(int argc, char *argv[])
  InitTracer();
 
  foo_library();
+
+ CleanupTracer();
 }
diff --git a/examples/metrics_simple/metrics_ostream.cc b/examples/metrics_simple/metrics_ostream.cc
@@ -26,7 +26,7 @@ namespace metrics_api = opentelemetry::metrics;
 namespace
 {
 
-void initMetrics(const std::string &name)
+void InitMetrics(const std::string &name)
 {
  std::unique_ptr<metric_sdk::PushMetricExporter> exporter{
  new exportermetrics::OStreamMetricExporter};
@@ -83,6 +83,12 @@ void initMetrics(const std::string &name)
  std::move(histogram_view));
  metrics_api::Provider::SetMeterProvider(provider);
 }
+
+void CleanupMetrics()
+{
+ std::shared_ptr<metrics_api::MeterProvider> none;
+ metrics_api::Provider::SetMeterProvider(none);
+}
 } // namespace
 
 int main(int argc, char **argv)
@@ -94,7 +100,7 @@ int main(int argc, char **argv)
  }
 
  std::string name{"ostream_metric_example"};
- initMetrics(name);
+ InitMetrics(name);
 
  if (example_type == "counter")
  {
@@ -118,4 +124,6 @@ int main(int argc, char **argv)
  observable_counter_example.join();
  histogram_example.join();
  }
+
+ CleanupMetrics();
 }
diff --git a/examples/multi_processor/main.cc b/examples/multi_processor/main.cc
@@ -22,7 +22,7 @@ namespace nostd = opentelemetry::nostd;
 
 namespace
 {
-std::shared_ptr<InMemorySpanData> initTracer()
+std::shared_ptr<InMemorySpanData> InitTracer()
 {
  std::shared_ptr<InMemorySpanData> data;
 
@@ -44,6 +44,12 @@ std::shared_ptr<InMemorySpanData> initTracer()
  return data;
 }
 
+void CleanupTracer()
+{
+ std::shared_ptr<opentelemetry::trace::TracerProvider> none;
+ trace_api::Provider::SetTracerProvider(none);
+}
+
 void dumpSpans(std::vector<std::unique_ptr<trace_sdk::SpanData>> &spans)
 {
  char span_buf[trace_api::SpanId::kSize * 2];
@@ -79,9 +85,11 @@ void dumpSpans(std::vector<std::unique_ptr<trace_sdk::SpanData>> &spans)
 int main()
 {
  // Removing this line will leave the default noop TracerProvider in place.
- std::shared_ptr<InMemorySpanData> data = initTracer();
+ std::shared_ptr<InMemorySpanData> data = InitTracer();
 
  foo_library();
  auto memory_spans = data->GetSpans();
  dumpSpans(memory_spans);
+
+ CleanupTracer();
 }
diff --git a/examples/multithreaded/main.cc b/examples/multithreaded/main.cc
@@ -17,7 +17,7 @@ namespace nostd = opentelemetry::nostd;
 
 namespace
 {
-void initTracer()
+void InitTracer()
 {
  auto exporter = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Create();
  auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
@@ -28,6 +28,12 @@ void initTracer()
  trace_api::Provider::SetTracerProvider(provider);
 }
 
+void CleanupTracer()
+{
+ std::shared_ptr<opentelemetry::trace::TracerProvider> none;
+ trace_api::Provider::SetTracerProvider(none);
+}
+
 nostd::shared_ptr<trace_api::Tracer> get_tracer()
 {
  auto provider = trace_api::Provider::GetTracerProvider();
@@ -56,10 +62,14 @@ void run_threads()
 
 int main()
 {
- initTracer();
+ InitTracer();
 
- auto root_span = get_tracer()->StartSpan(__func__);
- trace_api::Scope scope(root_span);
+ {
+ auto root_span = get_tracer()->StartSpan(__func__);
+ trace_api::Scope scope(root_span);
+
+ run_threads();
+ }
 
- run_threads();
+ CleanupTracer();
 }
diff --git a/examples/otlp/grpc_log_main.cc b/examples/otlp/grpc_log_main.cc
@@ -40,6 +40,12 @@ void InitTracer()
  trace::Provider::SetTracerProvider(provider);
 }
 
+void CleanupTracer()
+{
+ std::shared_ptr<opentelemetry::trace::TracerProvider> none;
+ trace::Provider::SetTracerProvider(none);
+}
+
 void InitLogger()
 {
  // Create OTLP exporter instance
@@ -50,6 +56,12 @@ void InitLogger()
 
  opentelemetry::logs::Provider::SetLoggerProvider(provider);
 }
+
+void CleanupLogger()
+{
+ nostd::shared_ptr<logs::LoggerProvider> none;
+ opentelemetry::logs::Provider::SetLoggerProvider(none);
+}
 } // namespace
 
 int main(int argc, char *argv[])
@@ -66,6 +78,8 @@ int main(int argc, char *argv[])
  InitLogger();
  InitTracer();
  foo_library();
+ CleanupTracer();
+ CleanupLogger();
 }
 #else
 int main()

diff --git a/examples/otlp/grpc_main.cc b/examples/otlp/grpc_main.cc
@@ -30,6 +30,12 @@ void InitTracer()
  // Set the global trace provider
  trace::Provider::SetTracerProvider(provider);
 }
+
+void CleanupTracer()
+{
+ std::shared_ptr<opentelemetry::trace::TracerProvider> none;
+ trace::Provider::SetTracerProvider(none);
+}
 } // namespace
 
 int main(int argc, char *argv[])
@@ -47,4 +53,6 @@ int main(int argc, char *argv[])
  InitTracer();
 
  foo_library();
+
+ CleanupTracer();
 }