Move GetOrDefault to AggregationConfig

Author: ThomsonTan

sdk/include/opentelemetry/sdk/metrics/aggregation/aggregation_config.h

@@ -19,6 +19,17 @@ class AggregationConfig
   AggregationConfig(size_t cardinality_limit = kAggregationCardinalityLimit)
       : cardinality_limit_(cardinality_limit)
   {}
+
+  static const AggregationConfig *GetOrDefault(const AggregationConfig *config)
+  {
+    if (config)
+    {
+      return config;
+    }
+    static const AggregationConfig default_config{};
+    return &default_config;
+  }
+
   size_t cardinality_limit_;
   virtual ~AggregationConfig() = default;
 };

sdk/include/opentelemetry/sdk/metrics/state/async_metric_storage.h

@@ -43,8 +43,7 @@ class AsyncMetricStorage : public MetricStorage, public AsyncWritableMetricStora
                      const AggregationConfig *aggregation_config)
       : instrument_descriptor_(instrument_descriptor),
         aggregation_type_{aggregation_type},
-        aggregation_config_{aggregation_config ? aggregation_config
-                                               : &GetDefaultAggregationConfig()},
+        aggregation_config_{AggregationConfig::GetOrDefault(aggregation_config)},
         cumulative_hash_map_(
             std::make_unique<AttributesHashMap>(aggregation_config_->cardinality_limit_)),
         delta_hash_map_(
@@ -140,11 +139,6 @@ class AsyncMetricStorage : public MetricStorage, public AsyncWritableMetricStora
   }
 
 private:
-  static const AggregationConfig &GetDefaultAggregationConfig()
-  {
-    static const AggregationConfig default_config{};
-    return default_config;
-  }
   InstrumentDescriptor instrument_descriptor_;
   AggregationType aggregation_type_;
   const AggregationConfig *aggregation_config_;

sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h

@@ -66,8 +66,7 @@ class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
 #endif
                     const AggregationConfig *aggregation_config)
       : instrument_descriptor_(instrument_descriptor),
-        aggregation_config_(aggregation_config ? aggregation_config
-                                               : &GetDefaultAggregationConfig()),
+        aggregation_config_(AggregationConfig::GetOrDefault(aggregation_config)),
         attributes_hashmap_(
             std::make_unique<AttributesHashMap>(aggregation_config_->cardinality_limit_)),
         attributes_processor_(std::move(attributes_processor)),
@@ -174,11 +173,6 @@ class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
                nostd::function_ref<bool(MetricData)> callback) noexcept override;
 
 private:
-  static const AggregationConfig &GetDefaultAggregationConfig()
-  {
-    static const AggregationConfig default_config{};
-    return default_config;
-  }
   InstrumentDescriptor instrument_descriptor_;
   // hashmap to maintain the metrics for delta collection (i.e, collection since last Collect call)
   const AggregationConfig *aggregation_config_;