Allow ability to override max Metric streams and MetricPoints per stream

src/OpenTelemetry/Metrics/AggregatorStore.cs

@@ -24,7 +24,6 @@ namespace OpenTelemetry.Metrics
 {
     internal sealed class AggregatorStore
     {
-        internal const int MaxMetricPoints = 2000;
         private static readonly ObjectArrayEqualityComparer ObjectArrayComparer = new ObjectArrayEqualityComparer();
         private readonly object lockZeroTags = new object();
         private readonly HashSet<string> tagKeysInteresting;
@@ -42,6 +41,7 @@ internal sealed class AggregatorStore
         private readonly double[] histogramBounds;
         private readonly UpdateLongDelegate updateLongCallback;
         private readonly UpdateDoubleDelegate updateDoubleCallback;
+        private readonly int metricPointLimit;
         private int metricPointIndex = 0;
         private int batchSize = 0;
         private bool zeroTagMetricPointInitialized;
@@ -51,11 +51,13 @@ internal sealed class AggregatorStore
         internal AggregatorStore(
             AggregationType aggType,
             AggregationTemporality temporality,
+            int metricPointLimit,
             double[] histogramBounds,
             string[] tagKeysInteresting = null)
         {
-            this.metricPoints = new MetricPoint[MaxMetricPoints];
-            this.currentMetricPointBatch = new int[MaxMetricPoints];
+            this.metricPointLimit = metricPointLimit;
+            this.metricPoints = new MetricPoint[metricPointLimit];
+            this.currentMetricPointBatch = new int[metricPointLimit];
             this.aggType = aggType;
             this.temporality = temporality;
             this.outputDelta = temporality == AggregationTemporality.Delta ? true : false;
@@ -98,7 +100,7 @@ internal void Update(double value, ReadOnlySpan<KeyValuePair<string, object>> ta
         internal int Snapshot()
         {
             this.batchSize = 0;
-            var indexSnapshot = Math.Min(this.metricPointIndex, MaxMetricPoints - 1);
+            var indexSnapshot = Math.Min(this.metricPointIndex, this.metricPointLimit - 1);
             if (this.temporality == AggregationTemporality.Delta)
             {
                 this.SnapshotDelta(indexSnapshot);
@@ -197,7 +199,7 @@ private int LookupAggregatorStore(string[] tagKeys, object[] tagValues, int leng
             if (!value2metrics.TryGetValue(tagValues, out aggregatorIndex))
             {
                 aggregatorIndex = this.metricPointIndex;
-                if (aggregatorIndex >= MaxMetricPoints)
+                if (aggregatorIndex >= this.metricPointLimit)
                 {
                     // sorry! out of data points.
                     // TODO: Once we support cleanup of
@@ -212,7 +214,7 @@ private int LookupAggregatorStore(string[] tagKeys, object[] tagValues, int leng
                     if (!value2metrics.TryGetValue(tagValues, out aggregatorIndex))
                     {
                         aggregatorIndex = Interlocked.Increment(ref this.metricPointIndex);
-                        if (aggregatorIndex >= MaxMetricPoints)
+                        if (aggregatorIndex >= this.metricPointLimit)
                         {
                             // sorry! out of data points.
                             // TODO: Once we support cleanup of

src/OpenTelemetry/Metrics/MeterProviderBuilderBase.cs

@@ -29,10 +29,14 @@ namespace OpenTelemetry.Metrics
     /// </summary>
     public abstract class MeterProviderBuilderBase : MeterProviderBuilder
     {
+        internal const int MaxMetricsDefault = 1000;
+        internal const int MaxMetricPointsPerMetricDefault = 2000;
         private readonly List<InstrumentationFactory> instrumentationFactories = new List<InstrumentationFactory>();
         private readonly List<string> meterSources = new List<string>();
         private readonly List<Func<Instrument, MetricStreamConfiguration>> viewConfigs = new List<Func<Instrument, MetricStreamConfiguration>>();
         private ResourceBuilder resourceBuilder = ResourceBuilder.CreateDefault();
+        private int maxMetricStreams = MaxMetricsDefault;
+        private int maxMetricPointsPerMetricStream = MaxMetricPointsPerMetricDefault;
 
         protected MeterProviderBuilderBase()
         {
@@ -105,6 +109,22 @@ internal MeterProviderBuilder AddView(Func<Instrument, MetricStreamConfiguration
             return this;
         }
 
+        internal MeterProviderBuilder SetMaxMetricStreams(int maxMetricStreams)
+        {
+            Guard.Range(maxMetricStreams, min: 1);
+
+            this.maxMetricStreams = maxMetricStreams;
+            return this;
+        }
+
+        internal MeterProviderBuilder SetmaxMetricPointsPerMetricStreamPerMetricStream(int maxMetricPointsPerMetricStream)
+        {
+            Guard.Range(maxMetricPointsPerMetricStream, min: 1);
+
+            this.maxMetricPointsPerMetricStream = maxMetricPointsPerMetricStream;
+            return this;
+        }
+
         internal MeterProviderBuilder SetResourceBuilder(ResourceBuilder resourceBuilder)
         {
             Debug.Assert(resourceBuilder != null, $"{nameof(resourceBuilder)} must not be null");
@@ -124,6 +144,8 @@ protected MeterProvider Build()
                 this.meterSources,
                 this.instrumentationFactories,
                 this.viewConfigs,
+                this.maxMetricStreams,
+                this.maxMetricPointsPerMetricStream,
                 this.MetricReaders.ToArray());
         }
 

src/OpenTelemetry/Metrics/MeterProviderBuilderExtensions.cs

@@ -121,6 +121,53 @@ public static MeterProviderBuilder AddView(this MeterProviderBuilder meterProvid
             return meterProviderBuilder;
         }
 
+        /// <summary>
+        /// Sets the maximum number of Metric streams supported by the MeterProvider.
+        /// When no Views are configured, every instrument will result in one metric stream,
+        /// so this control the numbers of instruments supported.
+        /// When Views are configued, a single instrument can result in multiple metric streams,
+        /// so this control the number of streams.
+        /// </summary>
+        /// <param name="meterProviderBuilder">MeterProviderBuilder instance.</param>
+        /// <param name="maxMetricStreams">Maximum number of metric streams allowed.</param>
+        /// <returns>Returns <see cref="MeterProviderBuilder"/> for chaining.</returns>
+        /// <remarks>
+        /// If an instrument is created, but disposed later, this will still be contributing to the limit.
+        /// This may change in the future.
+        /// </remarks>
+        public static MeterProviderBuilder SetMaxMetricStreams(this MeterProviderBuilder meterProviderBuilder, int maxMetricStreams)
+        {
+            if (meterProviderBuilder is MeterProviderBuilderBase meterProviderBuilderBase)
+            {
+                meterProviderBuilderBase.SetMaxMetricStreams(maxMetricStreams);
+            }
+
+            return meterProviderBuilder;
+        }
+
+        /// <summary>
+        /// Sets the maximum number of MetricPoints allowed per metric stream.
+        /// This limits the number of unique combinations of key/value pairs used
+        /// for reporting measurements.
+        /// </summary>
+        /// <param name="meterProviderBuilder">MeterProviderBuilder instance.</param>
+        /// <param name="maxMetricPointsPerMetricStream">Maximum maximum number of metric points allowed per metric stream.</param>
+        /// <returns>Returns <see cref="MeterProviderBuilder"/> for chaining.</returns>
+        /// <remarks>
+        /// If a particular combination of key value pair is used at least once,
+        /// it will still be contributing to the limit.
+        /// This may change in the future.
+        /// </remarks>
+        public static MeterProviderBuilder SetMaxMetricPointsPerMetricStream(this MeterProviderBuilder meterProviderBuilder, int maxMetricPointsPerMetricStream)
+        {
+            if (meterProviderBuilder is MeterProviderBuilderBase meterProviderBuilderBase)
+            {
+                meterProviderBuilderBase.SetMaxMetricPointsPerMetricStream(maxMetricPointsPerMetricStream);
+            }
+
+            return meterProviderBuilder;
+        }
+
         /// <summary>
         /// Sets the <see cref="ResourceBuilder"/> from which the Resource associated with
         /// this provider is built from. Overwrites currently set ResourceBuilder.

src/OpenTelemetry/Metrics/MeterProviderSdk.cs

@@ -27,7 +27,6 @@ namespace OpenTelemetry.Metrics
 {
     internal sealed class MeterProviderSdk : MeterProvider
     {
-        internal const int MaxMetrics = 1000;
         internal int ShutdownCount;
         private readonly Metric[] metrics;
         private readonly Metric[] metricsCurrentBatch;
@@ -38,6 +37,8 @@ internal sealed class MeterProviderSdk : MeterProvider
         private readonly HashSet<string> metricStreamNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         private readonly MeterListener listener;
         private readonly MetricReader reader;
+        private readonly int maxMetricStreams;
+        private readonly int maxMetricPointsPerMetricStream;
         private int metricIndex = -1;
         private bool disposed;
 
@@ -46,12 +47,16 @@ internal MeterProviderSdk(
             IEnumerable<string> meterSources,
             List<MeterProviderBuilderBase.InstrumentationFactory> instrumentationFactories,
             List<Func<Instrument, MetricStreamConfiguration>> viewConfigs,
+            int maxMetricStreams,
+            int maxMetricPointsPerMetricStream,
             IEnumerable<MetricReader> readers)
         {
             this.Resource = resource;
             this.viewConfigs = viewConfigs;
-            this.metrics = new Metric[MaxMetrics];
-            this.metricsCurrentBatch = new Metric[MaxMetrics];
+            this.metrics = new Metric[maxMetricStreams];
+            this.metricsCurrentBatch = new Metric[maxMetricStreams];
+            this.maxMetricStreams = maxMetricStreams;
+            this.maxMetricPointsPerMetricStream = maxMetricPointsPerMetricStream;
 
             AggregationTemporality temporality = AggregationTemporality.Cumulative;
 
@@ -185,7 +190,7 @@ internal MeterProviderSdk(
                             }
 
                             var index = ++this.metricIndex;
-                            if (index >= MaxMetrics)
+                            if (index >= this.maxMetricStreams)
                             {
                                 // TODO: Log that instrument is ignored
                                 // as max number of Metrics have reached.
@@ -197,7 +202,7 @@ internal MeterProviderSdk(
                                 string[] tagKeysInteresting = metricStreamConfig?.TagKeys;
                                 double[] histogramBucketBounds = (metricStreamConfig is ExplicitBucketHistogramConfiguration histogramConfig
                                     && histogramConfig.Boundaries != null) ? histogramConfig.Boundaries : null;
-                                metric = new Metric(instrument, temporality, metricName, metricDescription, histogramBucketBounds, tagKeysInteresting);
+                                metric = new Metric(instrument, temporality, metricName, metricDescription, this.maxMetricPointsPerMetricStream, histogramBucketBounds, tagKeysInteresting);
 
                                 this.metrics[index] = metric;
                                 metrics.Add(metric);
@@ -260,14 +265,14 @@ internal MeterProviderSdk(
                             }
 
                             var index = ++this.metricIndex;
-                            if (index >= MaxMetrics)
+                            if (index >= this.maxMetricStreams)
                             {
                                 OpenTelemetrySdkEventSource.Log.MetricInstrumentIgnored(metricName, instrument.Meter.Name, "Maximum allowed Metrics for the provider exceeded.", "Use views to drop unused instruments. Or configure Provider to allow higher limit.");
                                 return;
                             }
                             else
                             {
-                                metric = new Metric(instrument, temporality, metricName, instrument.Description);
+                                metric = new Metric(instrument, temporality, metricName, instrument.Description, this.maxMetricPointsPerMetricStream);
                                 this.metrics[index] = metric;
                                 this.metricStreamNames.Add(metricStreamName);
                             }
@@ -441,7 +446,7 @@ internal Batch<Metric> Collect()
                         OpenTelemetrySdkEventSource.Log.MetricObserverCallbackException(exception);
                     }
 
-                    var indexSnapshot = Math.Min(this.metricIndex, MaxMetrics - 1);
+                    var indexSnapshot = Math.Min(this.metricIndex, this.maxMetricStreams - 1);
                     var target = indexSnapshot + 1;
                     int metricCountCurrentBatch = 0;
                     for (int i = 0; i < target; i++)

src/OpenTelemetry/Metrics/Metric.cs

@@ -30,6 +30,7 @@ internal Metric(
             AggregationTemporality temporality,
             string metricName,
             string metricDescription,
+            int metricPointLimit,
             double[] histogramBounds = null,
             string[] tagKeysInteresting = null)
         {
@@ -104,7 +105,7 @@ internal Metric(
                 // TODO: Log and assign some invalid Enum.
             }
 
-            this.aggStore = new AggregatorStore(aggType, temporality, histogramBounds ?? DefaultHistogramBounds, tagKeysInteresting);
+            this.aggStore = new AggregatorStore(aggType, temporality, metricPointLimit, histogramBounds ?? DefaultHistogramBounds, tagKeysInteresting);
             this.Temporality = temporality;
             this.InstrumentDisposed = false;
         }

test/OpenTelemetry.Tests/Metrics/MetricAPITest.cs

@@ -489,26 +489,26 @@ int MetricPointCount()
             // for no tag point!
             // This may be changed later.
             counterLong.Add(10);
-            for (int i = 0; i < AggregatorStore.MaxMetricPoints + 1; i++)
+            for (int i = 0; i < MeterProviderBuilderBase.MaxMetricPointsPerMetricDefault + 1; i++)
             {
                 counterLong.Add(10, new KeyValuePair<string, object>("key", "value" + i));
             }
 
             metricReader.Collect();
-            Assert.Equal(AggregatorStore.MaxMetricPoints, MetricPointCount());
+            Assert.Equal(MeterProviderBuilderBase.MaxMetricPointsPerMetricDefault, MetricPointCount());
 
             metricItems.Clear();
             counterLong.Add(10);
-            for (int i = 0; i < AggregatorStore.MaxMetricPoints + 1; i++)
+            for (int i = 0; i < MeterProviderBuilderBase.MaxMetricPointsPerMetricDefault + 1; i++)
             {
                 counterLong.Add(10, new KeyValuePair<string, object>("key", "value" + i));
             }
 
             metricReader.Collect();
-            Assert.Equal(AggregatorStore.MaxMetricPoints, MetricPointCount());
+            Assert.Equal(MeterProviderBuilderBase.MaxMetricPointsPerMetricDefault, MetricPointCount());
 
             counterLong.Add(10);
-            for (int i = 0; i < AggregatorStore.MaxMetricPoints + 1; i++)
+            for (int i = 0; i < MeterProviderBuilderBase.MaxMetricPointsPerMetricDefault + 1; i++)
             {
                 counterLong.Add(10, new KeyValuePair<string, object>("key", "value" + i));
             }
@@ -519,7 +519,7 @@ int MetricPointCount()
             counterLong.Add(10, new KeyValuePair<string, object>("key", "valueC"));
             metricItems.Clear();
             metricReader.Collect();
-            Assert.Equal(AggregatorStore.MaxMetricPoints, MetricPointCount());
+            Assert.Equal(MeterProviderBuilderBase.MaxMetricPointsPerMetricDefault, MetricPointCount());
         }
 
         [Fact]