diff --git a/CHANGELOG.md b/CHANGELOG.md index c235e2b..cdc07d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +# 1.1.2 + +- Resolved the iOS bindings namespace issue which was causing conflicts for customers due to the namespace clash with the newrelic package. # 1.1.1 diff --git a/NewRelic.MAUI.Plugin/NewRelic.MAUI.Plugin.csproj b/NewRelic.MAUI.Plugin/NewRelic.MAUI.Plugin.csproj index 37a0948..ee5cfa2 100644 --- a/NewRelic.MAUI.Plugin/NewRelic.MAUI.Plugin.csproj +++ b/NewRelic.MAUI.Plugin/NewRelic.MAUI.Plugin.csproj @@ -8,7 +8,7 @@ true enable NewRelic.MAUI.Plugin - 1.1.1 + 1.1.2 New Relic Plugin for .NET MAUI mobile apps With the New Relic .NET MAUI mobile plugin, your team can monitor the performance of .NET MAUI apps and identify code errors. The plugin collects crash data, network traffic, and other information for your apps using native components. New Relic @@ -35,6 +35,6 @@ - + \ No newline at end of file diff --git a/NewRelic.MAUI.Plugin/Platforms/Android/NewRelicMethodsImplementation.cs b/NewRelic.MAUI.Plugin/Platforms/Android/NewRelicMethodsImplementation.cs index 7969c93..d1956df 100644 --- a/NewRelic.MAUI.Plugin/Platforms/Android/NewRelicMethodsImplementation.cs +++ b/NewRelic.MAUI.Plugin/Platforms/Android/NewRelicMethodsImplementation.cs @@ -126,7 +126,7 @@ public void Start(string applicationToken, AgentStartConfiguration agentConfig = var newRelic = NRAndroidAgent.WithApplicationToken(applicationToken) - .WithApplicationFramework(Com.Newrelic.Agent.Android.ApplicationFramework.Maui, "1.1.1") + .WithApplicationFramework(Com.Newrelic.Agent.Android.ApplicationFramework.Maui, "1.1.2") .WithLoggingEnabled(agentConfig.loggingEnabled) .WithLogLevel(logLevelDict[agentConfig.logLevel]); diff --git a/NewRelic.MAUI.Plugin/Platforms/iOS/NewRelicMethodsImplementation.cs b/NewRelic.MAUI.Plugin/Platforms/iOS/NewRelicMethodsImplementation.cs index 3b8065c..7e916af 100644 --- a/NewRelic.MAUI.Plugin/Platforms/iOS/NewRelicMethodsImplementation.cs +++ b/NewRelic.MAUI.Plugin/Platforms/iOS/NewRelicMethodsImplementation.cs @@ -5,7 +5,7 @@ using Foundation; using System.Diagnostics; -using NRIosAgent = iOS.NewRelic.NewRelic; +using NRIosAgent = MauiiOS.NewRelic.NewRelic; namespace NewRelic.MAUI.Plugin; @@ -14,24 +14,24 @@ public class NewRelicMethodsImplementation : INewRelicMethods { private bool _isUncaughtExceptionHandled; - private Dictionary logLevelDict = new Dictionary() + private Dictionary logLevelDict = new Dictionary() { - { LogLevel.ERROR, iOS.NewRelic.NRLogLevels.Error }, - { LogLevel.WARNING, iOS.NewRelic.NRLogLevels.Warning }, - { LogLevel.INFO, iOS.NewRelic.NRLogLevels.Info }, - { LogLevel.VERBOSE, iOS.NewRelic.NRLogLevels.Verbose }, - { LogLevel.AUDIT, iOS.NewRelic.NRLogLevels.Audit } + { LogLevel.ERROR, MauiiOS.NewRelic.NRLogLevels.Error }, + { LogLevel.WARNING, MauiiOS.NewRelic.NRLogLevels.Warning }, + { LogLevel.INFO, MauiiOS.NewRelic.NRLogLevels.Info }, + { LogLevel.VERBOSE, MauiiOS.NewRelic.NRLogLevels.Verbose }, + { LogLevel.AUDIT, MauiiOS.NewRelic.NRLogLevels.Audit } }; private Dictionary networkFailureDict = new Dictionary() { - { NetworkFailure.Unknown, (nint) iOS.NewRelic.NRNetworkFailureCode.Unknown }, - { NetworkFailure.BadURL, (nint) iOS.NewRelic.NRNetworkFailureCode.BadURL }, - { NetworkFailure.TimedOut, (nint) iOS.NewRelic.NRNetworkFailureCode.TimedOut }, - { NetworkFailure.CannotConnectToHost, (nint) iOS.NewRelic.NRNetworkFailureCode.CannotConnectToHost }, - { NetworkFailure.DNSLookupFailed, (nint) iOS.NewRelic.NRNetworkFailureCode.DNSLookupFailed }, - { NetworkFailure.BadServerResponse, (nint) iOS.NewRelic.NRNetworkFailureCode.BadServerResponse }, - { NetworkFailure.SecureConnectionFailed, (nint) iOS.NewRelic.NRNetworkFailureCode.SecureConnectionFailed } + { NetworkFailure.Unknown, (nint) MauiiOS.NewRelic.NRNetworkFailureCode.Unknown }, + { NetworkFailure.BadURL, (nint) MauiiOS.NewRelic.NRNetworkFailureCode.BadURL }, + { NetworkFailure.TimedOut, (nint) MauiiOS.NewRelic.NRNetworkFailureCode.TimedOut }, + { NetworkFailure.CannotConnectToHost, (nint) MauiiOS.NewRelic.NRNetworkFailureCode.CannotConnectToHost }, + { NetworkFailure.DNSLookupFailed, (nint) MauiiOS.NewRelic.NRNetworkFailureCode.DNSLookupFailed }, + { NetworkFailure.BadServerResponse, (nint) MauiiOS.NewRelic.NRNetworkFailureCode.BadServerResponse }, + { NetworkFailure.SecureConnectionFailed, (nint) MauiiOS.NewRelic.NRNetworkFailureCode.SecureConnectionFailed } }; private Dictionary metricUnitDict = new Dictionary() @@ -51,66 +51,66 @@ public void Start(string applicationToken, AgentStartConfiguration agentConfig = } NRIosAgent.EnableCrashReporting(agentConfig.crashReportingEnabled); - NRIosAgent.SetPlatform(iOS.NewRelic.NRMAApplicationPlatform.Maui); - iOS.NewRelic.NewRelic.SetPlatformVersion("1.1.1"); + NRIosAgent.SetPlatform(MauiiOS.NewRelic.NRMAApplicationPlatform.Maui); + MauiiOS.NewRelic.NewRelic.SetPlatformVersion("1.1.2"); - iOS.NewRelic.NRLogger.SetLogLevels((uint)logLevelDict[agentConfig.logLevel]); + MauiiOS.NewRelic.NRLogger.SetLogLevels((uint)logLevelDict[agentConfig.logLevel]); if (!agentConfig.loggingEnabled) { - iOS.NewRelic.NRLogger.SetLogLevels((uint)iOS.NewRelic.NRLogLevels.None); + MauiiOS.NewRelic.NRLogger.SetLogLevels((uint)MauiiOS.NewRelic.NRLogLevels.None); } if (!agentConfig.networkErrorRequestEnabled) { - NRIosAgent.DisableFeatures(iOS.NewRelic.NRMAFeatureFlags.RequestErrorEvents); + NRIosAgent.DisableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.RequestErrorEvents); } if (!agentConfig.networkRequestEnabled) { - NRIosAgent.DisableFeatures(iOS.NewRelic.NRMAFeatureFlags.NetworkRequestEvents); + NRIosAgent.DisableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.NetworkRequestEvents); } if (!agentConfig.interactionTracingEnabled) { - NRIosAgent.DisableFeatures(iOS.NewRelic.NRMAFeatureFlags.InteractionTracing); + NRIosAgent.DisableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.InteractionTracing); } if (!agentConfig.webViewInstrumentation) { - NRIosAgent.DisableFeatures(iOS.NewRelic.NRMAFeatureFlags.WebViewInstrumentation); + NRIosAgent.DisableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.WebViewInstrumentation); } if (agentConfig.fedRampEnabled) { - NRIosAgent.EnableFeatures(iOS.NewRelic.NRMAFeatureFlags.FedRampEnabled); + NRIosAgent.EnableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.FedRampEnabled); } if (agentConfig.offlineStorageEnabled) { - NRIosAgent.EnableFeatures(iOS.NewRelic.NRMAFeatureFlags.OfflineStorage); + NRIosAgent.EnableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.OfflineStorage); } else { - NRIosAgent.DisableFeatures(iOS.NewRelic.NRMAFeatureFlags.OfflineStorage); + NRIosAgent.DisableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.OfflineStorage); } if (agentConfig.newEventSystemEnabled) { - NRIosAgent.EnableFeatures(iOS.NewRelic.NRMAFeatureFlags.NewEventSystem); + NRIosAgent.EnableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.NewEventSystem); } else { - NRIosAgent.DisableFeatures(iOS.NewRelic.NRMAFeatureFlags.NewEventSystem); + NRIosAgent.DisableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.NewEventSystem); } if (agentConfig.backgroundReportingEnabled) { - NRIosAgent.EnableFeatures(iOS.NewRelic.NRMAFeatureFlags.BackgroundReporting); + NRIosAgent.EnableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.BackgroundReporting); } else { - NRIosAgent.DisableFeatures(iOS.NewRelic.NRMAFeatureFlags.BackgroundReporting); + NRIosAgent.DisableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.BackgroundReporting); } @@ -269,11 +269,11 @@ public void NetworkRequestEnabled(bool enabled) { if (enabled) { - NRIosAgent.EnableFeatures(iOS.NewRelic.NRMAFeatureFlags.NetworkRequestEvents); + NRIosAgent.EnableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.NetworkRequestEvents); } else { - NRIosAgent.DisableFeatures(iOS.NewRelic.NRMAFeatureFlags.NetworkRequestEvents); + NRIosAgent.DisableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.NetworkRequestEvents); } return; } @@ -282,11 +282,11 @@ public void NetworkErrorRequestEnabled(bool enabled) { if (enabled) { - NRIosAgent.EnableFeatures(iOS.NewRelic.NRMAFeatureFlags.RequestErrorEvents); + NRIosAgent.EnableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.RequestErrorEvents); } else { - NRIosAgent.DisableFeatures(iOS.NewRelic.NRMAFeatureFlags.RequestErrorEvents); + NRIosAgent.DisableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.RequestErrorEvents); } return; } @@ -295,11 +295,11 @@ public void HttpResponseBodyCaptureEnabled(bool enabled) { if (enabled) { - NRIosAgent.EnableFeatures(iOS.NewRelic.NRMAFeatureFlags.HttpResponseBodyCapture); + NRIosAgent.EnableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.HttpResponseBodyCapture); } else { - NRIosAgent.DisableFeatures(iOS.NewRelic.NRMAFeatureFlags.HttpResponseBodyCapture); + NRIosAgent.DisableFeatures(MauiiOS.NewRelic.NRMAFeatureFlags.HttpResponseBodyCapture); } return; } diff --git a/NewRelic.MAUI.iOS.Binding/ApiDefinition.cs b/NewRelic.MAUI.iOS.Binding/ApiDefinition.cs index df4e1a1..6428525 100644 --- a/NewRelic.MAUI.iOS.Binding/ApiDefinition.cs +++ b/NewRelic.MAUI.iOS.Binding/ApiDefinition.cs @@ -80,7 +80,7 @@ #if !NET using NativeHandle = System.IntPtr; #endif -namespace iOS.NewRelic +namespace MauiiOS.NewRelic { diff --git a/NewRelic.MAUI.iOS.Binding/NewRelic.MAUI.iOS.Binding.csproj b/NewRelic.MAUI.iOS.Binding/NewRelic.MAUI.iOS.Binding.csproj index 719e4b8..ab0ec22 100644 --- a/NewRelic.MAUI.iOS.Binding/NewRelic.MAUI.iOS.Binding.csproj +++ b/NewRelic.MAUI.iOS.Binding/NewRelic.MAUI.iOS.Binding.csproj @@ -6,7 +6,7 @@ true NewRelic.MAUI.iOS.Binding New Relic - 7.5.1 + 7.5.1.1 true NewRelic iOS SDK binding for .NET MAUI A .NET iOS library that binds the native New Relic iOS SDK. With NewRelic, you can collect crashes, network traffic, and other information for .NET MAUI iOS apps using native components. diff --git a/NewRelic.MAUI.iOS.Binding/StructsAndEnums.cs b/NewRelic.MAUI.iOS.Binding/StructsAndEnums.cs index fece323..bd7c400 100644 --- a/NewRelic.MAUI.iOS.Binding/StructsAndEnums.cs +++ b/NewRelic.MAUI.iOS.Binding/StructsAndEnums.cs @@ -8,7 +8,7 @@ using CoreFoundation; using ObjCRuntime; -namespace iOS.NewRelic +namespace MauiiOS.NewRelic { [Flags] public enum NRMAFeatureFlags : ulong