From 89ea5c66986546af2b5a7570651591b809f27287 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Tue, 28 Jan 2025 08:58:32 +1100 Subject: [PATCH] [repo] Replace some fields with auto properties (#6104) Co-authored-by: Mikel Blanchard --- .../Internal/PrometheusExporter.cs | 14 ++------------ src/OpenTelemetry/Metrics/ExportModesAttribute.cs | 6 ++---- src/OpenTelemetry/ReadOnlyFilteredTagCollection.cs | 5 ++--- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusExporter.cs b/src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusExporter.cs index c5b0e0e64d3..2d9ea4c27d1 100644 --- a/src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusExporter.cs +++ b/src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusExporter.cs @@ -14,8 +14,6 @@ namespace OpenTelemetry.Exporter.Prometheus; [ExportModes(ExportModes.Pull)] internal sealed class PrometheusExporter : BaseExporter, IPullMetricExporter { - private Func? funcCollect; - private ExportFunc? funcExport; private Resource? resource; private bool disposed; @@ -38,17 +36,9 @@ public PrometheusExporter(PrometheusExporterOptions options) /// /// Gets or sets the Collect delegate. /// - public Func? Collect - { - get => this.funcCollect; - set => this.funcCollect = value; - } + public Func? Collect { get; set; } - internal ExportFunc? OnExport - { - get => this.funcExport; - set => this.funcExport = value; - } + internal ExportFunc? OnExport { get; set; } internal Action? OnDispose { get; set; } diff --git a/src/OpenTelemetry/Metrics/ExportModesAttribute.cs b/src/OpenTelemetry/Metrics/ExportModesAttribute.cs index 65b88ae3f34..4235b5dac7f 100644 --- a/src/OpenTelemetry/Metrics/ExportModesAttribute.cs +++ b/src/OpenTelemetry/Metrics/ExportModesAttribute.cs @@ -9,19 +9,17 @@ namespace OpenTelemetry.Metrics; [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)] public sealed class ExportModesAttribute : Attribute { - private readonly ExportModes supportedExportModes; - /// /// Initializes a new instance of the class. /// /// . public ExportModesAttribute(ExportModes supported) { - this.supportedExportModes = supported; + this.Supported = supported; } /// /// Gets the supported . /// - public ExportModes Supported => this.supportedExportModes; + public ExportModes Supported { get; } } diff --git a/src/OpenTelemetry/ReadOnlyFilteredTagCollection.cs b/src/OpenTelemetry/ReadOnlyFilteredTagCollection.cs index 6369018ca0b..0c4227d458e 100644 --- a/src/OpenTelemetry/ReadOnlyFilteredTagCollection.cs +++ b/src/OpenTelemetry/ReadOnlyFilteredTagCollection.cs @@ -22,7 +22,6 @@ public readonly struct ReadOnlyFilteredTagCollection private readonly HashSet? excludedKeys; #endif private readonly KeyValuePair[] tags; - private readonly int count; internal ReadOnlyFilteredTagCollection( #if NET @@ -38,7 +37,7 @@ internal ReadOnlyFilteredTagCollection( this.excludedKeys = excludedKeys; this.tags = tags; - this.count = count; + this.MaximumCount = count; } /// @@ -48,7 +47,7 @@ internal ReadOnlyFilteredTagCollection( /// Note: Enumerating the collection may return fewer results depending on /// the filter. /// - internal int MaximumCount => this.count; + internal int MaximumCount { get; } /// /// Returns an enumerator that iterates through the tags.