allow custom span end time (#106)

Author: richardelms

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

@@ -40,21 +40,7 @@ public Span(string name, SpanKind kind, string id, string traceId, string parent
             _onSpanEnd = onSpanEnd;
         }
 
-        public void End()
-        {
-            lock (_endLock)
-            {
-                if (Ended)
-                {
-                    return;
-                }
-                Ended = true;
-            }
-            EndTime = DateTimeOffset.UtcNow;
-            _onSpanEnd(this);
-        }
-
-        internal void End(DateTimeOffset? endTime)
+        public void End(DateTimeOffset? endTime = null)
         {
             lock (_endLock)
             {
@@ -110,7 +96,7 @@ internal void EndNetworkSpan(BugsnagUnityWebRequest request)
             _onSpanEnd(this);
         }
 
-        public void EndNetworkSpan(int statusCode = -1, int requestContentLength = -1, int responseContentLength = -1)
+        public void EndNetworkSpan(int statusCode = -1, int requestContentLength = -1, int responseContentLength = -1, DateTimeOffset? endTime = null)
         {
             lock (_endLock)
             {
@@ -121,7 +107,7 @@ public void EndNetworkSpan(int statusCode = -1, int requestContentLength = -1, i
                 Ended = true;
             }
 
-            EndTime = DateTimeOffset.UtcNow;
+            EndTime = endTime == null ? DateTimeOffset.UtcNow : endTime.Value;
 
             if (statusCode > -1)
             {

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ### Bug Fixes
 
+- Fixed issue where spans could not be ended with a custom end time. [#106](https://github.com/bugsnag/bugsnag-unity-performance/pull/106)
+
 - Fixed issue where custom spans with the SpanOption IsFirstClass set to false still had it reported as true. [#107](https://github.com/bugsnag/bugsnag-unity-performance/pull/107)
 
 

features/fixtures/mazerunner/Assets/Scenes/MainScene.unity

@@ -268,6 +268,7 @@ GameObject:
   m_Component:
   - component: {fileID: 259057445}
   - component: {fileID: 259057446}
+  - component: {fileID: 259057447}
   m_Layer: 0
   m_Name: ManualSpans
   m_TagString: Untagged
@@ -302,6 +303,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cb0c44dcd373341599ace342676625b4, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &259057447
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 259057444}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b1acdfac80082464180a997600222189, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &320782971
 GameObject:
   m_ObjectHideFlags: 0

features/fixtures/mazerunner/Assets/Scripts/Scenarios/Spans/CustomStartAndEndTime.cs

@@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+using BugsnagUnityPerformance;
+using UnityEngine;
+
+public class CustomStartAndEndTime : Scenario
+{
+
+    public override void PrepareConfig(string apiKey, string host)
+    {
+        base.PrepareConfig(apiKey, host);
+        SetMaxBatchSize(1);
+    }
+
+    public override void Run()
+    {
+        base.Run();
+        BugsnagPerformance.StartSpan("CustomStartAndEndTime",
+            new SpanOptions {StartTime = new System.DateTimeOffset(1985,1,1,1,1,1,System.TimeSpan.Zero)})
+            .End(new System.DateTimeOffset(1986, 1, 1, 1, 1, 1, System.TimeSpan.Zero));
+    }
+
+    
+}

features/fixtures/mazerunner/Assets/Scripts/Scenarios/Spans/CustomStartAndEndTime.cs.meta

@@ -57,3 +57,10 @@ Feature: Manual creation of spans
     * the trace payload field "resourceSpans.0.resource" string attribute "device.manufacturer" exists
     * the trace payload field "resourceSpans.0.resource" string attribute "host.arch" exists
     * the trace payload field "resourceSpans.0.resource" string attribute "bugsnag.app.bundle_version" exists
+
+ Scenario: Custom timings
+    When I run the game in the "CustomStartAndEndTime" state
+    And I wait for 1 span
+    * the trace payload field "resourceSpans.0.scopeSpans.0.spans.0.name" equals "CustomStartAndEndTime"
+    * every span field "startTimeUnixNano" equals "473389261000000000"
+    * every span field "endTimeUnixNano" equals "504925261000000000"