Skip to content

Change injection method of logger into IHttpClientService #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Change injection method of logger into IHttpClientService #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe68c35
Change injection method of logger into IHttpClientService
jakub-grzesiowski Apr 10, 2025
cc527c2
Cleanup PubNubUnity.csproj, make PNConfiguration Logger setter internal
jakub-grzesiowski Apr 14, 2025
cc40c06
Test Unity compatibility when not using HttpClientHandler
jakub-grzesiowski Apr 14, 2025
7711492
Add more details to SubscribeMabnager2 ReceiveRequest error log
jakub-grzesiowski Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Api/PubnubApi/EndPoint/PubSub/SubscribeManager2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ internal async Task<Tuple<ReceivingResponse<object>, PNStatus>> ReceiveRequest<T
} catch (Exception ex)
{
logger?.Error(
$" Receiving effect exception for \n channel(s)={string.Join(",", channels.OrderBy(x => x).ToArray())} \n cg(s)={string.Join(",", channelGroups.OrderBy(x => x).ToArray())} \n Exception Details={ex}");
$" Receiving effect exception for \n channel(s)={string.Join(",", channels.OrderBy(x => x).ToArray())} \n cg(s)={string.Join(",", channelGroups.OrderBy(x => x).ToArray())} \n Exception Details={ex} \n Stack trace={ex.StackTrace}");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏻

}
return resp;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Api/PubnubApi/PNConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public CryptoModule CryptoModule
}
}

public PubnubLogModule Logger { get; set; }
public PubnubLogModule Logger { get; internal set; }

public string AuthKey
{
Expand Down
3 changes: 2 additions & 1 deletion src/Api/PubnubApi/Pubnub.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,8 @@ public Pubnub(PNConfiguration config, IHttpClientService httpTransportService =
//Defaulting to DotNet PNSDK source if no custom one is specified
Version = (ipnsdkSource == default) ? new DotNetPNSDKSource().GetPNSDK() : ipnsdkSource.GetPNSDK();
IHttpClientService httpClientService =
httpTransportService ?? new HttpClientService(proxy: config.Proxy, configuration: config);
httpTransportService ?? new HttpClientService(proxy: config.Proxy);
httpClientService.SetLogger(logger);
transportMiddleware = middleware ?? new Middleware(httpClientService, config, this, tokenManager);
logger?.Debug(GetConfigurationLogString(config));
}
Expand Down
27 changes: 15 additions & 12 deletions src/Api/PubnubApi/Transport/HttpClientService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,26 @@ namespace PubnubApi
public class HttpClientService : IHttpClientService
{
private readonly HttpClient httpClient;
private readonly PubnubLogModule logger;
private PubnubLogModule logger;

public HttpClientService(IWebProxy proxy, PNConfiguration configuration)
public HttpClientService(IWebProxy proxy)
{
logger = configuration.Logger;

var handler = new HttpClientHandler
{
MaxConnectionsPerServer = 50,
UseProxy = proxy != null,
Proxy = proxy
};

httpClient = new HttpClient(handler)
httpClient = new HttpClient()
{
Timeout = Timeout.InfiniteTimeSpan
};
if (proxy == null) return;
httpClient = new HttpClient(new HttpClientHandler()
{
Proxy = proxy,
UseProxy = true
});
httpClient.Timeout = Timeout.InfiniteTimeSpan;
}

public void SetLogger(PubnubLogModule logger)
{
this.logger = logger;
}

public async Task<TransportResponse> GetRequest(TransportRequest transportRequest)
Expand Down
1 change: 1 addition & 0 deletions src/Api/PubnubApi/TransportContract/IHttpClientService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ public interface IHttpClientService
Task<TransportResponse> PostRequest(TransportRequest transportRequest);
Task<TransportResponse> PatchRequest(TransportRequest transportRequest);
Task<TransportResponse> PutRequest(TransportRequest transportRequest);
void SetLogger(PubnubLogModule logger);
}
}
178 changes: 6 additions & 172 deletions src/Api/PubnubApiUnity/PubnubApiUnity.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<LangVersion>default</LangVersion>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>pubnub.snk</AssemblyOriginatorKeyFile>
Expand Down Expand Up @@ -671,178 +672,6 @@
<ItemGroup>
<None Include="..\PubnubApi\LICENSE.txt" Link="LICENSE.txt" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="PeterO.Cbor" Version="4.5.5" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' ">
<Reference Include="System.Runtime" />
<PackageReference Include="NETStandard.Library" Version="1.6.1">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="PeterO.Cbor" Version="4.5.2" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
<PackageReference Include="System.Net.Requests" Version="4.0.11">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Reflection" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Linq.Queryable" Version="4.0.1">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Text.Encoding" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Net.Primitives" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.ValueTuple" Version="4.4.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
<Reference Include="System.Runtime" />
<PackageReference Include="NETStandard.Library" Version="1.6.1">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="PeterO.Cbor" Version="4.5.2" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
<PackageReference Include="System.Net.Requests" Version="4.0.11">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Reflection" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.ValueTuple" Version="4.4.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<Reference Include="System.Runtime" />
<PackageReference Include="NETStandard.Library" Version="1.6.1">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="PeterO.Cbor" Version="4.5.2" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
<PackageReference Include="System.Net.Requests" Version="4.0.11">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Threading.ThreadPool" Version="4.0.10">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Threading.Thread" Version="4.0.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Linq.Queryable" Version="4.0.1">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Text.Encoding" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Net.Http" Version="4.3.4">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Net.Primitives" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.ValueTuple" Version="4.4.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
<Reference Include="System.Runtime" />
<PackageReference Include="NETStandard.Library" Version="1.6.1">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="PeterO.Cbor" Version="4.5.2" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
<PackageReference Include="System.Net.Requests" Version="4.0.11">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Threading.ThreadPool" Version="4.0.10">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Threading.Thread" Version="4.0.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Linq.Queryable" Version="4.0.1">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Text.Encoding" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Net.Http" Version="4.3.4">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Net.Primitives" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.ValueTuple" Version="4.4.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0">
<PrivateAssets>None</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Folder Include="Builder\" />
Expand Down Expand Up @@ -886,6 +715,11 @@
<Folder Include="Security\Crypto\Cryptors\" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="PeterO.Cbor" Version="4.5.5" />
</ItemGroup>

<!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
<PackageReference Include="System.Net.Requests" Version="4.0.11" />
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
Expand Down
Loading