[geneva] Update code to follow more of the repo style conventions (open-telemetry#2052)

Co-authored-by: Cijo Thomas <[email protected]>

Author: CodeBlanch

src/OpenTelemetry.Exporter.Geneva/GenevaExporterOptions.cs

@@ -11,12 +11,12 @@ namespace OpenTelemetry.Exporter.Geneva;
 /// </summary>
 public class GenevaExporterOptions
 {
-    private IReadOnlyDictionary<string, object> _fields = new Dictionary<string, object>(1)
+    private IReadOnlyDictionary<string, object> fields = new Dictionary<string, object>(1)
     {
         [Schema.V40.PartA.Ver] = "4.0",
     };
 
-    private IReadOnlyDictionary<string, string> _tableNameMappings;
+    private IReadOnlyDictionary<string, string> tableNameMappings;
 
     /// <summary>
     /// Gets or sets the connection string.
@@ -48,7 +48,7 @@ public class GenevaExporterOptions
     /// </summary>
     public IReadOnlyDictionary<string, string> TableNameMappings
     {
-        get => this._tableNameMappings;
+        get => this.tableNameMappings;
         set
         {
             Guard.ThrowIfNull(value);
@@ -89,7 +89,7 @@ public IReadOnlyDictionary<string, string> TableNameMappings
                 copy[entry.Key] = entry.Value;
             }
 
-            this._tableNameMappings = copy;
+            this.tableNameMappings = copy;
         }
     }
 
@@ -98,7 +98,7 @@ public IReadOnlyDictionary<string, string> TableNameMappings
     /// </summary>
     public IReadOnlyDictionary<string, object> PrepopulatedFields
     {
-        get => this._fields;
+        get => this.fields;
         set
         {
             Guard.ThrowIfNull(value);
@@ -153,7 +153,7 @@ public IReadOnlyDictionary<string, object> PrepopulatedFields
                 copy[entry.Key] = val; // shallow copy
             }
 
-            this._fields = copy;
+            this.fields = copy;
         }
     }
 }

src/OpenTelemetry.Exporter.Geneva/GenevaLogExporter.cs

@@ -15,14 +15,11 @@ public class GenevaLogExporter : GenevaBaseExporter<LogRecord>
 {
     internal bool IsUsingUnixDomainSocket;
 
-    private bool isDisposed;
-
-    private delegate ExportResult ExportLogRecordFunc(in Batch<LogRecord> batch);
-
     private readonly ExportLogRecordFunc exportLogRecord;
-
     private readonly IDisposable exporter;
 
+    private bool isDisposed;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="GenevaLogExporter"/> class.
     /// </summary>
@@ -83,6 +80,8 @@ public GenevaLogExporter(GenevaExporterOptions options)
         }
     }
 
+    private delegate ExportResult ExportLogRecordFunc(in Batch<LogRecord> batch);
+
     /// <inheritdoc/>
     public override ExportResult Export(in Batch<LogRecord> batch)
     {

src/OpenTelemetry.Exporter.Geneva/GenevaTraceExporter.cs

@@ -15,14 +15,11 @@ public class GenevaTraceExporter : GenevaBaseExporter<Activity>
 {
     internal readonly bool IsUsingUnixDomainSocket;
 
-    private bool isDisposed;
-
-    private delegate ExportResult ExportActivityFunc(in Batch<Activity> batch);
-
     private readonly ExportActivityFunc exportActivity;
-
     private readonly IDisposable exporter;
 
+    private bool isDisposed;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="GenevaTraceExporter"/> class.
     /// </summary>
@@ -83,6 +80,8 @@ public GenevaTraceExporter(GenevaExporterOptions options)
         }
     }
 
