Merge pull request #187 from pharos/actvity-source-leak

fixes #184
microsoft · Jan 9, 2024 · 39b329d · 39b329d
2 parents 40262ef + 366b9b8
commit 39b329d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.3.4] - 2023-12-29
+
+### Added
+
+- Fixes `ActicitySource` memory leak when the HttpClientRequestAdapter does not construct the HttpClient internally.
+
 ## [1.3.3] - 2023-11-28
 
 ### Added

diff --git a/src/HttpClientRequestAdapter.cs b/src/HttpClientRequestAdapter.cs
@@ -52,7 +52,7 @@ public HttpClientRequestAdapter(IAuthenticationProvider authenticationProvider,
             pNodeFactory = parseNodeFactory ?? ParseNodeFactoryRegistry.DefaultInstance;
             sWriterFactory = serializationWriterFactory ?? SerializationWriterFactoryRegistry.DefaultInstance;
             obsOptions = observabilityOptions ?? new ObservabilityOptions();
-            activitySource = new(obsOptions.TracerInstrumentationName);
+            activitySource = ActivitySourceRegistry.DefaultInstance.GetOrCreateActivitySource(obsOptions.TracerInstrumentationName);
         }
         /// <summary>Factory to use to get a serializer for payload serialization</summary>
         public ISerializationWriterFactory SerializationWriterFactory
@@ -603,7 +603,6 @@ protected virtual void Dispose(bool disposing)
             // Cleanup
             if(createdClient)
             {
-                activitySource?.Dispose();
                 client?.Dispose();
             }
         }

diff --git a/src/Microsoft.Kiota.Http.HttpClientLibrary.csproj b/src/Microsoft.Kiota.Http.HttpClientLibrary.csproj
@@ -14,7 +14,7 @@
     <PackageProjectUrl>https://aka.ms/kiota/docs</PackageProjectUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <Deterministic>true</Deterministic>
-    <VersionPrefix>1.3.3</VersionPrefix>
+    <VersionPrefix>1.3.4</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <!-- Enable this line once we go live to prevent breaking changes -->