Merge branch 'main' into cgroupv2-sup

open-telemetry · Jan 9, 2023 · d043c33 · d043c33
2 parents ba6b6ab + a9bb44d
commit d043c33
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 18 deletions.
diff --git a/build/Common.props b/build/Common.props
@@ -37,11 +37,6 @@
     <StyleCopAnalyzersPkgVer>[1.2.0-beta.435,2.0)</StyleCopAnalyzersPkgVer>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' != 'net6.0' and '$(TargetFramework)' != 'netstandard2.1'">
-    <!-- Nullable analysis really only works on .net standard 2.1 and newer. -->
-    <NoWarn>$(NoWarn);nullable</NoWarn>
-  </PropertyGroup>
-
   <ItemGroup>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)/stylecop.json" />
   </ItemGroup>

diff --git a/src/OpenTelemetry.Exporter.Stackdriver/Implementation/ActivityExtensions.cs b/src/OpenTelemetry.Exporter.Stackdriver/Implementation/ActivityExtensions.cs
@@ -14,6 +14,8 @@
 // limitations under the License.
 // </copyright>
 
+#nullable enable
+
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;

diff --git a/src/OpenTelemetry.Extensions/.publicApi/net462/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Extensions/.publicApi/net462/PublicAPI.Unshipped.txt
@@ -4,7 +4,7 @@ OpenTelemetry.Logs.LogToActivityEventConversionOptions
 OpenTelemetry.Logs.LogToActivityEventConversionOptions.LogToActivityEventConversionOptions() -> void
 OpenTelemetry.Logs.LogToActivityEventConversionOptions.ScopeConverter.get -> System.Action<System.Diagnostics.ActivityTagsCollection!, int, OpenTelemetry.Logs.LogRecordScope>!
 OpenTelemetry.Logs.LogToActivityEventConversionOptions.ScopeConverter.set -> void
-OpenTelemetry.Logs.LogToActivityEventConversionOptions.StateConverter.get -> System.Action<System.Diagnostics.ActivityTagsCollection!, System.Collections.Generic.IReadOnlyList<System.Collections.Generic.KeyValuePair<string!, object!>>!>!
+OpenTelemetry.Logs.LogToActivityEventConversionOptions.StateConverter.get -> System.Action<System.Diagnostics.ActivityTagsCollection!, System.Collections.Generic.IReadOnlyList<System.Collections.Generic.KeyValuePair<string!, object?>>!>!
 OpenTelemetry.Logs.LogToActivityEventConversionOptions.StateConverter.set -> void
 OpenTelemetry.Trace.TracerProviderBuilderExtensions
 static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AttachLogsToActivityEvent(this OpenTelemetry.Logs.OpenTelemetryLoggerOptions! loggerOptions, System.Action<OpenTelemetry.Logs.LogToActivityEventConversionOptions!>? configure = null) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!

diff --git a/src/OpenTelemetry.Extensions/.publicApi/net6.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Extensions/.publicApi/net6.0/PublicAPI.Unshipped.txt
@@ -4,7 +4,7 @@ OpenTelemetry.Logs.LogToActivityEventConversionOptions
 OpenTelemetry.Logs.LogToActivityEventConversionOptions.LogToActivityEventConversionOptions() -> void
 OpenTelemetry.Logs.LogToActivityEventConversionOptions.ScopeConverter.get -> System.Action<System.Diagnostics.ActivityTagsCollection!, int, OpenTelemetry.Logs.LogRecordScope>!
 OpenTelemetry.Logs.LogToActivityEventConversionOptions.ScopeConverter.set -> void
-OpenTelemetry.Logs.LogToActivityEventConversionOptions.StateConverter.get -> System.Action<System.Diagnostics.ActivityTagsCollection!, System.Collections.Generic.IReadOnlyList<System.Collections.Generic.KeyValuePair<string!, object!>>!>!
+OpenTelemetry.Logs.LogToActivityEventConversionOptions.StateConverter.get -> System.Action<System.Diagnostics.ActivityTagsCollection!, System.Collections.Generic.IReadOnlyList<System.Collections.Generic.KeyValuePair<string!, object?>>!>!
 OpenTelemetry.Logs.LogToActivityEventConversionOptions.StateConverter.set -> void
 OpenTelemetry.Trace.TracerProviderBuilderExtensions
 static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AttachLogsToActivityEvent(this OpenTelemetry.Logs.OpenTelemetryLoggerOptions! loggerOptions, System.Action<OpenTelemetry.Logs.LogToActivityEventConversionOptions!>? configure = null) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!

