Merge branch 'main' into u/aguirremoy/host-arch

Author: AguirreMoy

.github/workflows/codeql-analysis-steps.yml

@@ -35,13 +35,13 @@ jobs:
           show-progress: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4
+        uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
         with:
           build-mode: none
           languages: ${{ matrix.language }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4
+        uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
         with:
           category: '/language:${{ matrix.language }}'
 

.github/workflows/ossf-scorecard.yml

@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4
+        uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
         with:
           sarif_file: results.sarif

src/OpenTelemetry.OpAmp.Client/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Drop reference to `System.Collections.Immutable`.
+  ([#3154](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3154))
+
 ## 0.1.0-alpha.1
 
 Released 2025-Sep-23

src/OpenTelemetry.OpAmp.Client/Internal/FrameProcessor.cs

@@ -3,7 +3,6 @@
 
 using System.Buffers;
 using System.Collections.Concurrent;
-using System.Collections.Immutable;
 using OpAmp.Proto.V1;
 using OpenTelemetry.Internal;
 using OpenTelemetry.OpAmp.Client.Internal.Listeners;
@@ -14,7 +13,7 @@ namespace OpenTelemetry.OpAmp.Client.Internal;
 
 internal sealed class FrameProcessor
 {
-    private readonly ConcurrentDictionary<Type, ImmutableList<IOpAmpListener>> listeners = [];
+    private readonly ConcurrentDictionary<Type, IReadOnlyList<IOpAmpListener>> listeners = [];
 
     public void Subscribe<T>(IOpAmpListener<T> listener)
         where T : IOpAmpMessage
@@ -25,7 +24,13 @@ public void Subscribe<T>(IOpAmpListener<T> listener)
         this.listeners.AddOrUpdate(
             typeof(T),
             _ => [listener],
-            (_, list) => list.Add(listener));
+            (_, list) =>
+            {
+                var newList = new List<IOpAmpListener>(list.Count + 1);
+                newList.AddRange(list);
+                newList.Add(listener);
+                return newList;
+            });
     }
 
     public void Unsubscribe<T>(IOpAmpListener<T> listener)
@@ -35,15 +40,15 @@ public void Unsubscribe<T>(IOpAmpListener<T> listener)
 
         this.listeners.AddOrUpdate(
             typeof(T),
-            _ => ImmutableList<IOpAmpListener>.Empty,
+            _ => [],
             (_, list) =>
             {
                 if (list.Count == 1 && list[0] == listener)
                 {
-                    return ImmutableList<IOpAmpListener>.Empty;
+                    return [];
                 }
 
-                return list.Remove(listener);
+                return list.Where(x => x != listener).ToList();
             });
     }
 

src/OpenTelemetry.OpAmp.Client/OpenTelemetry.OpAmp.Client.csproj

@@ -24,12 +24,6 @@
   <!-- .NET Framework supporting packages -->
   <ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkMinimumSupportedVersion)'">
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
-  </ItemGroup>
-
-  <!-- .NET Standard supporting packages -->
-  <ItemGroup Condition="'$(TargetFramework)' == '$(NetStandardMinimumSupportedVersion)'">
-    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>