Merge branch 'main' into in-memory-metric-exporter

punya · Sep 6, 2024 · 10f697d · 10f697d
2 parents 48aa31a + d623bc5
commit 10f697d
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/examples/logs_simple/main.cc b/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

diff --git a/examples/otlp/opentelemetry-collector-config/config.dev.yaml b/examples/otlp/opentelemetry-collector-config/config.dev.yaml
@@ -3,7 +3,7 @@
 
 exporters:
   debug:
-    verbosity: debug
+    verbosity: detailed
 receivers:
   otlp:
     protocols:

diff --git a/examples/simple/main.cc b/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
 

diff --git a/functional/otlp/otel-config-http.yaml b/functional/otlp/otel-config-http.yaml
@@ -23,7 +23,7 @@ processors:
 
 exporters:
   debug:
-    verbosity: debug
+    verbosity: detailed
 
 service:
   pipelines:

diff --git a/functional/otlp/otel-config-https.yaml b/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]
diff --git a/functional/otlp/otel-docker-config-http.yaml b/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]
diff --git a/functional/otlp/otel-docker-config-https.yaml b/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]