fix lint and simplify

Author: connyay

core/src/telemetry/otel.rs

@@ -317,20 +317,14 @@ fn default_resource_instance() -> &'static Resource {
 }
 
 fn default_resource(override_values: &HashMap<String, String>) -> Resource {
-    let override_kvs = override_values
-        .iter()
-        .map(|(k, v)| KeyValue::new(k.clone(), v.clone()));
-    let override_resource = Resource::builder_empty()
-        .with_attributes(override_kvs)
-        .build();
     Resource::builder_empty()
         .with_attributes(
             default_resource_instance()
                 .iter()
                 .map(|(k, v)| KeyValue::new(k.clone(), v.clone())),
         )
         .with_attributes(
-            override_resource
+            override_values
                 .iter()
                 .map(|(k, v)| KeyValue::new(k.clone(), v.clone())),
         )

tests/integ_tests/metrics_tests.rs

@@ -1,13 +1,7 @@
 use crate::integ_tests::mk_nexus_endpoint;
 use anyhow::anyhow;
 use assert_matches::assert_matches;
-use std::{
-    collections::HashMap,
-    env,
-    string::ToString,
-    sync::Arc,
-    time::Duration,
-};
+use std::{collections::HashMap, env, string::ToString, sync::Arc, time::Duration};
 use temporal_client::{
     REQUEST_LATENCY_HISTOGRAM_NAME, WorkflowClientTrait, WorkflowOptions, WorkflowService,
 };