Address PR comments

Author: utpilla

opentelemetry-otlp/examples/basic-otlp-http/src/main.rs

@@ -87,7 +87,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
         "Init metrics failed with error: {:?}",
         result.err()
     );
-    
+
     // Opentelemetry will not provide a global API to manage the logger provider. Application users must manage the lifecycle of the logger provider on their own. Dropping logger providers will disable log emitting.
     let logger_provider = init_logs().unwrap();
 

opentelemetry-prometheus/tests/integration_test.rs

@@ -406,15 +406,20 @@ fn gather_and_compare(registry: prometheus::Registry, expected: String, name: &'
     let metric_families = registry.gather();
     encoder.encode(&metric_families, &mut output).unwrap();
 
-    let output_string = if cfg!(windows) {
-        String::from_utf8(output).unwrap().replace('\n', "\r\n")
-    } else {
-        String::from_utf8(output).unwrap()
-    };
+    let output_string = get_platform_specific_string(String::from_utf8(output).unwrap());
 
     assert_eq!(output_string, expected, "{name}");
 }
 
+///  Returns a String which uses the platform specific new line feed character.
+fn get_platform_specific_string(input: String) -> String {
+    if cfg!(windows) {
+        input.replace('\n', "\r\n")
+    } else {
+        input
+    }
+}
+
 #[test]
 fn multiple_scopes() {
     let registry = prometheus::Registry::new();
@@ -822,11 +827,7 @@ fn gather_and_compare_multi(
     let metric_families = registry.gather();
     encoder.encode(&metric_families, &mut output).unwrap();
 
-    let output_string = if cfg!(windows) {
-        String::from_utf8(output).unwrap().replace('\n', "\r\n")
-    } else {
-        String::from_utf8(output).unwrap()
-    };
+    let output_string = get_platform_specific_string(String::from_utf8(output).unwrap());
 
     assert!(
         expected.contains(&output_string),

opentelemetry-proto/tests/grpc_build.rs

@@ -109,20 +109,27 @@ fn build_content_map(path: impl AsRef<Path>, normalize_line_feed: bool) -> HashM
                 .file_name()
                 .expect("file name should always exist for generated files");
 
-            let file_contents = if normalize_line_feed && cfg!(windows) {
-                std::fs::read_to_string(path.clone())
-                    .expect("cannot read from existing generated file")
-                    .replace('\n', "\r\n")
-            } else {
-                std::fs::read_to_string(path.clone())
-                    .expect("cannot read from existing generated file")
-            };
+            let mut file_contents = std::fs::read_to_string(path.clone())
+                .expect("cannot read from existing generated file");
+
+            if normalize_line_feed {
+                file_contents = get_platform_specific_string(file_contents);
+            }
 
             (file_name.to_string_lossy().to_string(), file_contents)
         })
         .collect()
 }
 
+///  Returns a String with the platform specific new line feed character.
+fn get_platform_specific_string(input: String) -> String {
+    if cfg!(windows) {
+        input.replace('\n', "\r\n")
+    } else {
+        input
+    }
+}
+
 fn ensure_files_are_same(
     before_build: HashMap<String, String>,
     after_build: HashMap<String, String>,