Adds OperatingSystem resource detector (#113)

Author: matt-hensley

CHANGELOG.md

@@ -17,6 +17,11 @@
 * Remove workaround for stable `service.instance.id` across signals
   ([#108](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/108))
 
+### New features
+
+* Adds Operating System resource detector.
+  ([#113](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/113))
+
 ## 0.9.0-beta.1
 
 ### BREAKING CHANGES

src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj

@@ -51,6 +51,7 @@
   <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
     <PackageReference Include="OpenTelemetry.Resources.AWS" Version="1.5.0-beta.1" />
     <PackageReference Include="OpenTelemetry.Resources.Host" Version="0.1.0-beta.2" />
+    <PackageReference Include="OpenTelemetry.Resources.OperatingSystem" Version="0.1.0-alpha.2" />
     <PackageReference Include="OpenTelemetry.Resources.Process" Version="0.1.0-beta.2" />
     <PackageReference Include="OpenTelemetry.Resources.ProcessRuntime" Version="0.1.0-beta.2" />
   </ItemGroup>

src/Grafana.OpenTelemetry.Base/ResourceDetectors/OperatingSystemResourceInitializer.cs

@@ -0,0 +1,23 @@
+//
+// Copyright Grafana Labs
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#if !NETSTANDARD
+
+using OpenTelemetry.Resources;
+
+namespace Grafana.OpenTelemetry
+{
+    internal class OperatingSystemResourceInitializer : ResourceDetectorInitializer
+    {
+        public override ResourceDetector Id { get; } = ResourceDetector.Process;
+
+        protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder)
+        {
+            return builder.AddOperatingSystemDetector();
+        }
+    }
+}
+
+#endif

src/Grafana.OpenTelemetry.Base/ResourceDetectors/ResourceDetector.cs

@@ -50,6 +50,11 @@ public enum ResourceDetector
         /// </summary>
         Host,
 
+        /// <summary>
+        /// Host Resource Detector (OpenTelemetry.ResourceDetectors.Host)
+        /// </summary>
+        OperatingSystem,
+
         /// <summary>
         /// Process Resource Detector (OpenTelemetry.ResourceDetectors.Process)
         /// </summary>

src/Grafana.OpenTelemetry.Base/ResourceDetectors/ResourceDetectorInitializer.cs

@@ -30,6 +30,7 @@ internal abstract class ResourceDetectorInitializer
 #endif
 #if !NETSTANDARD
             new HostResourceInitializer(),
+            new OperatingSystemResourceInitializer(),
             new ProcessResourceInitializer(),
             new ProcessRuntimeResourceInitializer()
 #endif

tests/Grafana.OpenTelemetry.Tests/ResourceDetectorTest.cs

@@ -29,6 +29,7 @@ public void EnumMatchesInitializers()
 #endif
 #if NETSTANDARD
             expected.Remove(ResourceDetector.Host);
+            expected.Remove(ResourceDetector.OperatingSystem);
             expected.Remove(ResourceDetector.Process);
             expected.Remove(ResourceDetector.ProcessRuntime);
 #endif