diff --git a/src/OpenTelemetry.Extensions/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Extensions/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt
@@ -4,7 +4,7 @@ OpenTelemetry.Logs.LogToActivityEventConversionOptions
 OpenTelemetry.Logs.LogToActivityEventConversionOptions.LogToActivityEventConversionOptions() -> void
 OpenTelemetry.Logs.LogToActivityEventConversionOptions.ScopeConverter.get -> System.Action<System.Diagnostics.ActivityTagsCollection!, int, OpenTelemetry.Logs.LogRecordScope>!
 OpenTelemetry.Logs.LogToActivityEventConversionOptions.ScopeConverter.set -> void
-OpenTelemetry.Logs.LogToActivityEventConversionOptions.StateConverter.get -> System.Action<System.Diagnostics.ActivityTagsCollection!, System.Collections.Generic.IReadOnlyList<System.Collections.Generic.KeyValuePair<string!, object!>>!>!
+OpenTelemetry.Logs.LogToActivityEventConversionOptions.StateConverter.get -> System.Action<System.Diagnostics.ActivityTagsCollection!, System.Collections.Generic.IReadOnlyList<System.Collections.Generic.KeyValuePair<string!, object?>>!>!
 OpenTelemetry.Logs.LogToActivityEventConversionOptions.StateConverter.set -> void
 OpenTelemetry.Trace.TracerProviderBuilderExtensions
 static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AttachLogsToActivityEvent(this OpenTelemetry.Logs.OpenTelemetryLoggerOptions! loggerOptions, System.Action<OpenTelemetry.Logs.LogToActivityEventConversionOptions!>? configure = null) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!

diff --git a/src/OpenTelemetry.Extensions/Internal/ActivityEventAttachingLogProcessor.cs b/src/OpenTelemetry.Extensions/Internal/ActivityEventAttachingLogProcessor.cs
@@ -73,7 +73,7 @@ public override void OnEnd(LogRecord data)
                 catch (Exception ex)
 #pragma warning restore CA1031 // Do not catch general exception types
                 {
-                    OpenTelemetryExtensionsEventSource.Log.LogProcessorException($"Processing state of type [{data.State.GetType().FullName}]", ex);
+                    OpenTelemetryExtensionsEventSource.Log.LogProcessorException($"Processing state of type [{data.State?.GetType().FullName}]", ex);
                 }
             }
 

