Better fixu

Author: santigimeno

agents/otlp/src/otlp_common.cc

@@ -232,26 +232,85 @@ static ResourceAttributes GetMetadataResourceAttributes(const json& info) {
   return attrs;
 }
 
-static void InheritServiceNameIfMissing(ResourceAttributes* attrs,
-                                        const Resource& resource) {
-  auto resource_attributes = resource.GetAttributes();
+static std::shared_ptr<Resource> MergeResourceAttributes(
+    const std::shared_ptr<Resource>& base,
+    ResourceAttributes attrs) {
+  auto resource_attributes = base->GetAttributes();
   if (resource_attributes.find(kServiceName) != resource_attributes.end() &&
-      attrs->find(kServiceName) == attrs->end()) {
-    attrs->SetAttribute(
+      attrs.find(kServiceName) == attrs.end()) {
+    attrs.SetAttribute(
         kServiceName,
         opentelemetry::nostd::get<std::string>(
             resource_attributes[kServiceName]));
   }
-}
-
-static std::shared_ptr<Resource> MergeResourceAttributes(
-    const std::shared_ptr<Resource>& base,
-    ResourceAttributes attrs) {
-  InheritServiceNameIfMissing(&attrs, *base);
   auto overlay = std::make_shared<Resource>(Resource::Create(attrs));
   return std::make_shared<Resource>(base->Merge(*overlay));
 }
 
+InstrumentationScope* GetScope() {
+  static std::unique_ptr<InstrumentationScope> scope =
+    InstrumentationScope::Create("nsolid", NODE_VERSION "+ns" NSOLID_VERSION);
+  return scope.get();
+}
+
+static void EnsureResourceInitializedLocked() {
+  if (resource_g != nullptr) return;
+
+  json config = json::parse(nsolid::GetConfig(), nullptr, false);
+  // assert because the runtime should never send me an invalid JSON config
+  ASSERT(!config.is_discarded());
+  auto it = config.find("app");
+  ASSERT(it != config.end());
+  ResourceAttributes attrs({
+    {kServiceName, it->get<std::string>()},
+    {kServiceInstanceId, nsolid::GetAgentId()}
+  });
+
+  it = config.find("appVersion");
+  if (it != config.end()) {
+    attrs.SetAttribute(kServiceVersion, it->get<std::string>());
+  }
+
+  resource_g = std::make_shared<Resource>(Resource::Create(attrs));
+}
+
+std::shared_ptr<Resource> GetResource() {
+  nsuv::ns_mutex::scoped_lock lock(ResourceMutex());
+  EnsureResourceInitializedLocked();
+  return resource_g;
+}
+
+static void EnsureMetricsResourceInitializedLocked() {
+  if (metrics_resource_g != nullptr) return;
+
+  EnsureResourceInitializedLocked();
+
+  json info = json::parse(nsolid::GetProcessInfo(), nullptr, false);
+  ResourceAttributes attrs = GetMetadataResourceAttributes(info);
+  metrics_resource_g = MergeResourceAttributes(resource_g, std::move(attrs));
+}
+
+std::shared_ptr<Resource> GetMetricsResource() {
+  nsuv::ns_mutex::scoped_lock lock(ResourceMutex());
+  EnsureMetricsResourceInitializedLocked();
+  return metrics_resource_g;
+}
+
+std::shared_ptr<Resource> UpdateResource(ResourceAttributes&& attrs) {
+  nsuv::ns_mutex::scoped_lock lock(ResourceMutex());
+  EnsureResourceInitializedLocked();
+
+  ResourceAttributes metrics_attrs(attrs);
+  resource_g = MergeResourceAttributes(resource_g, std::move(attrs));
+
+  if (metrics_resource_g != nullptr) {
+    metrics_resource_g = MergeResourceAttributes(metrics_resource_g,
+                                                std::move(metrics_attrs));
+  }
+
+  return resource_g;
+}
+
 // NOLINTNEXTLINE(runtime/references)
 static void add_counter(std::vector<MetricData>& metrics,
                         const time_point& start,
@@ -317,70 +376,6 @@ static void add_summary(std::vector<MetricData>& metrics,
   metrics.push_back(metric_data);
 }
 
-InstrumentationScope* GetScope() {
-  static std::unique_ptr<InstrumentationScope> scope =
-    InstrumentationScope::Create("nsolid", NODE_VERSION "+ns" NSOLID_VERSION);
-  return scope.get();
-}
-
-static void EnsureResourceInitializedLocked() {
-  if (resource_g != nullptr) return;
-
-  json config = json::parse(nsolid::GetConfig(), nullptr, false);
-  // assert because the runtime should never send me an invalid JSON config
-  ASSERT(!config.is_discarded());
-  auto it = config.find("app");
-  ASSERT(it != config.end());
-  ResourceAttributes attrs({
-    {kServiceName, it->get<std::string>()},
-    {kServiceInstanceId, nsolid::GetAgentId()}
-  });
-
-  it = config.find("appVersion");
-  if (it != config.end()) {
-    attrs.SetAttribute(kServiceVersion, it->get<std::string>());
-  }
-
-  resource_g = std::make_shared<Resource>(Resource::Create(attrs));
-}
-
-std::shared_ptr<Resource> GetResource() {
-  nsuv::ns_mutex::scoped_lock lock(ResourceMutex());
-  EnsureResourceInitializedLocked();
-  return resource_g;
-}
-
-static void EnsureMetricsResourceInitializedLocked() {
-  if (metrics_resource_g != nullptr) return;
-
-  EnsureResourceInitializedLocked();
-
-  json info = json::parse(nsolid::GetProcessInfo(), nullptr, false);
-  ResourceAttributes attrs = GetMetadataResourceAttributes(info);
-  metrics_resource_g = MergeResourceAttributes(resource_g, std::move(attrs));
-}
-
-std::shared_ptr<Resource> GetMetricsResource() {
-  nsuv::ns_mutex::scoped_lock lock(ResourceMutex());
-  EnsureMetricsResourceInitializedLocked();
-  return metrics_resource_g;
-}
-
-std::shared_ptr<Resource> UpdateResource(ResourceAttributes&& attrs) {
-  nsuv::ns_mutex::scoped_lock lock(ResourceMutex());
-  EnsureResourceInitializedLocked();
-
-  ResourceAttributes metrics_attrs(attrs);
-  resource_g = MergeResourceAttributes(resource_g, std::move(attrs));
-
-  if (metrics_resource_g != nullptr) {
-    metrics_resource_g = MergeResourceAttributes(metrics_resource_g,
-                                                std::move(metrics_attrs));
-  }
-
-  return resource_g;
-}
-
 // NOLINTNEXTLINE(runtime/references)
 void fill_proc_metrics(std::vector<MetricData>& metrics,
                        const ProcessMetrics::MetricsStor& stor,