OpenTelemetry.Exporter.InfluxDB nullable support (#1314)

open-telemetry · Aug 25, 2023 · 94f1542 · 94f1542
1 parent fc4dc0d
commit 94f1542
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 19 deletions.
diff --git a/src/OpenTelemetry.Exporter.InfluxDB/.publicApi/net6.0/PublicAPI.Shipped.txt b/src/OpenTelemetry.Exporter.InfluxDB/.publicApi/net6.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/OpenTelemetry.Exporter.InfluxDB/.publicApi/net6.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Exporter.InfluxDB/.publicApi/net6.0/PublicAPI.Unshipped.txt
@@ -1,20 +1,21 @@
+#nullable enable
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions
-OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Bucket.get -> string
+OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Bucket.get -> string?
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Bucket.set -> void
-OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Endpoint.get -> System.Uri
+OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Endpoint.get -> System.Uri?
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Endpoint.set -> void
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.FlushInterval.get -> int
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.FlushInterval.set -> void
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.InfluxDBMetricsExporterOptions() -> void
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.MetricsSchema.get -> OpenTelemetry.Exporter.InfluxDB.MetricsSchema
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.MetricsSchema.set -> void
-OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Org.get -> string
+OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Org.get -> string?
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Org.set -> void
-OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Token.get -> string
+OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Token.get -> string?
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Token.set -> void
 OpenTelemetry.Exporter.InfluxDB.MetricsSchema
 OpenTelemetry.Exporter.InfluxDB.MetricsSchema.None = 0 -> OpenTelemetry.Exporter.InfluxDB.MetricsSchema
 OpenTelemetry.Exporter.InfluxDB.MetricsSchema.TelegrafPrometheusV1 = 1 -> OpenTelemetry.Exporter.InfluxDB.MetricsSchema
 OpenTelemetry.Exporter.InfluxDB.MetricsSchema.TelegrafPrometheusV2 = 2 -> OpenTelemetry.Exporter.InfluxDB.MetricsSchema
 OpenTelemetry.Metrics.InfluxDBExporterExtensions
-static OpenTelemetry.Metrics.InfluxDBExporterExtensions.AddInfluxDBMetricsExporter(this OpenTelemetry.Metrics.MeterProviderBuilder builder, System.Action<OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions> configure) -> OpenTelemetry.Metrics.MeterProviderBuilder
+static OpenTelemetry.Metrics.InfluxDBExporterExtensions.AddInfluxDBMetricsExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Action<OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions!>! configure) -> OpenTelemetry.Metrics.MeterProviderBuilder!
diff --git a/src/OpenTelemetry.Exporter.InfluxDB/.publicApi/netstandard2.0/PublicAPI.Shipped.txt b/src/OpenTelemetry.Exporter.InfluxDB/.publicApi/netstandard2.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/OpenTelemetry.Exporter.InfluxDB/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Exporter.InfluxDB/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,20 +1,21 @@
+#nullable enable
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions
-OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Bucket.get -> string
+OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Bucket.get -> string?
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Bucket.set -> void
-OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Endpoint.get -> System.Uri
+OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Endpoint.get -> System.Uri?
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Endpoint.set -> void
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.FlushInterval.get -> int
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.FlushInterval.set -> void
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.InfluxDBMetricsExporterOptions() -> void
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.MetricsSchema.get -> OpenTelemetry.Exporter.InfluxDB.MetricsSchema
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.MetricsSchema.set -> void
-OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Org.get -> string
+OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Org.get -> string?
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Org.set -> void
-OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Token.get -> string
+OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Token.get -> string?
 OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions.Token.set -> void
 OpenTelemetry.Exporter.InfluxDB.MetricsSchema
 OpenTelemetry.Exporter.InfluxDB.MetricsSchema.None = 0 -> OpenTelemetry.Exporter.InfluxDB.MetricsSchema
 OpenTelemetry.Exporter.InfluxDB.MetricsSchema.TelegrafPrometheusV1 = 1 -> OpenTelemetry.Exporter.InfluxDB.MetricsSchema
 OpenTelemetry.Exporter.InfluxDB.MetricsSchema.TelegrafPrometheusV2 = 2 -> OpenTelemetry.Exporter.InfluxDB.MetricsSchema
 OpenTelemetry.Metrics.InfluxDBExporterExtensions
-static OpenTelemetry.Metrics.InfluxDBExporterExtensions.AddInfluxDBMetricsExporter(this OpenTelemetry.Metrics.MeterProviderBuilder builder, System.Action<OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions> configure) -> OpenTelemetry.Metrics.MeterProviderBuilder
+static OpenTelemetry.Metrics.InfluxDBExporterExtensions.AddInfluxDBMetricsExporter(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Action<OpenTelemetry.Exporter.InfluxDB.InfluxDBMetricsExporterOptions!>! configure) -> OpenTelemetry.Metrics.MeterProviderBuilder!
diff --git a/src/OpenTelemetry.Exporter.InfluxDB/IMetricsWriter.cs b/src/OpenTelemetry.Exporter.InfluxDB/IMetricsWriter.cs
@@ -22,5 +22,5 @@ namespace OpenTelemetry.Exporter.InfluxDB;
 
 internal interface IMetricsWriter
 {
-    void Write(Metric metric, Resource resource, WriteApi writeApi);
+    void Write(Metric metric, Resource? resource, WriteApi writeApi);
 }
