Merge branch 'main' into trace-set-resource

Author: cijothomas

opentelemetry-prometheus/tests/integration_test.rs

@@ -406,18 +406,18 @@ fn gather_and_compare(registry: prometheus::Registry, expected: String, name: &'
     let metric_families = registry.gather();
     encoder.encode(&metric_families, &mut output).unwrap();
 
+    let expected = get_platform_specific_string(expected);
     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
+    if cfg!(windows) && !input.ends_with("\r\n") && input.ends_with('\n') {
+        return input.replace('\n', "\r\n");
     }
+    input
 }
 
 #[test]
@@ -812,6 +812,7 @@ fn duplicate_metrics() {
             .expected_files
             .into_iter()
             .map(|f| fs::read_to_string(Path::new("./tests/data").join(f)).expect(f))
+            .map(get_platform_specific_string)
             .collect();
         gather_and_compare_multi(registry, possible_matches, tc.name);
     }

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, false);
+    let before_build = build_content_map(TONIC_OUT_DIR, true);
 
     let out_dir = TempDir::new().expect("failed to create temp dir to store the generated files");
 
@@ -130,13 +130,12 @@ fn build_content_map(path: impl AsRef<Path>, normalize_line_feed: bool) -> HashM
         .collect()
 }
 
-///  Returns a String with the platform specific new line feed character.
+///  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
+    if cfg!(windows) && !input.ends_with("\r\n") && input.ends_with('\n') {
+        return input.replace('\n', "\r\n");
     }
+    input
 }
 
 fn ensure_files_are_same(

stress/src/metrics_counter.rs

@@ -16,7 +16,7 @@ use rand::{
     rngs::{self},
     Rng, SeedableRng,
 };
-use std::{borrow::Cow, cell::RefCell};
+use std::cell::RefCell;
 
 mod throughput;
 
@@ -28,10 +28,7 @@ lazy_static! {
         "value1", "value2", "value3", "value4", "value5", "value6", "value7", "value8", "value9",
         "value10"
     ];
-    static ref COUNTER: Counter<u64> = PROVIDER
-        .meter(<&str as Into<Cow<'static, str>>>::into("test"))
-        .u64_counter("hello")
-        .init();
+    static ref COUNTER: Counter<u64> = PROVIDER.meter("test").u64_counter("hello").init();
 }
 
 thread_local! {

stress/src/metrics_histogram.rs

@@ -16,7 +16,7 @@ use rand::{
     rngs::{self},
     Rng, SeedableRng,
 };
-use std::{borrow::Cow, cell::RefCell};
+use std::cell::RefCell;
 
 mod throughput;
 
@@ -28,10 +28,7 @@ lazy_static! {
         "value1", "value2", "value3", "value4", "value5", "value6", "value7", "value8", "value9",
         "value10"
     ];
-    static ref HISTOGRAM: Histogram<u64> = PROVIDER
-        .meter(<&str as Into<Cow<'static, str>>>::into("test"))
-        .u64_histogram("hello")
-        .init();
+    static ref HISTOGRAM: Histogram<u64> = PROVIDER.meter("test").u64_histogram("hello").init();
 }
 
 thread_local! {

stress/src/metrics_overflow.rs

@@ -16,18 +16,15 @@ use rand::{
     rngs::{self},
     Rng, SeedableRng,
 };
-use std::{borrow::Cow, cell::RefCell};
+use std::cell::RefCell;
 
 mod throughput;
 
 lazy_static! {
     static ref PROVIDER: SdkMeterProvider = SdkMeterProvider::builder()
         .with_reader(ManualReader::builder().build())
         .build();
-    static ref COUNTER: Counter<u64> = PROVIDER
-        .meter(<&str as Into<Cow<'static, str>>>::into("test"))
-        .u64_counter("hello")
-        .init();
+    static ref COUNTER: Counter<u64> = PROVIDER.meter("test").u64_counter("hello").init();
 }
 
 thread_local! {