diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index db08cd4..5374cb9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ on: jobs: cancel_previous: - + permissions: write-all runs-on: ubuntu-latest steps: - uses: styfle/cancel-workflow-action@0.9.1 @@ -43,4 +43,4 @@ jobs: run: dotnet build - name: Test - run: dotnet test \ No newline at end of file + run: dotnet test diff --git a/Analytics-CSharp.sln b/Analytics-CSharp.sln index 52b6b15..4366e55 100644 --- a/Analytics-CSharp.sln +++ b/Analytics-CSharp.sln @@ -28,17 +28,14 @@ Global {90B4FDEC-99F3-4DBE-969A-956363CDA17F}.Release|Any CPU.ActiveCfg = Release|Any CPU {90B4FDEC-99F3-4DBE-969A-956363CDA17F}.Release|Any CPU.Build.0 = Release|Any CPU {A50D6328-41E0-45F0-9287-A8E7D4C7F71E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A50D6328-41E0-45F0-9287-A8E7D4C7F71E}.Debug|Any CPU.Build.0 = Debug|Any CPU {A50D6328-41E0-45F0-9287-A8E7D4C7F71E}.Release|Any CPU.ActiveCfg = Release|Any CPU {A50D6328-41E0-45F0-9287-A8E7D4C7F71E}.Release|Any CPU.Build.0 = Release|Any CPU {86FFFF37-9FB0-4632-8D44-E09202E158AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86FFFF37-9FB0-4632-8D44-E09202E158AF}.Debug|Any CPU.Build.0 = Debug|Any CPU {86FFFF37-9FB0-4632-8D44-E09202E158AF}.Release|Any CPU.ActiveCfg = Release|Any CPU {86FFFF37-9FB0-4632-8D44-E09202E158AF}.Release|Any CPU.Build.0 = Release|Any CPU {39FCFC71-411C-419E-97BB-7C4281764B10}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {39FCFC71-411C-419E-97BB-7C4281764B10}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {39FCFC71-411C-419E-97BB-7C4281764B10}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator - {39FCFC71-411C-419E-97BB-7C4281764B10}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Analytics-CSharp/Analytics-CSharp.csproj b/Analytics-CSharp/Analytics-CSharp.csproj index 9a35d50..7449fa6 100644 --- a/Analytics-CSharp/Analytics-CSharp.csproj +++ b/Analytics-CSharp/Analytics-CSharp.csproj @@ -21,7 +21,6 @@ - @@ -33,7 +32,6 @@ - diff --git a/Analytics-CSharp/Segment/Analytics/Analytics.cs b/Analytics-CSharp/Segment/Analytics/Analytics.cs index cbcd0e8..001f931 100644 --- a/Analytics-CSharp/Segment/Analytics/Analytics.cs +++ b/Analytics-CSharp/Segment/Analytics/Analytics.cs @@ -8,7 +8,6 @@ using JsonUtility = Segment.Serialization.JsonUtility; using System.Threading.Tasks; -using Microsoft.Extensions.Logging; namespace Segment.Analytics { @@ -25,12 +24,11 @@ public partial class Analytics : ISubscriber internal IDispatcher networkIODispatcher { get;} internal IDispatcher analyticsDispatcher { get;} - internal static Microsoft.Extensions.Logging.ILogger logger = null; + internal static ILogger logger = null; public Analytics(Configuration configuration) { this.configuration = configuration; - Analytics.logger = this.configuration.logger; analyticsScope = new Scope(); if (configuration.userSynchronizeDispatcher) { @@ -200,4 +198,10 @@ private void Startup(HTTPClient httpClient = null) #endregion } + + internal interface ILogger + { + void LogError(Exception exception, string message); + void LogError(string message); + } } diff --git a/Analytics-CSharp/Segment/Analytics/Configuration.cs b/Analytics-CSharp/Segment/Analytics/Configuration.cs index 83ed0f6..69c6eaf 100644 --- a/Analytics-CSharp/Segment/Analytics/Configuration.cs +++ b/Analytics-CSharp/Segment/Analytics/Configuration.cs @@ -1,5 +1,4 @@ -using System; - + namespace Segment.Analytics { public class Configuration @@ -20,8 +19,6 @@ public class Configuration public Settings defaultSettings { get; } - public Microsoft.Extensions.Logging.ILogger logger { get; } - public bool userSynchronizeDispatcher { get; } public Configuration(string writeKey, @@ -32,8 +29,7 @@ public Configuration(string writeKey, bool autoAddSegmentDestination = true, bool userSynchronizeDispatcher = false, string apiHost = null, - string cdnHost = null, - Microsoft.Extensions.Logging.ILogger logger = null) + string cdnHost = null) { this.writeKey = writeKey; this.persistentDataPath = persistentDataPath; @@ -44,7 +40,6 @@ public Configuration(string writeKey, this.userSynchronizeDispatcher = userSynchronizeDispatcher; this.apiHost = apiHost; this.cdnHost = cdnHost; - this.logger = logger; } } diff --git a/Analytics-CSharp/Segment/Analytics/Events.cs b/Analytics-CSharp/Segment/Analytics/Events.cs index b470ed5..6ebde62 100644 --- a/Analytics-CSharp/Segment/Analytics/Events.cs +++ b/Analytics-CSharp/Segment/Analytics/Events.cs @@ -1,5 +1,4 @@ using System.Runtime.Serialization; -using Microsoft.Extensions.Logging; using Segment.Serialization; namespace Segment.Analytics diff --git a/Analytics-CSharp/Segment/Analytics/Plugins.cs b/Analytics-CSharp/Segment/Analytics/Plugins.cs index 48322c5..b1c8973 100644 --- a/Analytics-CSharp/Segment/Analytics/Plugins.cs +++ b/Analytics-CSharp/Segment/Analytics/Plugins.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Microsoft.Extensions.Logging; using Segment.Serialization; namespace Segment.Analytics diff --git a/Analytics-CSharp/Segment/Analytics/State.cs b/Analytics-CSharp/Segment/Analytics/State.cs index 20b3dbd..83db396 100644 --- a/Analytics-CSharp/Segment/Analytics/State.cs +++ b/Analytics-CSharp/Segment/Analytics/State.cs @@ -1,5 +1,4 @@ using System; -using Microsoft.Extensions.Logging; using Segment.Sovran; using Segment.Serialization; using Segment.Analytics.Utilities; diff --git a/Analytics-CSharp/Segment/Analytics/Utilities/EventPipeline.cs b/Analytics-CSharp/Segment/Analytics/Utilities/EventPipeline.cs index bfd8c53..0d0271e 100644 --- a/Analytics-CSharp/Segment/Analytics/Utilities/EventPipeline.cs +++ b/Analytics-CSharp/Segment/Analytics/Utilities/EventPipeline.cs @@ -2,7 +2,6 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using Microsoft.Extensions.Logging; using Segment.Concurrent; namespace Segment.Analytics.Utilities diff --git a/Analytics-CSharp/Segment/Analytics/Utilities/EventsFileManager.cs b/Analytics-CSharp/Segment/Analytics/Utilities/EventsFileManager.cs index 879e97c..8b52464 100644 --- a/Analytics-CSharp/Segment/Analytics/Utilities/EventsFileManager.cs +++ b/Analytics-CSharp/Segment/Analytics/Utilities/EventsFileManager.cs @@ -5,7 +5,6 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.Extensions.Logging; namespace Segment.Analytics.Utilities { diff --git a/Analytics-CSharp/Segment/Analytics/Utilities/HTTPClient.cs b/Analytics-CSharp/Segment/Analytics/Utilities/HTTPClient.cs index 53b2879..514d0dd 100644 --- a/Analytics-CSharp/Segment/Analytics/Utilities/HTTPClient.cs +++ b/Analytics-CSharp/Segment/Analytics/Utilities/HTTPClient.cs @@ -4,7 +4,6 @@ using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; -using Microsoft.Extensions.Logging; using Segment.Serialization; namespace Segment.Analytics.Utilities @@ -47,7 +46,7 @@ public string SegmentURL(string host, string path) if (!response.IsSuccessStatusCode) { - Analytics.logger?.LogError("Error {Status} getting from settings url", response.StatusCode); + Analytics.logger?.LogError("Error " + response.StatusCode + " getting from settings url"); } else { @@ -66,7 +65,7 @@ public virtual async Task Upload(string file) if (!response.IsSuccessStatusCode) { - Analytics.logger?.LogError("Error {Status} uploading to url", response.StatusCode); + Analytics.logger?.LogError("Error " + response.StatusCode + " uploading to url"); var responseCode = (int)response.StatusCode; response.Dispose(); diff --git a/Analytics-CSharp/Segment/Analytics/Utilities/UserPrefs.cs b/Analytics-CSharp/Segment/Analytics/Utilities/UserPrefs.cs index eaa4c7c..36256af 100644 --- a/Analytics-CSharp/Segment/Analytics/Utilities/UserPrefs.cs +++ b/Analytics-CSharp/Segment/Analytics/Utilities/UserPrefs.cs @@ -4,7 +4,6 @@ using System.Runtime.Serialization; using System.Threading; using System.Threading.Tasks; -using Microsoft.Extensions.Logging; using Segment.Concurrent; namespace Segment.Analytics.Utilities