diff --git a/src/OpenTelemetry.Exporter.InfluxDB/InfluxDBExporterExtensions.cs b/src/OpenTelemetry.Exporter.InfluxDB/InfluxDBExporterExtensions.cs
@@ -39,7 +39,7 @@ public static MeterProviderBuilder AddInfluxDBMetricsExporter(this MeterProvider
             var options = new InfluxDBMetricsExporterOptions();
             configure.Invoke(options);
 
-            var influxDbClientOptions = new InfluxDBClientOptions(options.Endpoint.ToString());
+            var influxDbClientOptions = new InfluxDBClientOptions(options.Endpoint?.ToString());
             if (!string.IsNullOrWhiteSpace(options.Bucket))
             {
                 influxDbClientOptions.Bucket = options.Bucket;

diff --git a/src/OpenTelemetry.Exporter.InfluxDB/InfluxDBMetricsExporterOptions.cs b/src/OpenTelemetry.Exporter.InfluxDB/InfluxDBMetricsExporterOptions.cs
@@ -26,22 +26,22 @@ public class InfluxDBMetricsExporterOptions
     /// <summary>
     /// Gets or sets HTTP/S destination for line protocol.
     /// </summary>
-    public Uri Endpoint { get; set; }
+    public Uri? Endpoint { get; set; }
 
     /// <summary>
     /// Gets or sets name of InfluxDB organization that owns the destination bucket.
     /// </summary>
-    public string Org { get; set; }
+    public string? Org { get; set; }
 
     /// <summary>
     /// Gets or sets the name of InfluxDB bucket to which signals will be written.
     /// </summary>
-    public string Bucket { get; set; }
+    public string? Bucket { get; set; }
 
     /// <summary>
     /// Gets or sets the authentication token for InfluxDB.
     /// </summary>
-    public string Token { get; set; }
+    public string? Token { get; set; }
 
     /// <summary>
     /// Gets or sets the chosen metrics schema to write.

diff --git a/src/OpenTelemetry.Exporter.InfluxDB/OpenTelemetry.Exporter.InfluxDB.csproj b/src/OpenTelemetry.Exporter.InfluxDB/OpenTelemetry.Exporter.InfluxDB.csproj
@@ -9,6 +9,7 @@
     <MinVerTagPrefix>Exporter.InfluxDB-</MinVerTagPrefix>
     <EnableAnalysis>true</EnableAnalysis>
     <IncludeSharedExceptionExtensionsSource>true</IncludeSharedExceptionExtensionsSource>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/OpenTelemetry.Exporter.InfluxDB/PointDataExtensions.cs b/src/OpenTelemetry.Exporter.InfluxDB/PointDataExtensions.cs
@@ -31,7 +31,7 @@ public static PointData Tags(this PointData pointData, ReadOnlyTagCollection tag
         return pointData;
     }
 
-    public static PointData Tags(this PointData pointData, IEnumerable<KeyValuePair<string, object>> tags)
+    public static PointData Tags(this PointData pointData, IEnumerable<KeyValuePair<string, object>>? tags)
     {
         if (tags == null)
         {

diff --git a/src/OpenTelemetry.Exporter.InfluxDB/TelegrafPrometheusWriterV1.cs b/src/OpenTelemetry.Exporter.InfluxDB/TelegrafPrometheusWriterV1.cs
@@ -25,7 +25,7 @@ namespace OpenTelemetry.Exporter.InfluxDB;
 
 internal sealed class TelegrafPrometheusWriterV1 : IMetricsWriter
 {
-    public void Write(Metric metric, Resource resource, WriteApi writeApi)
+    public void Write(Metric metric, Resource? resource, WriteApi writeApi)
     {
         var measurement = metric.Name;
 

diff --git a/src/OpenTelemetry.Exporter.InfluxDB/TelegrafPrometheusWriterV2.cs b/src/OpenTelemetry.Exporter.InfluxDB/TelegrafPrometheusWriterV2.cs
@@ -25,7 +25,7 @@ namespace OpenTelemetry.Exporter.InfluxDB;
 
 internal sealed class TelegrafPrometheusWriterV2 : IMetricsWriter
 {
-    public void Write(Metric metric, Resource resource, WriteApi writeApi)
+    public void Write(Metric metric, Resource? resource, WriteApi writeApi)
     {
         var measurement = "prometheus";
         var metricName = metric.Name;