Merge branch 'main' into fix_lifetime_in_log_record

owent · web-flow · commit cf758d1f85ec · 2024-11-27T14:20:29.000+08:00
diff --git a/exporters/prometheus/src/exporter_options.cc b/exporters/prometheus/src/exporter_options.cc
@@ -33,7 +33,7 @@ inline bool GetPrometheusWithoutOtelScope()
   auto exists =
       opentelemetry::sdk::common::GetBoolEnvironmentVariable(kPrometheusWithoutOtelScope, setting);
 
-  return exists ? setting : true;
+  return exists ? setting : false;
 }
 
 inline bool GetPrometheusPopulateTargetInfo()

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ inline bool GetPrometheusWithoutOtelScope()`
`33`	`33`	`auto exists =`
`34`	`34`	`opentelemetry::sdk::common::GetBoolEnvironmentVariable(kPrometheusWithoutOtelScope, setting);`
`35`	`35`
`36`		`- return exists ? setting : true;`
	`36`	`+ return exists ? setting : false;`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`inline bool GetPrometheusPopulateTargetInfo()`