From 41ec1894a004a71d38761bf5941daa48398a9a97 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Tue, 13 Feb 2024 21:36:07 -0800 Subject: [PATCH 1/4] Fix collector config in example (#5357) --- examples/Console/otlp-collector-example/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/Console/otlp-collector-example/config.yaml b/examples/Console/otlp-collector-example/config.yaml index b24851ab92d..932f24a193d 100644 --- 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: From 99a394c3bc1ec624966c8a09c43d0919983eed35 Mon Sep 17 00:00:00 2001 From: Rajkumar Rangaraj Date: Thu, 15 Feb 2024 09:44:10 -0800 Subject: [PATCH 2/4] [sdk] Rename SimpleExemplarReservoir to SimpleFixedSizeExemplarReservoir (#5359) --- docs/metrics/customizing-the-sdk/README.md | 6 +++--- ...plarReservoir.cs => SimpleFixedSizeExemplarReservoir.cs} | 6 +++--- src/OpenTelemetry/Metrics/MetricPoint.cs | 2 +- test/OpenTelemetry.Tests/Metrics/MetricExemplarTests.cs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename src/OpenTelemetry/Metrics/Exemplar/{SimpleExemplarReservoir.cs => SimpleFixedSizeExemplarReservoir.cs} (96%) diff --git a/docs/metrics/customizing-the-sdk/README.md b/docs/metrics/customizing-the-sdk/README.md index 653dd4979f3..14a72aaf2ac 100644 --- 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/src/OpenTelemetry/Metrics/Exemplar/SimpleExemplarReservoir.cs b/src/OpenTelemetry/Metrics/Exemplar/SimpleFixedSizeExemplarReservoir.cs similarity index 96% rename from src/OpenTelemetry/Metrics/Exemplar/SimpleExemplarReservoir.cs rename to src/OpenTelemetry/Metrics/Exemplar/SimpleFixedSizeExemplarReservoir.cs index b719c902edc..5324e7067d2 100644 --- a/src/OpenTelemetry/Metrics/Exemplar/SimpleExemplarReservoir.cs +++ b/src/OpenTelemetry/Metrics/Exemplar/SimpleFixedSizeExemplarReservoir.cs @@ -6,9 +6,9 @@ namespace OpenTelemetry.Metrics; /// -/// The SimpleExemplarReservoir implementation. +/// The SimpleFixedSizeExemplarReservoir implementation. /// -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 index 349afd51bd9..8931c9692a9 100644 --- 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 index 476976e4611..b5fd844f43c 100644 --- 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. From a1207550af06ddc3ba6a287fc33dab448425f05d Mon Sep 17 00:00:00 2001 From: Reiley Yang Date: Thu, 15 Feb 2024 09:53:16 -0800 Subject: [PATCH 3/4] [repo] Bump Microsoft.Extensions.Telemetry.Abstractions to 8.2.0 (#5362) Co-authored-by: Mikel Blanchard --- Directory.Packages.props | 2 +- docs/logs/complex-objects/Program.cs | 2 +- docs/logs/complex-objects/README.md | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 50dafa0674c..4c50a651adc 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -81,7 +81,7 @@ - + diff --git a/docs/logs/complex-objects/Program.cs b/docs/logs/complex-objects/Program.cs index e0235ecaccf..ca6fa891955 100644 --- 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 index d623be4385b..7bcc666601a 100644 --- 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] From 855e9c42af1e563a8b2f3af652129a3393db3649 Mon Sep 17 00:00:00 2001 From: joegoldman2 <147369450+joegoldman2@users.noreply.github.com> Date: Thu, 15 Feb 2024 21:43:20 +0200 Subject: [PATCH 4/4] Fix typo in reporting exceptions documentation (#5363) --- docs/trace/reporting-exceptions/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/trace/reporting-exceptions/README.md b/docs/trace/reporting-exceptions/README.md index 000cba481b2..72e70683412 100644 --- 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); } }