Merge pull request #1 from TelemetryDeck/dev-fpr-1.1.6

Update TestApp to use 1.1.6 features

Author: winsmith

TelemetryClient/Assets/TelemetryClient

@@ -123,6 +123,139 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &93888556
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 93888557}
+  - component: {fileID: 93888560}
+  - component: {fileID: 93888559}
+  - component: {fileID: 93888558}
+  m_Layer: 5
+  m_Name: StopTelemetryButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &93888557
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 93888556}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1786345586}
+  m_Father: {fileID: 249772493}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &93888558
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 93888556}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 0
+  m_TargetGraphic: {fileID: 93888559}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 125346021}
+        m_TargetAssemblyTypeName: TelemetryClient.TestApp.Scripts.AppManager, Assembly-CSharp
+        m_MethodName: StopTelemetry
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &93888559
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 93888556}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &93888560
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 93888556}
+  m_CullTransparentMesh: 1
 --- !u!1 &125346020
 GameObject:
   m_ObjectHideFlags: 0
@@ -157,6 +290,7 @@ MonoBehaviour:
   sendSimpleButton: {fileID: 1331413333}
   sendAdvancedButton: {fileID: 1168329378}
   startNewSessionButton: {fileID: 681178744}
+  stopTelemetryButton: {fileID: 93888558}
 --- !u!4 &125346022
 Transform:
   m_ObjectHideFlags: 0
@@ -206,6 +340,7 @@ RectTransform:
   - {fileID: 1331413332}
   - {fileID: 1168329377}
   - {fileID: 681178743}
+  - {fileID: 93888557}
   m_Father: {fileID: 1295792074}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1454,3 +1589,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1786180532}
   m_CullTransparentMesh: 1
+--- !u!1 &1786345585
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1786345586}
+  - component: {fileID: 1786345588}
+  - component: {fileID: 1786345587}
+  m_Layer: 5
+  m_Name: ButtonText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1786345586
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1786345585}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 93888557}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1786345587
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1786345585}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 40
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 4
+    m_MaxSize: 50
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Terminate TelemetryManager
+--- !u!222 &1786345588
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1786345585}
+  m_CullTransparentMesh: 1

TelemetryClient/Assets/TestApp/Scenes/TestScene.unity

@@ -22,9 +22,11 @@ public class AppManager : MonoBehaviour
         private Button sendAdvancedButton;
         [SerializeField]
         private Button startNewSessionButton;
+        [SerializeField]
+        private Button stopTelemetryButton;
 
         private int numberOfSignalsSentThisSession = 0;
-        private bool telemetryInitialized = false;
+        private bool TelemetryInitialized => TelemetryManager.IsInitialized;
 
         private void Awake()
         {
@@ -43,20 +45,19 @@ private void Start()
         /// </summary>
         public void InitializeTelemetryIfNeeded()
         {
-            if (telemetryInitialized)
+            if (TelemetryInitialized)
                 return;
 
             var configuration = new TelemetryManagerConfiguration(TelemetryAppId);
             // anonymize the telemetry sent entirely by setting a generic user ID
             configuration.defaultUser = GenericUserId;
-            // enable sending signals when running in Unity Editor
-            configuration.sendSignalsInEditorAndDebug = true;
+            // mark all signals as testing signals
+            configuration.IsTestMode = true;
             configuration.showDebugLogs = true;
             // initialize the TelemetryClient (otherwise we can't send any Signals)
             // you can delay this call to whenever you choose to start sending Signals
             // TelemetryClient will automatically attempt to send a "new session" signal.
             TelemetryManager.Initialize(configuration);
-            telemetryInitialized = true;
             UpdateUI();
         }
 
@@ -65,7 +66,7 @@ public void InitializeTelemetryIfNeeded()
         /// </summary>
         private void UpdateUI()
         {
-            if (telemetryInitialized)
+            if (TelemetryInitialized)
             {
                 string newText = "Telemetry initialized\n";
                 newText += string.Format("Sent {0:d} signals this session.", numberOfSignalsSentThisSession);
@@ -76,10 +77,11 @@ private void UpdateUI()
                 uiText.text = "Telemetry unavailable";
             }
 
-            initTelemetryButton.interactable = !telemetryInitialized;
-            sendSimpleButton.interactable = telemetryInitialized;
-            sendAdvancedButton.interactable = telemetryInitialized;
-            startNewSessionButton.interactable = telemetryInitialized;
+            initTelemetryButton.interactable = !TelemetryInitialized;
+            sendSimpleButton.interactable = TelemetryInitialized;
+            sendAdvancedButton.interactable = TelemetryInitialized;
+            startNewSessionButton.interactable = TelemetryInitialized;
+            stopTelemetryButton.interactable = TelemetryInitialized;
         }
 
         /// <summary>
@@ -88,7 +90,7 @@ private void UpdateUI()
         /// </summary>
         public void SendSimpleSignal()
         {
-            if (!telemetryInitialized)
+            if (!TelemetryInitialized)
                 return;
 
             TelemetryManager.SendSignal(SimpleSignalName, clientUser: GenericUserId);
@@ -102,7 +104,7 @@ public void SendSimpleSignal()
         /// </summary>
         public void SendAdvancedSignal()
         {
-            if (!telemetryInitialized)
+            if (!TelemetryInitialized)
                 return;
 
             var numberString = string.Format("{0:d}", numberOfSignalsSentThisSession);
@@ -115,12 +117,21 @@ public void SendAdvancedSignal()
 
         public void StartNewSession()
         {
-            if (!telemetryInitialized)
+            if (!TelemetryInitialized)
                 return;
 
             TelemetryManager.Instance.GenerateNewSession();
             numberOfSignalsSentThisSession = 0;
             UpdateUI();
         }
+
+        public void StopTelemetry()
+        {
+            if (!TelemetryInitialized)
+                return;
+
+            TelemetryManager.Terminate();
+            UpdateUI();
+        }
     }
 }