+    private delegate ExportResult ExportActivityFunc(in Batch<Activity> batch);
+
     /// <inheritdoc/>
     public override ExportResult Export(in Batch<Activity> batch)
     {

src/OpenTelemetry.Exporter.Geneva/Internal/ConnectionStringBuilder.cs

@@ -18,7 +18,7 @@ internal enum TransportProtocol
 
 internal sealed class ConnectionStringBuilder
 {
-    private readonly Dictionary<string, string> _parts = new Dictionary<string, string>(StringComparer.Ordinal);
+    private readonly Dictionary<string, string> parts = new Dictionary<string, string>(StringComparer.Ordinal);
 
     public ConnectionStringBuilder(string connectionString)
     {
@@ -52,10 +52,10 @@ public ConnectionStringBuilder(string connectionString)
                 throw new ArgumentException("Connection string cannot contain empty keys or values.");
             }
 
-            this._parts[key] = value;
+            this.parts[key] = value;
         }
 
-        if (this._parts.Count == 0)
+        if (this.parts.Count == 0)
         {
             throw new ArgumentNullException(nameof(connectionString), $"{nameof(connectionString)} is invalid.");
         }
@@ -64,25 +64,25 @@ public ConnectionStringBuilder(string connectionString)
     public string EtwSession
     {
         get => this.ThrowIfNotExists<string>(nameof(this.EtwSession));
-        set => this._parts[nameof(this.EtwSession)] = value;
+        set => this.parts[nameof(this.EtwSession)] = value;
     }
 
     public string PrivatePreviewEnableTraceLoggingDynamic
     {
         get => this.ThrowIfNotExists<string>(nameof(this.PrivatePreviewEnableTraceLoggingDynamic));
-        set => this._parts[nameof(this.PrivatePreviewEnableTraceLoggingDynamic)] = value;
+        set => this.parts[nameof(this.PrivatePreviewEnableTraceLoggingDynamic)] = value;
     }
 
     public string PrivatePreviewEnableOtlpProtobufEncoding
     {
-        get => this._parts.TryGetValue(nameof(this.PrivatePreviewEnableOtlpProtobufEncoding), out var value) ? value : null;
-        set => this._parts[nameof(this.PrivatePreviewEnableOtlpProtobufEncoding)] = value;
+        get => this.parts.TryGetValue(nameof(this.PrivatePreviewEnableOtlpProtobufEncoding), out var value) ? value : null;
+        set => this.parts[nameof(this.PrivatePreviewEnableOtlpProtobufEncoding)] = value;
     }
 
     public string Endpoint
     {
         get => this.ThrowIfNotExists<string>(nameof(this.Endpoint));
-        set => this._parts[nameof(this.Endpoint)] = value;
+        set => this.parts[nameof(this.Endpoint)] = value;
     }
 
     public TransportProtocol Protocol
@@ -92,9 +92,9 @@ public TransportProtocol Protocol
             try
             {
                 // Checking Etw first, since it's preferred for Windows and enables fail fast on Linux
-                if (this._parts.ContainsKey(nameof(this.EtwSession)))
+                if (this.parts.ContainsKey(nameof(this.EtwSession)))
                 {
-                    _ = this._parts.TryGetValue(nameof(this.PrivatePreviewEnableTraceLoggingDynamic), out var privatePreviewEnableTraceLoggingDynamic);
+                    _ = this.parts.TryGetValue(nameof(this.PrivatePreviewEnableTraceLoggingDynamic), out var privatePreviewEnableTraceLoggingDynamic);
                     if (privatePreviewEnableTraceLoggingDynamic != null && privatePreviewEnableTraceLoggingDynamic.Equals(bool.TrueString, StringComparison.OrdinalIgnoreCase))
                     {
                         return TransportProtocol.EtwTld;
@@ -103,7 +103,7 @@ public TransportProtocol Protocol
                     return TransportProtocol.Etw;
                 }
 
-                if (!this._parts.ContainsKey(nameof(this.Endpoint)))
+                if (!this.parts.ContainsKey(nameof(this.Endpoint)))
                 {
                     return TransportProtocol.Unspecified;
                 }
@@ -123,41 +123,11 @@ public TransportProtocol Protocol
         }
     }
 
-    /// <summary>
-    /// Replace first charater of string if it matches with <paramref name="oldChar"/> with <paramref name="newChar"/>.
-    /// </summary>
-    /// <param name="str">String to be updated.</param>
-    /// <param name="oldChar">Old character to be replaced.</param>
-    /// <param name="newChar">New character to be replaced with.</param>
-    /// <returns>Updated string.</returns>
-    internal static string ReplaceFirstChar(string str, char oldChar, char newChar)
-    {
-        if (str.Length > 0 && str[0] == oldChar)
-        {
-            return $"{newChar}{str.Substring(1)}";
-        }
-
-        return str;
-    }
-
-    public string ParseUnixDomainSocketPath()
-    {
-        try
-        {
-            var endpoint = new Uri(this.Endpoint);
-            return ReplaceFirstChar(endpoint.AbsolutePath, '@', '\0');
-        }
-        catch (UriFormatException ex)
-        {
-            throw new ArgumentException($"{nameof(this.Endpoint)} value is malformed.", ex);
-        }
-    }
-
     public int TimeoutMilliseconds
     {
         get
         {
-            if (!this._parts.TryGetValue(nameof(this.TimeoutMilliseconds), out string value))
+            if (!this.parts.TryGetValue(nameof(this.TimeoutMilliseconds), out string value))
             {
                 return UnixDomainSocketDataTransport.DefaultTimeoutMilliseconds;
             }
@@ -186,7 +156,7 @@ public int TimeoutMilliseconds
                     ex);
             }
         }
