Code changes for the new Clippy version and running test on Windows

opentelemetry-otlp/tests/integration_test/tests/integration_tests.rs

@@ -1,3 +1,5 @@
+#![cfg(unix)]
+
 use integration_test_runner::images::Collector;
 use std::fs::File;
 use std::os::unix::fs::PermissionsExt;

opentelemetry-otlp/tests/integration_test/tests/traces.rs

@@ -1,3 +1,5 @@
+#![cfg(unix)]
+
 use integration_test_runner::asserter::{read_spans_from_json, TraceAsserter};
 use opentelemetry::global;
 use opentelemetry::global::shutdown_tracer_provider;

opentelemetry-prometheus/tests/integration_test.rs

@@ -405,7 +405,13 @@ fn gather_and_compare(registry: prometheus::Registry, expected: String, name: &'
     let encoder = TextEncoder::new();
     let metric_families = registry.gather();
     encoder.encode(&metric_families, &mut output).unwrap();
-    let output_string = String::from_utf8(output).unwrap();
+    let output_string;
+
+    if cfg!(windows) {
+        output_string = String::from_utf8(output).unwrap().replace("\n", "\r\n");
+    } else {
+        output_string = String::from_utf8(output).unwrap();
+    }
 
     assert_eq!(output_string, expected, "{name}");
 }
@@ -816,7 +822,14 @@ fn gather_and_compare_multi(
     let encoder = TextEncoder::new();
     let metric_families = registry.gather();
     encoder.encode(&metric_families, &mut output).unwrap();
-    let output_string = String::from_utf8(output).unwrap();
+
+    let output_string;
+
+    if cfg!(windows) {
+        output_string = String::from_utf8(output).unwrap().replace("\n", "\r\n");
+    } else {
+        output_string = String::from_utf8(output).unwrap();
+    }
 
     assert!(
         expected.contains(&output_string),

opentelemetry-proto/tests/grpc_build.rs

@@ -18,7 +18,7 @@ const TONIC_INCLUDES: &[&str] = &["src/proto/opentelemetry-proto", "src/proto"];
 
 #[test]
 fn build_tonic() {
-    let before_build = build_content_map(TONIC_OUT_DIR);
+    let before_build = build_content_map(TONIC_OUT_DIR, false);
 
     let out_dir = TempDir::new().expect("failed to create temp dir to store the generated files");
 
@@ -95,11 +95,11 @@ fn build_tonic() {
         .compile(TONIC_PROTO_FILES, TONIC_INCLUDES)
         .expect("cannot compile protobuf using tonic");
 
-    let after_build = build_content_map(out_dir.path());
+    let after_build = build_content_map(out_dir.path(), true);
     ensure_files_are_same(before_build, after_build, TONIC_OUT_DIR);
 }
 
-fn build_content_map(path: impl AsRef<Path>) -> HashMap<String, String> {
+fn build_content_map(path: impl AsRef<Path>, normalize_line_feed: bool) -> HashMap<String, String> {
     std::fs::read_dir(path)
         .expect("cannot open dictionary of generated files")
         .flatten()
@@ -108,10 +108,17 @@ fn build_content_map(path: impl AsRef<Path>) -> HashMap<String, String> {
             let file_name = path
                 .file_name()
                 .expect("file name should always exist for generated files");
-            (
-                file_name.to_string_lossy().to_string(),
-                std::fs::read_to_string(path).expect("cannot read from existing generated file"),
-            )
+
+            let file_contents;
+            if normalize_line_feed && cfg!(windows) {
+                file_contents = std::fs::read_to_string(path.clone())
+                    .expect("cannot read from existing generated file")
+                    .replace("\n", "\r\n");
+            } else {
+                file_contents = std::fs::read_to_string(path.clone())
+                    .expect("cannot read from existing generated file");
+            }
+            (file_name.to_string_lossy().to_string(), file_contents)
         })
         .collect()
 }

opentelemetry-sdk/src/metrics/periodic_reader.rs

@@ -435,9 +435,11 @@ mod tests {
             })
             .expect("callback registration should succeed");
 
+        _ = meter_provider.force_flush();
+
         // Assert
         receiver
-            .recv_timeout(interval * 2)
+            .try_recv()
             .expect("message should be available in channel, indicating a collection occurred");
     }