Merge branch 'main' into mfogliatto/add-otlplogexporter-tests-2

mfogliatto · web-flow · commit 7f82b8dbf04a · 2023-03-15T14:42:51.000+01:00
diff --git a/src/OpenTelemetry.Api/Internal/SemanticConventions.cs b/src/OpenTelemetry.Api/Internal/SemanticConventions.cs
@@ -18,7 +18,8 @@ namespace OpenTelemetry.Trace
 {
     /// <summary>
     /// Constants for semantic attribute names outlined by the OpenTelemetry specifications.
-    /// <see href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/README.md"/>.
+    /// <see href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/README.md"/> and
+    /// <see href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/README.md"/>.
     /// </summary>
     internal static class SemanticConventions
     {
diff --git a/src/OpenTelemetry.Instrumentation.Http/README.md b/src/OpenTelemetry.Instrumentation.Http/README.md
@@ -40,9 +40,12 @@ dotnet add package --prerelease OpenTelemetry.Instrumentation.Http
 
 HTTP instrumentation must be enabled at application startup.
 
-The following example demonstrates adding HTTP instrumentation to a console
-application. This example also sets up the OpenTelemetry Console exporter, which
-requires adding the package
+#### Traces
+
+The following example demonstrates adding `HttpClient` instrumentation with the
+extension method `.AddHttpClientInstrumentation()` on `TracerProviderBuilder` to
+a console application. This example also sets up the OpenTelemetry Console
+Exporter, which requires adding the package
 [`OpenTelemetry.Exporter.Console`](../OpenTelemetry.Exporter.Console/README.md)
 to the application.
 
@@ -62,13 +65,50 @@ public class Program
 }
 ```
 
-For an ASP.NET Core application, adding instrumentation is typically done in the
-`ConfigureServices` of your `Startup` class. Refer to documentation for
-[OpenTelemetry.Instrumentation.AspNetCore](../OpenTelemetry.Instrumentation.AspNetCore/README.md).
+#### Metrics
+
+> **Note**
+> Metrics are not available for .NET Framework.
+
+The following example demonstrates adding `HttpClient` instrumentation with the
+extension method `.AddHttpClientInstrumentation()` on `MeterProviderBuilder` to
+a console application. This example also sets up the OpenTelemetry Console
+Exporter, which requires adding the package
+[`OpenTelemetry.Exporter.Console`](../OpenTelemetry.Exporter.Console/README.md)
+to the application.
+
+```csharp
+using OpenTelemetry;
+using OpenTelemetry.Metrics;
+
+public class Program
+{
+    public static void Main(string[] args)
+    {
+        using var meterProvider = Sdk.CreateMeterProviderBuilder()
+            .AddHttpClientInstrumentation()
+            .AddConsoleExporter()
+            .Build();
+    }
+}
+```
+
+Refer to this [example](../../examples/AspNetCore/Program.cs) to see how to
+enable this instrumentation in an ASP.NET core application.
+
+Refer to this
+[example](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/main/src/OpenTelemetry.Instrumentation.AspNet/README.md)
+to see how to enable this instrumentation in an ASP.NET application.
+
+#### List of metrics produced
+
+The instrumentation was implemented based on [metrics semantic
+conventions](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/http-metrics.md#metric-httpclientduration).
+Currently, the instrumentation supports the following metric.
 
-For an ASP.NET application, adding instrumentation is typically done in the
-`Global.asax.cs`. Refer to the documentation for
-[OpenTelemetry.Instrumentation.AspNet](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/main/src/OpenTelemetry.Instrumentation.AspNet/README.md).
+| Name  | Instrument Type | Unit | Description |
+|-------|-----------------|------|-------------|
+| `http.client.duration` | Histogram | `ms` | Measures the duration of outbound HTTP requests. |
 
 ## Advanced configuration
 
diff --git a/src/OpenTelemetry/.publicApi/net462/PublicAPI.Unshipped.txt b/src/OpenTelemetry/.publicApi/net462/PublicAPI.Unshipped.txt
@@ -22,6 +22,7 @@ OpenTelemetry.Metrics.ExponentialHistogramData.NegativeBuckets.get -> OpenTeleme
 OpenTelemetry.Metrics.ExponentialHistogramData.PositiveBuckets.get -> OpenTelemetry.Metrics.ExponentialHistogramBuckets!
 OpenTelemetry.Metrics.ExponentialHistogramData.Scale.get -> int
 OpenTelemetry.Metrics.ExponentialHistogramData.ZeroCount.get -> long
+OpenTelemetry.Metrics.MetricType.ExponentialHistogram = 80 -> OpenTelemetry.Metrics.MetricType
 OpenTelemetry.Metrics.TraceBasedExemplarFilter
 OpenTelemetry.Metrics.TraceBasedExemplarFilter.TraceBasedExemplarFilter() -> void
 static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.SetExemplarFilter(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, OpenTelemetry.Metrics.ExemplarFilter! exemplarFilter) -> OpenTelemetry.Metrics.MeterProviderBuilder!
diff --git a/src/OpenTelemetry/.publicApi/net6.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry/.publicApi/net6.0/PublicAPI.Unshipped.txt
@@ -22,6 +22,7 @@ OpenTelemetry.Metrics.ExponentialHistogramData.NegativeBuckets.get -> OpenTeleme
 OpenTelemetry.Metrics.ExponentialHistogramData.PositiveBuckets.get -> OpenTelemetry.Metrics.ExponentialHistogramBuckets!
 OpenTelemetry.Metrics.ExponentialHistogramData.Scale.get -> int
 OpenTelemetry.Metrics.ExponentialHistogramData.ZeroCount.get -> long
+OpenTelemetry.Metrics.MetricType.ExponentialHistogram = 80 -> OpenTelemetry.Metrics.MetricType
 OpenTelemetry.Metrics.TraceBasedExemplarFilter
 OpenTelemetry.Metrics.TraceBasedExemplarFilter.TraceBasedExemplarFilter() -> void
 static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.SetExemplarFilter(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, OpenTelemetry.Metrics.ExemplarFilter! exemplarFilter) -> OpenTelemetry.Metrics.MeterProviderBuilder!
diff --git a/src/OpenTelemetry/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt
@@ -22,6 +22,7 @@ OpenTelemetry.Metrics.ExponentialHistogramData.NegativeBuckets.get -> OpenTeleme
 OpenTelemetry.Metrics.ExponentialHistogramData.PositiveBuckets.get -> OpenTelemetry.Metrics.ExponentialHistogramBuckets!
 OpenTelemetry.Metrics.ExponentialHistogramData.Scale.get -> int
 OpenTelemetry.Metrics.ExponentialHistogramData.ZeroCount.get -> long
+OpenTelemetry.Metrics.MetricType.ExponentialHistogram = 80 -> OpenTelemetry.Metrics.MetricType
 OpenTelemetry.Metrics.TraceBasedExemplarFilter
 OpenTelemetry.Metrics.TraceBasedExemplarFilter.TraceBasedExemplarFilter() -> void
 static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.SetExemplarFilter(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, OpenTelemetry.Metrics.ExemplarFilter! exemplarFilter) -> OpenTelemetry.Metrics.MeterProviderBuilder!
diff --git a/src/OpenTelemetry/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt b/src/OpenTelemetry/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt
@@ -22,6 +22,7 @@ OpenTelemetry.Metrics.ExponentialHistogramData.NegativeBuckets.get -> OpenTeleme
 OpenTelemetry.Metrics.ExponentialHistogramData.PositiveBuckets.get -> OpenTelemetry.Metrics.ExponentialHistogramBuckets!
 OpenTelemetry.Metrics.ExponentialHistogramData.Scale.get -> int
 OpenTelemetry.Metrics.ExponentialHistogramData.ZeroCount.get -> long
+OpenTelemetry.Metrics.MetricType.ExponentialHistogram = 80 -> OpenTelemetry.Metrics.MetricType
 OpenTelemetry.Metrics.TraceBasedExemplarFilter
 OpenTelemetry.Metrics.TraceBasedExemplarFilter.TraceBasedExemplarFilter() -> void
 static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.SetExemplarFilter(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, OpenTelemetry.Metrics.ExemplarFilter! exemplarFilter) -> OpenTelemetry.Metrics.MeterProviderBuilder!
diff --git a/src/OpenTelemetry/BatchExportProcessor.cs b/src/OpenTelemetry/BatchExportProcessor.cs
@@ -83,7 +83,7 @@ protected BatchExportProcessor(
         /// <summary>
         /// Gets the number of telemetry objects dropped by the processor.
         /// </summary>
-        internal long DroppedCount => this.droppedCount;
+        internal long DroppedCount => Volatile.Read(ref this.droppedCount);
 
         /// <summary>
         /// Gets the number of telemetry objects received by the processor.
@@ -198,7 +198,7 @@ protected override bool OnForceFlush(int timeoutMilliseconds)
                     return true;
                 }
 
-                if (this.shutdownDrainTarget != long.MaxValue)
+                if (Volatile.Read(ref this.shutdownDrainTarget) != long.MaxValue)
                 {
                     return false;
                 }
@@ -208,7 +208,7 @@ protected override bool OnForceFlush(int timeoutMilliseconds)
         /// <inheritdoc/>
         protected override bool OnShutdown(int timeoutMilliseconds)
         {
-            this.shutdownDrainTarget = this.circularBuffer.AddedCount;
+            Volatile.Write(ref this.shutdownDrainTarget, this.circularBuffer.AddedCount);
 
             try
             {
@@ -219,7 +219,7 @@ protected override bool OnShutdown(int timeoutMilliseconds)
                 return false;
             }
 
-            OpenTelemetrySdkEventSource.Log.DroppedExportProcessorItems(this.GetType().Name, this.exporter.GetType().Name, this.droppedCount);
+            OpenTelemetrySdkEventSource.Log.DroppedExportProcessorItems(this.GetType().Name, this.exporter.GetType().Name, this.DroppedCount);
 
             if (timeoutMilliseconds == Timeout.Infinite)
             {
@@ -295,7 +295,7 @@ private void ExporterProc()
                     }
                 }
 
-                if (this.circularBuffer.RemovedCount >= this.shutdownDrainTarget)
+                if (this.circularBuffer.RemovedCount >= Volatile.Read(ref this.shutdownDrainTarget))
                 {
                     return;
                 }
diff --git a/src/OpenTelemetry/Metrics/AggregatorStore.cs b/src/OpenTelemetry/Metrics/AggregatorStore.cs
@@ -38,7 +38,7 @@ internal sealed class AggregatorStore
         private readonly int[] currentMetricPointBatch;
         private readonly AggregationType aggType;
         private readonly double[] histogramBounds;
-        private readonly int exponentialHistogramMaxBuckets;
+        private readonly int exponentialHistogramMaxSize;
         private readonly UpdateLongDelegate updateLongCallback;
         private readonly UpdateDoubleDelegate updateDoubleCallback;
         private readonly int maxMetricPoints;
@@ -49,27 +49,24 @@ internal sealed class AggregatorStore
         private bool zeroTagMetricPointInitialized;
 
         internal AggregatorStore(
-            string name,
+            MetricStreamIdentity metricStreamIdentity,
             AggregationType aggType,
             AggregationTemporality temporality,
             int maxMetricPoints,
-            double[] histogramBounds,
-            int exponentialHistogramMaxBuckets,
-            string[] tagKeysInteresting = null,
             ExemplarFilter exemplarFilter = null)
         {
-            this.name = name;
+            this.name = metricStreamIdentity.InstrumentName;
             this.maxMetricPoints = maxMetricPoints;
             this.metricPointCapHitMessage = $"Maximum MetricPoints limit reached for this Metric stream. Configured limit: {this.maxMetricPoints}";
             this.metricPoints = new MetricPoint[maxMetricPoints];
             this.currentMetricPointBatch = new int[maxMetricPoints];
             this.aggType = aggType;
             this.outputDelta = temporality == AggregationTemporality.Delta;
-            this.histogramBounds = histogramBounds;
-            this.exponentialHistogramMaxBuckets = exponentialHistogramMaxBuckets;
+            this.histogramBounds = metricStreamIdentity.HistogramBucketBounds ?? Metric.DefaultHistogramBounds;
+            this.exponentialHistogramMaxSize = metricStreamIdentity.ExponentialHistogramMaxSize;
             this.StartTimeExclusive = DateTimeOffset.UtcNow;
             this.exemplarFilter = exemplarFilter ?? new AlwaysOffExemplarFilter();
-            if (tagKeysInteresting == null)
+            if (metricStreamIdentity.TagKeys == null)
             {
                 this.updateLongCallback = this.UpdateLong;
                 this.updateDoubleCallback = this.UpdateDouble;
@@ -78,7 +75,7 @@ internal AggregatorStore(
             {
                 this.updateLongCallback = this.UpdateLongCustomTags;
                 this.updateDoubleCallback = this.UpdateDoubleCustomTags;
-                var hs = new HashSet<string>(tagKeysInteresting, StringComparer.Ordinal);
+                var hs = new HashSet<string>(metricStreamIdentity.TagKeys, StringComparer.Ordinal);
                 this.tagKeysInteresting = hs;
                 this.tagsKeysInterestingCount = hs.Count;
             }
@@ -191,7 +188,7 @@ private void InitializeZeroTagPointIfNotInitialized()
                 {
                     if (!this.zeroTagMetricPointInitialized)
                     {
-                        this.metricPoints[0] = new MetricPoint(this, this.aggType, null, this.histogramBounds, this.exponentialHistogramMaxBuckets);
+                        this.metricPoints[0] = new MetricPoint(this, this.aggType, null, this.histogramBounds, this.exponentialHistogramMaxSize);
                         this.zeroTagMetricPointInitialized = true;
                     }
                 }
@@ -258,7 +255,7 @@ private int LookupAggregatorStore(KeyValuePair<string, object>[] tagKeysAndValue
                                 }
 
                                 ref var metricPoint = ref this.metricPoints[aggregatorIndex];
-                                metricPoint = new MetricPoint(this, this.aggType, sortedTags.KeyValuePairs, this.histogramBounds, this.exponentialHistogramMaxBuckets);
+                                metricPoint = new MetricPoint(this, this.aggType, sortedTags.KeyValuePairs, this.histogramBounds, this.exponentialHistogramMaxSize);
 
                                 // Add to dictionary *after* initializing MetricPoint
                                 // as other threads can start writing to the
@@ -307,7 +304,7 @@ private int LookupAggregatorStore(KeyValuePair<string, object>[] tagKeysAndValue
                             }
 
                             ref var metricPoint = ref this.metricPoints[aggregatorIndex];
-                            metricPoint = new MetricPoint(this, this.aggType, givenTags.KeyValuePairs, this.histogramBounds, this.exponentialHistogramMaxBuckets);
+                            metricPoint = new MetricPoint(this, this.aggType, givenTags.KeyValuePairs, this.histogramBounds, this.exponentialHistogramMaxSize);
 
                             // Add to dictionary *after* initializing MetricPoint
                             // as other threads can start writing to the
diff --git a/src/OpenTelemetry/Metrics/Metric.cs b/src/OpenTelemetry/Metrics/Metric.cs
@@ -33,9 +33,6 @@ internal Metric(
             MetricStreamIdentity instrumentIdentity,
             AggregationTemporality temporality,
             int maxMetricPointsPerMetricStream,
-            double[] histogramBounds = null,
-            string[] tagKeysInteresting = null,
-            bool histogramRecordMinMax = true,
             ExemplarFilter exemplarFilter = null)
         {
             this.InstrumentIdentity = instrumentIdentity;
@@ -118,18 +115,31 @@ internal Metric(
                 || instrumentIdentity.InstrumentType == typeof(Histogram<float>)
                 || instrumentIdentity.InstrumentType == typeof(Histogram<double>))
             {
-                this.MetricType = MetricType.Histogram;
-
-                aggType = histogramBounds != null && histogramBounds.Length == 0
-                    ? (histogramRecordMinMax ? AggregationType.HistogramWithMinMax : AggregationType.Histogram)
-                    : (histogramRecordMinMax ? AggregationType.HistogramWithMinMaxBuckets : AggregationType.HistogramWithBuckets);
+                var explicitBucketBounds = instrumentIdentity.HistogramBucketBounds;
+                var exponentialMaxSize = instrumentIdentity.ExponentialHistogramMaxSize;
+                var histogramRecordMinMax = instrumentIdentity.HistogramRecordMinMax;
+
+                this.MetricType = exponentialMaxSize == 0
+                    ? MetricType.Histogram
+                    : MetricType.ExponentialHistogram;
+
+                if (this.MetricType == MetricType.Histogram)
+                {
+                    aggType = explicitBucketBounds != null && explicitBucketBounds.Length == 0
+                        ? (histogramRecordMinMax ? AggregationType.HistogramWithMinMax : AggregationType.Histogram)
+                        : (histogramRecordMinMax ? AggregationType.HistogramWithMinMaxBuckets : AggregationType.HistogramWithBuckets);
+                }
+                else
+                {
+                    aggType = histogramRecordMinMax ? AggregationType.Base2ExponentialHistogramWithMinMax : AggregationType.Base2ExponentialHistogram;
+                }
             }
             else
             {
                 throw new NotSupportedException($"Unsupported Instrument Type: {instrumentIdentity.InstrumentType.FullName}");
             }
 
-            this.aggStore = new AggregatorStore(instrumentIdentity.InstrumentName, aggType, temporality, maxMetricPointsPerMetricStream, histogramBounds ?? DefaultHistogramBounds, DefaultExponentialHistogramMaxBuckets, tagKeysInteresting, exemplarFilter);
+            this.aggStore = new AggregatorStore(instrumentIdentity, aggType, temporality, maxMetricPointsPerMetricStream, exemplarFilter);
             this.Temporality = temporality;
             this.InstrumentDisposed = false;
         }
diff --git a/src/OpenTelemetry/Metrics/MetricReaderExt.cs b/src/OpenTelemetry/Metrics/MetricReaderExt.cs
@@ -156,7 +156,7 @@ internal List<Metric> AddMetricsListWithViews(Instrument instrument, List<Metric
                     }
                     else
                     {
-                        Metric metric = new(metricStreamIdentity, this.GetAggregationTemporality(metricStreamIdentity.InstrumentType), this.maxMetricPointsPerMetricStream, metricStreamIdentity.HistogramBucketBounds, metricStreamIdentity.TagKeys, metricStreamIdentity.HistogramRecordMinMax, this.exemplarFilter);
+                        Metric metric = new(metricStreamIdentity, this.GetAggregationTemporality(metricStreamIdentity.InstrumentType), this.maxMetricPointsPerMetricStream, this.exemplarFilter);
 
                         this.instrumentIdentityToMetric[metricStreamIdentity] = metric;
                         this.metrics[index] = metric;
diff --git a/src/OpenTelemetry/Metrics/MetricStreamIdentity.cs b/src/OpenTelemetry/Metrics/MetricStreamIdentity.cs
@@ -35,6 +35,7 @@ public MetricStreamIdentity(Instrument instrument, MetricStreamConfiguration met
             this.MetricStreamName = $"{this.MeterName}.{this.MeterVersion}.{this.InstrumentName}";
             this.TagKeys = metricStreamConfiguration?.CopiedTagKeys;
             this.HistogramBucketBounds = (metricStreamConfiguration as ExplicitBucketHistogramConfiguration)?.CopiedBoundaries;
+            this.ExponentialHistogramMaxSize = (metricStreamConfiguration as Base2ExponentialBucketHistogramConfiguration)?.MaxSize ?? 0;
             this.HistogramRecordMinMax = (metricStreamConfiguration as HistogramConfiguration)?.RecordMinMax ?? true;
 
 #if NETSTANDARD2_1 || NET6_0_OR_GREATER
@@ -48,6 +49,7 @@ public MetricStreamIdentity(Instrument instrument, MetricStreamConfiguration met
             hashCode.Add(this.Description);
             hashCode.Add(this.ViewId);
             hashCode.Add(this.TagKeys, StringArrayComparer);
+            hashCode.Add(this.ExponentialHistogramMaxSize);
             if (this.HistogramBucketBounds != null)
             {
                 for (var i = 0; i < this.HistogramBucketBounds.Length; ++i)
@@ -66,6 +68,7 @@ public MetricStreamIdentity(Instrument instrument, MetricStreamConfiguration met
                 hash = (hash * 31) + this.MeterVersion.GetHashCode();
                 hash = (hash * 31) + this.InstrumentName.GetHashCode();
                 hash = (hash * 31) + this.HistogramRecordMinMax.GetHashCode();
+                hash = (hash * 31) + this.ExponentialHistogramMaxSize.GetHashCode();
                 hash = (hash * 31) + (this.Unit?.GetHashCode() ?? 0);
                 hash = (hash * 31) + (this.Description?.GetHashCode() ?? 0);
                 hash = (hash * 31) + (this.ViewId ?? 0);
@@ -104,6 +107,8 @@ public MetricStreamIdentity(Instrument instrument, MetricStreamConfiguration met
 
         public double[] HistogramBucketBounds { get; }
 
+        public int ExponentialHistogramMaxSize { get; }
+
         public bool HistogramRecordMinMax { get; }
 
         public static bool operator ==(MetricStreamIdentity metricIdentity1, MetricStreamIdentity metricIdentity2) => metricIdentity1.Equals(metricIdentity2);
@@ -125,6 +130,7 @@ public bool Equals(MetricStreamIdentity other)
                 && this.Description == other.Description
                 && this.ViewId == other.ViewId
                 && this.HistogramRecordMinMax == other.HistogramRecordMinMax
+                && this.ExponentialHistogramMaxSize == other.ExponentialHistogramMaxSize
                 && StringArrayComparer.Equals(this.TagKeys, other.TagKeys)
                 && HistogramBoundsEqual(this.HistogramBucketBounds, other.HistogramBucketBounds);
         }
diff --git a/src/OpenTelemetry/Metrics/MetricType.cs b/src/OpenTelemetry/Metrics/MetricType.cs
diff --git a/test/OpenTelemetry.Tests/Metrics/AggregatorTest.cs b/test/OpenTelemetry.Tests/Metrics/AggregatorTest.cs

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@ namespace OpenTelemetry.Trace`
`18`	`18`	`{`
`19`	`19`	`/// <summary>`
`20`	`20`	`/// Constants for semantic attribute names outlined by the OpenTelemetry specifications.`
`21`		`- /// <see href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/README.md"/>.`
	`21`	`+ /// <see href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/README.md"/> and`
	`22`	`+ /// <see href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/README.md"/>.`
`22`	`23`	`/// </summary>`
`23`	`24`	`internal static class SemanticConventions`
`24`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ protected BatchExportProcessor(`
`83`	`83`	`/// <summary>`
`84`	`84`	`/// Gets the number of telemetry objects dropped by the processor.`
`85`	`85`	`/// </summary>`
`86`		`- internal long DroppedCount => this.droppedCount;`
	`86`	`+ internal long DroppedCount => Volatile.Read(ref this.droppedCount);`
`87`	`87`
`88`	`88`	`/// <summary>`
`89`	`89`	`/// Gets the number of telemetry objects received by the processor.`
`@@ -198,7 +198,7 @@ protected override bool OnForceFlush(int timeoutMilliseconds)`
`198`	`198`	`return true;`
`199`	`199`	`}`
`200`	`200`
`201`		`- if (this.shutdownDrainTarget != long.MaxValue)`
	`201`	`+ if (Volatile.Read(ref this.shutdownDrainTarget) != long.MaxValue)`
`202`	`202`	`{`
`203`	`203`	`return false;`
`204`	`204`	`}`
`@@ -208,7 +208,7 @@ protected override bool OnForceFlush(int timeoutMilliseconds)`
`208`	`208`	`/// <inheritdoc/>`
`209`	`209`	`protected override bool OnShutdown(int timeoutMilliseconds)`
`210`	`210`	`{`
`211`		`- this.shutdownDrainTarget = this.circularBuffer.AddedCount;`
	`211`	`+ Volatile.Write(ref this.shutdownDrainTarget, this.circularBuffer.AddedCount);`
`212`	`212`
`213`	`213`	`try`
`214`	`214`	`{`
`@@ -219,7 +219,7 @@ protected override bool OnShutdown(int timeoutMilliseconds)`
`219`	`219`	`return false;`
`220`	`220`	`}`
`221`	`221`
`222`		`- OpenTelemetrySdkEventSource.Log.DroppedExportProcessorItems(this.GetType().Name, this.exporter.GetType().Name, this.droppedCount);`
	`222`	`+ OpenTelemetrySdkEventSource.Log.DroppedExportProcessorItems(this.GetType().Name, this.exporter.GetType().Name, this.DroppedCount);`
`223`	`223`
`224`	`224`	`if (timeoutMilliseconds == Timeout.Infinite)`
`225`	`225`	`{`
`@@ -295,7 +295,7 @@ private void ExporterProc()`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`
`298`		`- if (this.circularBuffer.RemovedCount >= this.shutdownDrainTarget)`
	`298`	`+ if (this.circularBuffer.RemovedCount >= Volatile.Read(ref this.shutdownDrainTarget))`
`299`	`299`	`{`
`300`	`300`	`return;`
`301`	`301`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ internal List<Metric> AddMetricsListWithViews(Instrument instrument, List<Metric`
`156`	`156`	`}`
`157`	`157`	`else`
`158`	`158`	`{`
`159`		`- Metric metric = new(metricStreamIdentity, this.GetAggregationTemporality(metricStreamIdentity.InstrumentType), this.maxMetricPointsPerMetricStream, metricStreamIdentity.HistogramBucketBounds, metricStreamIdentity.TagKeys, metricStreamIdentity.HistogramRecordMinMax, this.exemplarFilter);`
	`159`	`+ Metric metric = new(metricStreamIdentity, this.GetAggregationTemporality(metricStreamIdentity.InstrumentType), this.maxMetricPointsPerMetricStream, this.exemplarFilter);`
`160`	`160`
`161`	`161`	`this.instrumentIdentityToMetric[metricStreamIdentity] = metric;`
`162`	`162`	`this.metrics[index] = metric;`