Merge pull request #71 from bugsnag/next

Release v1.1.0

Author: richardelms

.buildkite/pipeline.full.yml

@@ -45,7 +45,7 @@ steps:
         command:
           - "--app=/app/features/fixtures/mazerunner/mazerunner_2020.3.48f1.apk"
           - "--farm=bb"
-          - "--device=ANDROID_11"
+          - "--device=ANDROID_9|ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13"
           - "--no-tunnel"
           - "--aws-public-ip"
     concurrency: 25

.buildkite/pipeline.yml

@@ -60,7 +60,7 @@ steps:
         command:
           - "--app=/app/features/fixtures/mazerunner/mazerunner_2021.3.27f1.apk"
           - "--farm=bb"
-          - "--device=ANDROID_11"
+          - "--device=ANDROID_9|ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13"
           - "--no-tunnel"
           - "--aws-public-ip"
     concurrency: 25

BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Internal/BugsnagPerformanceAutoStart.cs

@@ -9,14 +9,14 @@ static void OnBeforeSceneLoadRuntimeMethod()
         var settings = Resources.Load<BugsnagPerformanceSettingsObject>("Bugsnag/BugsnagPerformanceSettingsObject");
         if (settings != null)
         {
-            var config = settings.GetConfig();
-            if (string.IsNullOrEmpty(config.ApiKey))
-            {
-                Debug.LogError("BugSnag Performance can't be automatically started as the API key is not set.");
-                return;
-            }
+            var config = settings.GetConfig();           
             if (settings.StartAutomaticallyAtLaunch)
             {
+                if (string.IsNullOrEmpty(config.ApiKey))
+                {
+                    Debug.LogError("BugSnag Performance can't be automatically started as the API key is not set.");
+                    return;
+                }
                 BugsnagPerformance.Start(config);
             }
         }

BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Internal/Sampler.cs

@@ -49,6 +49,7 @@ public bool Sampled(Span span)
             if (isSampled)
             {
                 span.UpdateSamplingProbability(p);
+                span.SetAttribute("bugsnag.sampling.p", p);
             }
             return isSampled;
         }

BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Internal/SpanFactory.cs

@@ -91,7 +91,7 @@ private Span CreateSpan(string name, SpanKind kind, SpanOptions spanOptions)
             return newSpan;
         }
 
-        internal Span CreateAutomaticNetworkSpan(BugsnagUnityWebRequest request)
+        internal Span CreateAutomaticNetworkSpan(BugsnagUnityWebRequest request,string url)
         {
             var verb = request.method.ToUpper();
 
@@ -101,7 +101,7 @@ internal Span CreateAutomaticNetworkSpan(BugsnagUnityWebRequest request)
 
             var span = CreateSpan("HTTP/" + verb, SpanKind.SPAN_KIND_CLIENT, spanOptions);
             span.SetAttribute("bugsnag.span.category", "network");
-            span.SetAttribute("http.url", request.url);
+            span.SetAttribute("http.url", url);
             span.SetAttribute("http.method", verb);
             span.SetAttribute("net.host.connection.type", GetConnectionType());
             return span;

BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Internal/Version.cs

@@ -3,6 +3,6 @@
     internal static class Version
     {
         //TODO set this using sed or something in the release automation task
-        public const string VersionString = "1.0.0";
+        public const string VersionString = "1.1.0";
     }
 }

BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Public/BugsnagNetworkRequestInfo.cs

@@ -0,0 +1,12 @@
+namespace BugsnagUnityPerformance
+{
+    public class BugsnagNetworkRequestInfo
+    {
+        public string Url;
+
+        public BugsnagNetworkRequestInfo(string url)
+        {
+            Url = url;
+        }
+    }
+}

BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Public/BugsnagNetworkRequestInfo.cs.meta

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using BugsnagNetworking;
@@ -24,6 +25,7 @@ public class BugsnagPerformance
         private AppStartHandler _appStartHandler;
         private PersistentState _persistentState;
         private PValueUpdater _pValueUpdater;
