[Instrumentation.Process, Resources.Process] Properly disposes of System.Diagnostics.Process class instances insta… (open-telemetry#2101)

Author: StasPerekrestov

src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Properly dispose of System.Diagnostics.Process class instances
+  ([#2101](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2101))
+
 ## 0.5.0-beta.6
 
 Released 2024-Jun-18

src/OpenTelemetry.Instrumentation.Process/ProcessMetrics.cs

@@ -24,7 +24,8 @@ static ProcessMetrics()
             "process.memory.usage",
             () =>
             {
-                return Diagnostics.Process.GetCurrentProcess().WorkingSet64;
+                using var process = Diagnostics.Process.GetCurrentProcess();
+                return process.WorkingSet64;
             },
             unit: "By",
             description: "The amount of physical memory in use.");
@@ -33,7 +34,8 @@ static ProcessMetrics()
             "process.memory.virtual",
             () =>
             {
-                return Diagnostics.Process.GetCurrentProcess().VirtualMemorySize64;
+                using var process = Diagnostics.Process.GetCurrentProcess();
+                return process.VirtualMemorySize64;
             },
             unit: "By",
             description: "The amount of committed virtual memory.");
@@ -42,7 +44,7 @@ static ProcessMetrics()
             "process.cpu.time",
             () =>
             {
-                var process = Diagnostics.Process.GetCurrentProcess();
+                using var process = Diagnostics.Process.GetCurrentProcess();
                 return new[]
                 {
                     new Measurement<double>(process.UserProcessorTime.TotalSeconds, new KeyValuePair<string, object?>("process.cpu.state", "user")),
@@ -65,7 +67,8 @@ static ProcessMetrics()
             "process.thread.count",
             () =>
             {
-                return Diagnostics.Process.GetCurrentProcess().Threads.Count;
+                using var process = Diagnostics.Process.GetCurrentProcess();
+                return process.Threads.Count;
             },
             unit: "{thread}",
             description: "Process threads count.");

src/OpenTelemetry.Resources.Process/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Properly dispose of System.Diagnostics.Process class instances
+  ([#2101](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2101))
+
 ## 0.1.0-beta.2
 
 Released 2024-Jun-18

src/OpenTelemetry.Resources.Process/ProcessDetector.cs

@@ -19,9 +19,15 @@ public Resource Detect()
             new(ProcessSemanticConventions.AttributeProcessOwner, Environment.UserName),
 #if NET
             new(ProcessSemanticConventions.AttributeProcessPid, Environment.ProcessId),
+        });
 #else
-            new(ProcessSemanticConventions.AttributeProcessPid, System.Diagnostics.Process.GetCurrentProcess().Id),
-#endif
+            new(ProcessSemanticConventions.AttributeProcessPid, GetProcessPid()),
         });
+        static int GetProcessPid()
+        {
+            using var process = System.Diagnostics.Process.GetCurrentProcess();
+            return process.Id;
+        }
+#endif
     }
 }