Merge pull request #8 from speckleworks/dim/dev/telemetry

bumps core and popup, adds telemetry logs
speckleworks · Sep 24, 2019 · 5fe4d61 · 5fe4d61
2 parents 8485a27 + 091e81c
commit 5fe4d61
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "SpeckleElements"]
-	path = SpeckleElements
-	url = https://github.com/speckleworks/SpeckleElements.git

diff --git a/SpeckleElements b/SpeckleElements
diff --git a/SpeckleRevitReboot/Entry.cs b/SpeckleRevitReboot/Entry.cs
@@ -85,7 +85,8 @@ public Result Execute( ExternalCommandData commandData, ref string message, Elem
 
         // Initialise the window
 #if DEBUG
-        SpeckleWindow = new SpeckleUiWindow( bindings, @"http://localhost:8080/" );
+        //SpeckleWindow = new SpeckleUiWindow( bindings, @"http://localhost:8080/" );
+        SpeckleWindow = new SpeckleUiWindow( bindings, @"https://matteo-dev.appui.speckle.systems/#/" );
 #else
         SpeckleWindow = new SpeckleUiWindow( bindings, @"https://matteo-dev.appui.speckle.systems/#/" ); // On release, default to the latest ci-ed version from https://appui.speckle.systems
 #endif

diff --git a/SpeckleRevitReboot/SpeckleRevit.csproj b/SpeckleRevitReboot/SpeckleRevit.csproj
@@ -80,6 +80,21 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Countly, Version=19.8.0.0, Culture=neutral, PublicKeyToken=30fd2b3d8bfe4882, processorArchitecture=MSIL">
+      <HintPath>..\packages\Countly.19.8.0\lib\net40-client\Countly.dll</HintPath>
+    </Reference>
+    <Reference Include="DeviceId, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DeviceId.4.3.0\lib\net40\DeviceId.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -93,11 +108,11 @@
       <HintPath>..\packages\Revit.RevitApiUI.x64.2019.0.0\lib\net45\RevitAPIUI.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="SpeckleCore, Version=1.6.8.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\SpeckleCore.1.6.8\lib\net45\SpeckleCore.dll</HintPath>
+    <Reference Include="SpeckleCore, Version=1.6.9.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\SpeckleCore.1.6.9\lib\net45\SpeckleCore.dll</HintPath>
     </Reference>
-    <Reference Include="SpecklePopup, Version=1.6.11.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SpecklePopup.1.6.11\lib\net45\SpecklePopup.dll</HintPath>
+    <Reference Include="SpecklePopup, Version=1.6.12.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SpecklePopup.1.6.12\lib\net45\SpecklePopup.dll</HintPath>
     </Reference>
     <Reference Include="SpeckleUiBase, Version=1.1.1.0, Culture=neutral, processorArchitecture=AMD64">
       <HintPath>..\packages\SpeckleUiBase.1.1.1-wip\lib\net452\SpeckleUiBase.dll</HintPath>
@@ -119,6 +134,8 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Net" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -206,8 +223,10 @@
     <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
     <Error Condition="!Exists('..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.props'))" />
     <Error Condition="!Exists('..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
   </Target>
   <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
   <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
   <Import Project="..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.targets" Condition="Exists('..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.targets')" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
 </Project>
diff --git a/SpeckleRevitReboot/UI/Receiver.cs b/SpeckleRevitReboot/UI/Receiver.cs
@@ -22,6 +22,7 @@ public override void BakeReceiver( string args )
     {
       var client =  JsonConvert.DeserializeObject<dynamic>( args );
       var apiClient = new SpeckleApiClient( (string) client.account.RestApi ) { AuthToken = (string) client.account.Token };
+      apiClient.ClientType = "Revit";
 
       NotifyUi( "update-client",  JsonConvert.SerializeObject( new
       {

diff --git a/SpeckleRevitReboot/UI/Sender.cs b/SpeckleRevitReboot/UI/Sender.cs
@@ -48,6 +48,8 @@ public override void AddSender(string args)
 
       ISelectionFilter filter = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(client.filter), GetFilterType(client.filter.Type.ToString()));
       GetSelectionFilterObjects(filter, client._id.ToString(), client.streamId.ToString());
+
+      SpeckleTelemetry.RecordStreamCreated( "Revit" );
     }
 
     public override void UpdateSender(string args)
@@ -73,6 +75,8 @@ public override void UpdateSender(string args)
 
       ISelectionFilter filter = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(client.filter), GetFilterType(client.filter.Type.ToString()));
       GetSelectionFilterObjects(filter, client._id.ToString(), client.streamId.ToString());
+
+      SpeckleTelemetry.RecordStreamUpdated( "Revit" );
     }
 
     // NOTE: This is actually triggered when clicking "Push!"
@@ -204,6 +208,7 @@ public override void PushSender( string args )
         errors
       } ) );
 
+      SpeckleTelemetry.RecordStreamUpdated( "Revit" );
     }
 
     /// <summary>

diff --git a/SpeckleRevitReboot/app.config b/SpeckleRevitReboot/app.config
@@ -6,6 +6,10 @@
         <assemblyIdentity name="websocket-sharp" publicKeyToken="5660b08a1845a91e" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.0.2.32519" newVersion="1.0.2.32519" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/SpeckleRevitReboot/packages.config b/SpeckleRevitReboot/packages.config
@@ -4,11 +4,16 @@
   <package id="cef.redist.x86" version="3.2987.1601" targetFramework="net471" />
   <package id="CefSharp.Common" version="57.0.0" targetFramework="net471" />
   <package id="CefSharp.Wpf" version="57.0.0" targetFramework="net471" />
+  <package id="Countly" version="19.8.0" targetFramework="net471" />
+  <package id="DeviceId" version="4.3.0" targetFramework="net471" />
+  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net471" />
+  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net471" />
+  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net471" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" />
   <package id="Revit.RevitApi.x64" version="2019.0.0" targetFramework="net471" />
   <package id="Revit.RevitApiUI.x64" version="2019.0.0" targetFramework="net471" />
-  <package id="SpeckleCore" version="1.6.8" targetFramework="net471" />
-  <package id="SpecklePopup" version="1.6.11" targetFramework="net471" />
+  <package id="SpeckleCore" version="1.6.9" targetFramework="net471" />
+  <package id="SpecklePopup" version="1.6.12" targetFramework="net471" />
   <package id="SpeckleUiBase" version="1.1.1-wip" targetFramework="net471" />
   <package id="sqlite-net-pcl" version="1.5.231" targetFramework="net471" />
   <package id="SQLitePCLRaw.bundle_green" version="1.1.11" targetFramework="net471" />