+        private Func<BugsnagNetworkRequestInfo, BugsnagNetworkRequestInfo> _networkRequestCallback;
 
         public static void Start(PerformanceConfiguration configuration)
         {
@@ -36,12 +38,22 @@ public static void Start(PerformanceConfiguration configuration)
                 }
                 IsStarted = true;
             }
+            ValidateApiKey(configuration.ApiKey);
             if (ReleaseStageEnabled(configuration))
             {
                 _sharedInstance.Configure(configuration);
                 _sharedInstance.Start();
             }
+            
+        }
 
+        private static void ValidateApiKey(string apiKey)
+        {
+            if (!System.Text.RegularExpressions.Regex.IsMatch(apiKey, @"\A\b[0-9a-fA-F]+\b\Z") ||
+                apiKey.Length != 32)
+            {
+                throw new System.Exception($"Invalid Bugsnag Performance configuration. apiKey should be a 32-character hexademical string, got {apiKey} ");
+            }
         }
 
         private static bool ReleaseStageEnabled(PerformanceConfiguration configuration)
@@ -93,6 +105,7 @@ internal class SceneLoadSpanContainer
 
         private void Configure(PerformanceConfiguration config)
         {
+            _networkRequestCallback = config.NetworkRequestCallback;
             _cacheManager.Configure(config);
             _persistentState.Configure(config);
             _delivery.Configure(config);
@@ -116,7 +129,7 @@ private void Start()
             _appStartHandler.Start();
             SetupNetworkListener();
             SetupSceneLoadListeners();
-
+            
             IsStarted = true;
         }
 
@@ -200,13 +213,26 @@ private void SetupNetworkListener()
 
         private void OnRequestSend(BugsnagUnityWebRequest request)
         {
-            var span = _spanFactory.CreateAutomaticNetworkSpan(request);
+            var url = request.url;
+            if (_networkRequestCallback != null)
+            {
+                var callbackResult = _networkRequestCallback.Invoke(new BugsnagNetworkRequestInfo(url));
+                if (callbackResult == null || string.IsNullOrEmpty(callbackResult.Url))
+                {
+                    return;
+                }
+
+                url = callbackResult.Url;
+            }
+            var span = _spanFactory.CreateAutomaticNetworkSpan(request, url);
             lock (_networkSpansLock)
             {
                 _networkSpans[request] = span;
             }
         }
 
+       
+
         private void OnRequestAbort(BugsnagUnityWebRequest request)
         {
             EndNetworkSpan(request, true);

BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Public/BugsnagPerformance.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 
 namespace BugsnagUnityPerformance
 {
@@ -16,26 +17,7 @@ public class PerformanceConfiguration
 
         //Public config
 
-        private string _apiKey;
-
-        public string ApiKey
-        {
-            get
-            {
-                return _apiKey;
-            }
-            set
-            {
-                if (ValidateApiKey(value))
-                {
-                    _apiKey = value;
-                }
-                else
-                {
-                    throw new System.Exception($"Invalid Bugsnag Performance configuration. apiKey should be a 32-character hexademical string, got {value} ");
-                }
-            }
-        }
+        public string ApiKey;
 
         public AutoInstrumentAppStartSetting AutoInstrumentAppStart = AutoInstrumentAppStartSetting.FULL;
 
@@ -47,17 +29,15 @@ public string ApiKey
 
         public string Endpoint = "https://otlp.bugsnag.com/v1/traces";
 
+        public Func<BugsnagNetworkRequestInfo, BugsnagNetworkRequestInfo> NetworkRequestCallback;
+
         public string ReleaseStage = Debug.isDebugBuild ? "development" : "production";
 
         public PerformanceConfiguration(string apiKey)
         {
             ApiKey = apiKey;
         }
 
-        private bool ValidateApiKey(string apiKey)
-        {
-            return System.Text.RegularExpressions.Regex.IsMatch(apiKey, @"\A\b[0-9a-fA-F]+\b\Z") &&
-                apiKey.Length == 32;
-        }
+      
     }
 }