fixes

Author: martintmk

opentelemetry-sdk/src/metrics/meter_provider.rs

@@ -328,6 +328,7 @@ impl fmt::Debug for MeterProviderBuilder {
 #[cfg(all(test, feature = "testing"))]
 mod tests {
     use crate::error::OTelSdkError;
+    use crate::metrics::SdkMeterProvider;
     use crate::resource::{
         SERVICE_NAME, TELEMETRY_SDK_LANGUAGE, TELEMETRY_SDK_NAME, TELEMETRY_SDK_VERSION,
     };
@@ -337,7 +338,6 @@ mod tests {
     use opentelemetry::{global, InstrumentationScope};
     use opentelemetry::{Key, KeyValue, Value};
     use std::env;
-    use crate::metrics::SdkMeterProvider;
 
     #[test]
     fn test_meter_provider_resource() {
@@ -566,14 +566,27 @@ mod tests {
         let builder = SdkMeterProvider::builder()
             .with_resource(Resource::new(vec![KeyValue::new("key1", "value1")]))
             .with_resource(Resource::new(vec![KeyValue::new("key2", "value2")]))
-            .with_resource(Resource::builder_empty().with_schema_url(vec![], "http://example.com").build())
+            .with_resource(
+                Resource::builder_empty()
+                    .with_schema_url(vec![], "http://example.com")
+                    .build(),
+            )
             .with_resource(Resource::new(vec![KeyValue::new("key3", "value3")]));
 
         let resource = builder.resource.unwrap();
 
-        assert_eq!(resource.get(&Key::from_static_str("key1")), Some(Value::from("value1")));
-        assert_eq!(resource.get(&Key::from_static_str("key2")), Some(Value::from("value2")));
-        assert_eq!(resource.get(&Key::from_static_str("key3")), Some(Value::from("value3")));
+        assert_eq!(
+            resource.get(&Key::from_static_str("key1")),
+            Some(Value::from("value1"))
+        );
+        assert_eq!(
+            resource.get(&Key::from_static_str("key2")),
+            Some(Value::from("value2"))
+        );
+        assert_eq!(
+            resource.get(&Key::from_static_str("key3")),
+            Some(Value::from("value3"))
+        );
         assert_eq!(resource.schema_url(), Some("http://example.com"));
     }
 }

opentelemetry-sdk/src/resource/mod.rs

@@ -419,18 +419,29 @@ mod tests {
     }
 
     #[rstest]
-    #[case(vec![], vec![KeyValue::new("key", "b")], "http://schema/a", None)]
-    #[case(vec![KeyValue::new("key", "a")], vec![KeyValue::new("key", "b")], "http://schema/a", Some("http://schema/a"))]
-    fn merge_resource_with_missing_attribtes(
+    #[case(vec![], vec![KeyValue::new("key", "b")], Some("http://schema/a"), None, Some("http://schema/a"))]
+    #[case(vec![KeyValue::new("key", "a")], vec![KeyValue::new("key", "b")], Some("http://schema/a"), None, Some("http://schema/a"))]
+    #[case(vec![KeyValue::new("key", "a")], vec![KeyValue::new("key", "b")], Some("http://schema/a"), None, Some("http://schema/a"))]
+    #[case(vec![KeyValue::new("key", "a")], vec![KeyValue::new("key", "b")], Some("http://schema/a"), Some("http://schema/b"), None)]
+    #[case(vec![KeyValue::new("key", "a")], vec![KeyValue::new("key", "b")], None, Some("http://schema/b"), Some("http://schema/b"))]
+    fn merge_resource_with_missing_attributes(
         #[case] key_values_a: Vec<KeyValue>,
         #[case] key_values_b: Vec<KeyValue>,
-        #[case] schema_url: &'static str,
+        #[case] schema_url_a: Option<&'static str>,
+        #[case] schema_url_b: Option<&'static str>,
         #[case] expected_schema_url: Option<&'static str>,
     ) {
-        let resource = Resource::from_schema_url(key_values_a, schema_url);
-        let other_resource = Resource::builder_empty()
-            .with_attributes(key_values_b)
-            .build();
+        let resource = match schema_url_a {
+            Some(schema) => Resource::from_schema_url(key_values_a, schema),
+            None => Resource::new(key_values_a),
+        };
+
+        let other_resource = match schema_url_b {
+            Some(schema) => Resource::builder_empty()
+                .with_schema_url(key_values_b, schema)
+                .build(),
+            None => Resource::new(key_values_b),
+        };
 
         assert_eq!(
             resource.merge(&other_resource).schema_url(),
@@ -544,15 +555,4 @@ mod tests {
             },
         )
     }
-
-    #[test]
-    fn with_schema_url_for_empty_attributes() {
-        let resource = Resource::builder_empty()
-            .with_schema_url(vec![], "http://schema/a")
-            .build();
-        assert_eq!(resource.schema_url(), Some("http://schema/a"));
-
-        let resource = Resource::builder_empty().build().merge(&resource);
-        assert_eq!(resource.schema_url(), Some("http://schema/a"));
-    }
 }