[METRICS] Add tag to AggregationConfig for aggregation type validation

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

@@ -5,6 +5,7 @@
 
 #include <vector>
 
+#include "opentelemetry/sdk/metrics/instruments.h"
 #include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
 #include "opentelemetry/version.h"
 
@@ -13,13 +14,16 @@ namespace sdk
 {
 namespace metrics
 {
+
 class AggregationConfig
 {
 public:
   AggregationConfig(size_t cardinality_limit = kAggregationCardinalityLimit)
       : cardinality_limit_(cardinality_limit)
   {}
 
+  virtual AggregationType GetType() const { return AggregationType::kDefault; }
+
   static const AggregationConfig *GetOrDefault(const AggregationConfig *config)
   {
     if (config)
@@ -41,6 +45,8 @@ class HistogramAggregationConfig : public AggregationConfig
       : AggregationConfig(cardinality_limit)
   {}
 
+  AggregationType GetType() const override { return AggregationType::kHistogram; }
+
   std::vector<double> boundaries_;
   bool record_min_max_ = true;
 };
@@ -53,6 +59,8 @@ class Base2ExponentialHistogramAggregationConfig : public AggregationConfig
       : AggregationConfig(cardinality_limit)
   {}
 
+  AggregationType GetType() const override { return AggregationType::kBase2ExponentialHistogram; }
+
   size_t max_buckets_  = 160;
   int32_t max_scale_   = 20;
   bool record_min_max_ = true;

sdk/include/opentelemetry/sdk/metrics/view/view.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <memory>
+#include <stdexcept>
 #include <string>
 
 #include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
@@ -36,7 +37,35 @@ class View
         aggregation_type_{aggregation_type},
         aggregation_config_{aggregation_config},
         attributes_processor_{std::move(attributes_processor)}
-  {}
+  {
+    // Validate that aggregation_type and aggregation_config match
+    if (aggregation_config_)
+    {
+      AggregationType config_type = aggregation_config_->GetType();
+      bool valid                  = false;
+
+      switch (aggregation_type_)
+      {
+        case AggregationType::kHistogram:
+          valid = (config_type == AggregationType::kHistogram);
+          break;
+        case AggregationType::kBase2ExponentialHistogram:
+          valid = (config_type == AggregationType::kBase2ExponentialHistogram);
+          break;
+        case AggregationType::kDefault:
+        case AggregationType::kDrop:
+        case AggregationType::kLastValue:
+        case AggregationType::kSum:
+          valid = (config_type == AggregationType::kDefault);
+          break;
+      }
+
+      if (!valid)
+      {
+        throw std::invalid_argument("AggregationType and AggregationConfig type mismatch");
+      }
+    }
+  }
 
   virtual ~View() = default;
 

sdk/test/metrics/view_registry_test.cc

@@ -10,6 +10,7 @@
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
+#include "opentelemetry/sdk/metrics/aggregation/histogram_aggregation.h"
 #include "opentelemetry/sdk/metrics/instruments.h"
 #include "opentelemetry/sdk/metrics/view/instrument_selector.h"
 #include "opentelemetry/sdk/metrics/view/meter_selector.h"
@@ -93,3 +94,58 @@ TEST(ViewRegistry, FindNonExistingView)
   EXPECT_EQ(status, true);
 #endif
 }
+
+// Tests for View class AggregationType and AggregationConfig consistency validation
+
+TEST(View, ValidHistogramConfigWithHistogramType)
+{
+  // Valid: Histogram aggregation type with HistogramAggregationConfig
+  auto histogram_config         = std::make_shared<HistogramAggregationConfig>();
+  histogram_config->boundaries_ = {0.0, 10.0, 100.0};
+
+  EXPECT_NO_THROW({
+    View view("test_histogram", "description", AggregationType::kHistogram, histogram_config);
+  });
+}
+
+TEST(View, InvalidHistogramConfigWithSumType)
+{
+  // Invalid: Sum aggregation type with HistogramAggregationConfig
+  auto histogram_config         = std::make_shared<HistogramAggregationConfig>();
+  histogram_config->boundaries_ = {0.0, 10.0, 100.0};
+
+  EXPECT_THROW(
+      { View view("test_sum", "description", AggregationType::kSum, histogram_config); },
+      std::invalid_argument);
+}
+
+TEST(View, InvalidHistogramConfigWithDefaultType)
+{
+  // Invalid: Default aggregation type with HistogramAggregationConfig
+  auto histogram_config = std::make_shared<HistogramAggregationConfig>();
+
+  EXPECT_THROW(
+      { View view("test_default", "description", AggregationType::kDefault, histogram_config); },
+      std::invalid_argument);
+}
+
+TEST(View, ValidNullConfig)
+{
+  // Valid: Null config should work with any aggregation type
+  EXPECT_NO_THROW(
+      { View view("test_null_config", "description", AggregationType::kHistogram, nullptr); });
+
+  EXPECT_NO_THROW(
+      { View view("test_null_config2", "description", AggregationType::kSum, nullptr); });
+}
+
+TEST(View, InvalidDefaultConfigWithHistogramType)
+{
+  // Invalid: Histogram aggregation type with default AggregationConfig (not
+  // HistogramAggregationConfig)
+  auto default_config = std::make_shared<AggregationConfig>();
+
+  EXPECT_THROW(
+      { View view("test_histogram", "description", AggregationType::kHistogram, default_config); },
+      std::invalid_argument);
+}