-        set => this._parts[nameof(this.TimeoutMilliseconds)] = value.ToString(CultureInfo.InvariantCulture);
+        set => this.parts[nameof(this.TimeoutMilliseconds)] = value.ToString(CultureInfo.InvariantCulture);
     }
 
     public string Host
@@ -229,32 +199,62 @@ public int Port
     public string Account
     {
         get => this.ThrowIfNotExists<string>(nameof(this.Account));
-        set => this._parts[nameof(this.Account)] = value;
+        set => this.parts[nameof(this.Account)] = value;
     }
 
     public string Namespace
     {
         get => this.ThrowIfNotExists<string>(nameof(this.Namespace));
-        set => this._parts[nameof(this.Namespace)] = value;
+        set => this.parts[nameof(this.Namespace)] = value;
     }
 
     public bool DisableMetricNameValidation
     {
         get
         {
-            if (!this._parts.TryGetValue(nameof(this.DisableMetricNameValidation), out var value))
+            if (!this.parts.TryGetValue(nameof(this.DisableMetricNameValidation), out var value))
             {
                 return false;
             }
 
             return string.Equals(bool.TrueString, value, StringComparison.OrdinalIgnoreCase);
         }
-        set => this._parts[nameof(this.DisableMetricNameValidation)] = value ? bool.TrueString : bool.FalseString;
+        set => this.parts[nameof(this.DisableMetricNameValidation)] = value ? bool.TrueString : bool.FalseString;
+    }
+
+    public string ParseUnixDomainSocketPath()
+    {
+        try
+        {
+            var endpoint = new Uri(this.Endpoint);
+            return ReplaceFirstChar(endpoint.AbsolutePath, '@', '\0');
+        }
+        catch (UriFormatException ex)
+        {
+            throw new ArgumentException($"{nameof(this.Endpoint)} value is malformed.", ex);
+        }
+    }
+
+    /// <summary>
+    /// Replace first charater of string if it matches with <paramref name="oldChar"/> with <paramref name="newChar"/>.
+    /// </summary>
+    /// <param name="str">String to be updated.</param>
+    /// <param name="oldChar">Old character to be replaced.</param>
+    /// <param name="newChar">New character to be replaced with.</param>
+    /// <returns>Updated string.</returns>
+    internal static string ReplaceFirstChar(string str, char oldChar, char newChar)
+    {
+        if (str.Length > 0 && str[0] == oldChar)
+        {
+            return $"{newChar}{str.Substring(1)}";
+        }
+
+        return str;
     }
 
     private T ThrowIfNotExists<T>(string name)
     {
-        if (!this._parts.TryGetValue(name, out var value))
+        if (!this.parts.TryGetValue(name, out var value))
         {
             throw new ArgumentException($"'{name}' value is missing in connection string.");
         }

src/OpenTelemetry.Exporter.Geneva/Internal/ReentrantExportProcessor.cs

@@ -14,6 +14,8 @@ namespace OpenTelemetry.Exporter.Geneva;
 internal class ReentrantExportProcessor<T> : BaseExportProcessor<T>
     where T : class
 {
+    private static readonly Func<T, Batch<T>> CreateBatch;
+
     static ReentrantExportProcessor()
     {
         var flags = BindingFlags.Instance | BindingFlags.NonPublic;
@@ -32,6 +34,4 @@ protected override void OnExport(T data)
     {
         this.exporter.Export(CreateBatch(data));
     }
-
-    private static readonly Func<T, Batch<T>> CreateBatch;
 }