diff --git a/src/OpenTelemetry.Extensions/Internal/DefaultLogStateConverter.cs b/src/OpenTelemetry.Extensions/Internal/DefaultLogStateConverter.cs
@@ -21,13 +21,13 @@ namespace OpenTelemetry.Logs;
 
 internal static class DefaultLogStateConverter
 {
-    public static void ConvertState(ActivityTagsCollection tags, IReadOnlyList<KeyValuePair<string, object>> state)
+    public static void ConvertState(ActivityTagsCollection tags, IReadOnlyList<KeyValuePair<string, object?>> state)
     {
         for (int i = 0; i < state.Count; i++)
         {
-            KeyValuePair<string, object> stateItem = state[i];
+            KeyValuePair<string, object?> stateItem = state[i];
 
-            object value = stateItem.Value;
+            object? value = stateItem.Value;
             if (value != null)
             {
                 if (string.IsNullOrEmpty(stateItem.Key))
@@ -46,9 +46,9 @@ public static void ConvertScope(ActivityTagsCollection tags, int depth, LogRecor
     {
         string prefix = $"scope[{depth}]";
 
-        foreach (KeyValuePair<string, object> scopeItem in scope)
+        foreach (KeyValuePair<string, object?> scopeItem in scope)
         {
-            object value = scopeItem.Value;
+            object? value = scopeItem.Value;
             if (value != null)
             {
                 if (string.IsNullOrEmpty(scopeItem.Key))

diff --git a/src/OpenTelemetry.Extensions/Logs/LogToActivityEventConversionOptions.cs b/src/OpenTelemetry.Extensions/Logs/LogToActivityEventConversionOptions.cs
@@ -28,7 +28,7 @@ public class LogToActivityEventConversionOptions
     /// <summary>
     /// Gets or sets the callback action used to convert log state into <see cref="ActivityEvent"/> tags.
     /// </summary>
-    public Action<ActivityTagsCollection, IReadOnlyList<KeyValuePair<string, object>>> StateConverter { get; set; } = DefaultLogStateConverter.ConvertState;
+    public Action<ActivityTagsCollection, IReadOnlyList<KeyValuePair<string, object?>>> StateConverter { get; set; } = DefaultLogStateConverter.ConvertState;
 
     /// <summary>
     /// Gets or sets the callback action used to convert log scopes into <see cref="ActivityEvent"/> tags.

diff --git a/src/OpenTelemetry.Extensions/Trace/AutoFlushActivityProcessor.cs b/src/OpenTelemetry.Extensions/Trace/AutoFlushActivityProcessor.cs
@@ -87,7 +87,7 @@ public override void OnEnd(Activity data)
         var shouldFlush = this.RunPredicate(data);
         if (shouldFlush)
         {
-            this.tracerProvider.ForceFlush(this.timeoutMilliseconds);
+            this.tracerProvider!.ForceFlush(this.timeoutMilliseconds);
         }
     }
 

diff --git a/...Telemetry.Instrumentation.EventCounters/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/...Telemetry.Instrumentation.EventCounters/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt
@@ -4,4 +4,4 @@ OpenTelemetry.Instrumentation.EventCounters.EventCountersInstrumentationOptions.
 OpenTelemetry.Instrumentation.EventCounters.EventCountersInstrumentationOptions.RefreshIntervalSecs.get -> int
 OpenTelemetry.Instrumentation.EventCounters.EventCountersInstrumentationOptions.RefreshIntervalSecs.set -> void
 OpenTelemetry.Metrics.MeterProviderBuilderExtensions
-static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.AddEventCountersInstrumentation(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Action<OpenTelemetry.Instrumentation.EventCounters.EventCountersInstrumentationOptions!>! configure = null) -> OpenTelemetry.Metrics.MeterProviderBuilder!
+static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.AddEventCountersInstrumentation(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Action<OpenTelemetry.Instrumentation.EventCounters.EventCountersInstrumentationOptions!>? configure = null) -> OpenTelemetry.Metrics.MeterProviderBuilder!
diff --git a/src/OpenTelemetry.Instrumentation.EventCounters/MeterProviderBuilderExtensions.cs b/src/OpenTelemetry.Instrumentation.EventCounters/MeterProviderBuilderExtensions.cs
@@ -33,7 +33,7 @@ public static class MeterProviderBuilderExtensions
     /// <returns>The instance of <see cref="MeterProviderBuilder"/> to chain the calls.</returns>
     public static MeterProviderBuilder AddEventCountersInstrumentation(
         this MeterProviderBuilder builder,
-        Action<EventCountersInstrumentationOptions> configure = null)
+        Action<EventCountersInstrumentationOptions>? configure = null)
     {
         Guard.ThrowIfNull(builder);
 

diff --git a/src/OpenTelemetry.Instrumentation.Process/ProcessMetrics.cs b/src/OpenTelemetry.Instrumentation.Process/ProcessMetrics.cs
@@ -14,6 +14,8 @@
 // limitations under the License.
 // </copyright>
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;

diff --git a/test/OpenTelemetry.Exporter.Instana.Tests/Processors/EventsActivityProcessorTests.cs b/test/OpenTelemetry.Exporter.Instana.Tests/Processors/EventsActivityProcessorTests.cs
@@ -14,6 +14,8 @@
 // limitations under the License.
 // </copyright>
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;