Merge branch 'main' into docs-logs-sensitive-pipeline

open-telemetry · Feb 15, 2024 · 714d906 · 714d906
2 parents 7616a9d + 855e9c4
commit 714d906
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 14 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -81,7 +81,7 @@
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="[8.0.0,)" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="[8.0.0,)" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0,)" />
-    <PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="[8.1.0,)" />
+    <PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="[8.2.0,)" />
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="[1.0.3,2.0)" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.8.0,18.0.0)" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="[1.1.1,2.0)" />

diff --git a/docs/logs/complex-objects/Program.cs b/docs/logs/complex-objects/Program.cs
@@ -29,7 +29,7 @@
 // This will flush the remaining logs and shutdown the logging pipeline.
 loggerFactory.Dispose();
 
-public static partial class ApplicationLogs
+internal static partial class LoggerExtensions
 {
     [LoggerMessage(LogLevel.Critical)]
     public static partial void FoodRecallNotice(

diff --git a/docs/logs/complex-objects/README.md b/docs/logs/complex-objects/README.md
@@ -49,7 +49,7 @@ that the following code is added which uses the `LogPropertiesAttribute` to log
 the `FoodRecallNotice` object:
 
 ```csharp
-public static partial class ApplicationLogs
+internal static partial class LoggerExtensions
 {
     [LoggerMessage(LogLevel.Critical)]
     public static partial void FoodRecallNotice(
@@ -89,6 +89,8 @@ LogRecord.Attributes (Key:Value):
     ProductType: Food & Beverages
     ProductDescription: Salads
     BrandName: Contoso
+LogRecord.EventId:                 252550133
+LogRecord.EventName:               FoodRecallNotice
 ```
 
 > [!NOTE]

diff --git a/docs/metrics/customizing-the-sdk/README.md b/docs/metrics/customizing-the-sdk/README.md
@@ -471,9 +471,9 @@ Histograms with buckets, and it stores at most one exemplar per histogram
 bucket. The exemplar stored is the last measurement recorded - i.e. any new
 measurement overwrites the previous one in that bucket.
 
-* `SimpleExemplarReservoir` is the default reservoir used for all metrics except
-Histograms with buckets. It has a fixed reservoir pool, and implements the
-equivalent of [naive
+* `SimpleFixedSizeExemplarReservoir` is the default reservoir used for all
+metrics except Histograms with buckets. It has a fixed reservoir pool, and
+implements the equivalent of [naive
 reservoir](https://en.wikipedia.org/wiki/Reservoir_sampling). The reservoir pool
 size (currently defaulting to 1) determines the maximum number of exemplars
 stored.

diff --git a/docs/trace/reporting-exceptions/README.md b/docs/trace/reporting-exceptions/README.md
@@ -95,7 +95,7 @@ using (var activity = MyActivitySource.StartActivity("Foo"))
     }
     catch (SomeException ex)
     {
-        activity?.SetStatus(ActivityStatusCode.Error, ex.message);
+        activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
     }
 }
 ```
@@ -119,7 +119,7 @@ using (var activity = MyActivitySource.StartActivity("Foo"))
     }
     catch (SomeException ex)
     {
-        activity?.SetStatus(ActivityStatusCode.Error, ex.message);
+        activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
         activity?.RecordException(ex);
     }
 }

diff --git a/examples/Console/otlp-collector-example/config.yaml b/examples/Console/otlp-collector-example/config.yaml
@@ -12,7 +12,7 @@ receivers:
 
 exporters:
   logging:
-    loglevel: debug
+    verbosity: detailed
 
 service:
   pipelines:

diff --git a/...trics/Exemplar/SimpleExemplarReservoir.cs → ...mplar/SimpleFixedSizeExemplarReservoir.cs b/...trics/Exemplar/SimpleExemplarReservoir.cs → ...mplar/SimpleFixedSizeExemplarReservoir.cs
@@ -6,9 +6,9 @@
 namespace OpenTelemetry.Metrics;
 
 /// <summary>
-/// The SimpleExemplarReservoir implementation.
+/// The SimpleFixedSizeExemplarReservoir implementation.
 /// </summary>
-internal sealed class SimpleExemplarReservoir : ExemplarReservoir
+internal sealed class SimpleFixedSizeExemplarReservoir : ExemplarReservoir
 {
     private readonly int poolSize;
     private readonly Random random;
@@ -17,7 +17,7 @@ internal sealed class SimpleExemplarReservoir : ExemplarReservoir
 
     private long measurementsSeen;
 
-    public SimpleExemplarReservoir(int poolSize)
+    public SimpleFixedSizeExemplarReservoir(int poolSize)
     {
         this.poolSize = poolSize;
         this.runningExemplars = new Exemplar[poolSize];

diff --git a/src/OpenTelemetry/Metrics/MetricPoint.cs b/src/OpenTelemetry/Metrics/MetricPoint.cs
@@ -91,7 +91,7 @@ internal MetricPoint(
 
         if (aggregatorStore!.IsExemplarEnabled() && reservoir == null)
         {
-            reservoir = new SimpleExemplarReservoir(DefaultSimpleReservoirPoolSize);
+            reservoir = new SimpleFixedSizeExemplarReservoir(DefaultSimpleReservoirPoolSize);
         }
 
         if (reservoir != null)

diff --git a/test/OpenTelemetry.Tests/Metrics/MetricExemplarTests.cs b/test/OpenTelemetry.Tests/Metrics/MetricExemplarTests.cs
@@ -52,7 +52,7 @@ public void TestExemplarsCounter(MetricReaderTemporalityPreference temporality)
         var exemplars = GetExemplars(metricPoint.Value);
 
         // TODO: Modify the test to better test cumulative.
-        // In cumulative where SimpleExemplarReservoir's size is
+        // In cumulative, where SimpleFixedSizeExemplarReservoir's size is
         // more than the count of new measurements, it is possible
         // that the exemplar value is for a measurement that was recorded in the prior
         // cycle. The current ValidateExemplars() does not handle this case.