Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 6247541

Browse files
StanleyGoldmanStanleyGoldman
committed
Updating the UsageModel
1 parent 526ec08 commit 6247541

File tree

2 files changed

+50
-39
lines changed

2 files changed

+50
-39
lines changed

‎src/GitHub.Api/Metrics/UsageModel.cs

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,23 @@
55
namespace GitHub.Unity
66
{
77
public class Usage
8+
{
9+
public Dimensions Dimensions { get; set; } = new Dimensions();
10+
public Measures Measures { get; set; } = new Measures();
11+
}
12+
13+
public class Dimensions
814
{
915
public string Guid { get; set; }
1016
public DateTime Date { get; set; }
11-
public int Version { get; set; }
1217
public string AppVersion { get; set; }
1318
public string UnityVersion { get; set; }
1419
public string Lang { get; set; }
1520
public string CurrentLang { get; set; }
21+
}
22+
23+
public class Measures
24+
{
1625
public int NumberOfStartups { get; set; }
1726
public int NumberOfCommits { get; set; }
1827
public int NumberOfFetches { get; set; }
@@ -42,25 +51,27 @@ public Usage GetCurrentUsage(string appVersion, string unityVersion)
4251
if (currentUsage == null)
4352
{
4453
currentUsage = Reports
45-
.FirstOrDefault(usage => usage.Date == date
46-
&& usage.AppVersion == appVersion
47-
&& usage.UnityVersion == unityVersion);
54+
.FirstOrDefault(usage => usage.Dimensions.Date == date
55+
&& usage.Dimensions.AppVersion == appVersion
56+
&& usage.Dimensions.UnityVersion == unityVersion);
4857
}
4958

50-
if (currentUsage?.Date == date)
59+
if (currentUsage?.Dimensions.Date == date)
5160
{
5261
// update any fields that might be missing, if we've changed the format
53-
if (currentUsage.Guid != Guid)
54-
currentUsage.Guid = Guid;
62+
if (currentUsage.Dimensions.Guid != Guid)
63+
currentUsage.Dimensions.Guid = Guid;
5564
}
5665
else
5766
{
58-
currentUsage = new Usage {
59-
Version = 2,
60-
Date = date,
61-
Guid = Guid,
62-
AppVersion = appVersion,
63-
UnityVersion = unityVersion,
67+
currentUsage = new Usage
68+
{
69+
Dimensions = {
70+
Date = date,
71+
Guid = Guid,
72+
AppVersion = appVersion,
73+
UnityVersion = unityVersion
74+
}
6475
};
6576
Reports.Add(currentUsage);
6677
}
@@ -70,12 +81,12 @@ public Usage GetCurrentUsage(string appVersion, string unityVersion)
7081

7182
public List<Usage> SelectReports(DateTime beforeDate)
7283
{
73-
return Reports.Where(usage => usage.Date.Date != beforeDate.Date).ToList();
84+
return Reports.Where(usage => usage.Dimensions.Date.Date != beforeDate.Date).ToList();
7485
}
7586

7687
public void RemoveReports(DateTime beforeDate)
7788
{
78-
Reports.RemoveAll(usage => usage.Date.Date != beforeDate.Date);
89+
Reports.RemoveAll(usage => usage.Dimensions.Date.Date != beforeDate.Date);
7990
}
8091
}
8192

‎src/GitHub.Api/Metrics/UsageTracker.cs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ private async Task SendUsage()
155155
private Usage GetCurrentUsage(UsageStore usageStore)
156156
{
157157
var usage = usageStore.Model.GetCurrentUsage(ApplicationConfiguration.AssemblyName.Version.ToString(), unityVersion);
158-
usage.Lang = CultureInfo.InstalledUICulture.IetfLanguageTag;
159-
usage.CurrentLang = CultureInfo.CurrentCulture.IetfLanguageTag;
158+
usage.Dimensions.Lang = CultureInfo.InstalledUICulture.IetfLanguageTag;
159+
usage.Dimensions.CurrentLang = CultureInfo.CurrentCulture.IetfLanguageTag;
160160
return usage;
161161
}
162162

@@ -165,8 +165,8 @@ public void IncrementNumberOfStartups()
165165
var usageStore = LoadUsage();
166166
var usage = GetCurrentUsage(usageStore);
167167

168-
usage.NumberOfStartups++;
169-
Logger.Trace("NumberOfStartups:{0} Date:{1}", usage.NumberOfStartups, usage.Date);
168+
usage.Measures.NumberOfStartups++;
169+
Logger.Trace("NumberOfStartups:{0} Date:{1}", usage.Measures.NumberOfStartups, usage.Dimensions.Date);
170170

171171
SaveUsage(usageStore);
172172
}
@@ -176,8 +176,8 @@ public void IncrementNumberOfCommits()
176176
var usageStore = LoadUsage();
177177
var usage = GetCurrentUsage(usageStore);
178178

179-
usage.NumberOfCommits++;
180-
Logger.Trace("NumberOfCommits:{0} Date:{1}", usage.NumberOfCommits, usage.Date);
179+
usage.Measures.NumberOfCommits++;
180+
Logger.Trace("NumberOfCommits:{0} Date:{1}", usage.Measures.NumberOfCommits, usage.Dimensions.Date);
181181

182182
SaveUsage(usageStore);
183183
}
@@ -187,8 +187,8 @@ public void IncrementNumberOfFetches()
187187
var usageStore = LoadUsage();
188188
var usage = GetCurrentUsage(usageStore);
189189

190-
usage.NumberOfFetches++;
191-
Logger.Trace("NumberOfFetches:{0} Date:{1}", usage.NumberOfFetches, usage.Date);
190+
usage.Measures.NumberOfFetches++;
191+
Logger.Trace("NumberOfFetches:{0} Date:{1}", usage.Measures.NumberOfFetches, usage.Dimensions.Date);
192192

193193
SaveUsage(usageStore);
194194
}
@@ -198,8 +198,8 @@ public void IncrementNumberOfPushes()
198198
var usageStore = LoadUsage();
199199
var usage = GetCurrentUsage(usageStore);
200200

201-
usage.NumberOfPushes++;
202-
Logger.Trace("NumberOfPushes:{0} Date:{1}", usage.NumberOfPushes, usage.Date);
201+
usage.Measures.NumberOfPushes++;
202+
Logger.Trace("NumberOfPushes:{0} Date:{1}", usage.Measures.NumberOfPushes, usage.Dimensions.Date);
203203

204204
SaveUsage(usageStore);
205205
}
@@ -209,8 +209,8 @@ public void IncrementNumberOfProjectsInitialized()
209209
var usageStore = LoadUsage();
210210
var usage = GetCurrentUsage(usageStore);
211211

212-
usage.NumberOfProjectsInitialized++;
213-
Logger.Trace("NumberOfProjectsInitialized:{0} Date:{1}", usage.NumberOfProjectsInitialized, usage.Date);
212+
usage.Measures.NumberOfProjectsInitialized++;
213+
Logger.Trace("NumberOfProjectsInitialized:{0} Date:{1}", usage.Measures.NumberOfProjectsInitialized, usage.Dimensions.Date);
214214

215215
SaveUsage(usageStore);
216216
}
@@ -220,8 +220,8 @@ public void IncrementNumberOfLocalBranchCreations()
220220
var usageStore = LoadUsage();
221221
var usage = GetCurrentUsage(usageStore);
222222

223-
usage.NumberOfLocalBranchCreations++;
224-
Logger.Trace("NumberOfLocalBranchCreations:{0} Date:{1}", usage.NumberOfLocalBranchCreations, usage.Date);
223+
usage.Measures.NumberOfLocalBranchCreations++;
224+
Logger.Trace("NumberOfLocalBranchCreations:{0} Date:{1}", usage.Measures.NumberOfLocalBranchCreations, usage.Dimensions.Date);
225225

226226
SaveUsage(usageStore);
227227
}
@@ -231,8 +231,8 @@ public void IncrementNumberOfLocalBranchDeletions()
231231
var usageStore = LoadUsage();
232232
var usage = GetCurrentUsage(usageStore);
233233

234-
usage.NumberOfLocalBranchDeletion++;
235-
Logger.Trace("NumberOfLocalBranchDeletion:{0} Date:{1}", usage.NumberOfLocalBranchDeletion, usage.Date);
234+
usage.Measures.NumberOfLocalBranchDeletion++;
235+
Logger.Trace("NumberOfLocalBranchDeletion:{0} Date:{1}", usage.Measures.NumberOfLocalBranchDeletion, usage.Dimensions.Date);
236236

237237
SaveUsage(usageStore);
238238
}
@@ -242,8 +242,8 @@ public void IncrementNumberOfLocalBranchCheckouts()
242242
var usageStore = LoadUsage();
243243
var usage = GetCurrentUsage(usageStore);
244244

245-
usage.NumberOfLocalBranchCheckouts++;
246-
Logger.Trace("NumberOfLocalBranchCheckouts:{0} Date:{1}", usage.NumberOfLocalBranchCheckouts, usage.Date);
245+
usage.Measures.NumberOfLocalBranchCheckouts++;
246+
Logger.Trace("NumberOfLocalBranchCheckouts:{0} Date:{1}", usage.Measures.NumberOfLocalBranchCheckouts, usage.Dimensions.Date);
247247

248248
SaveUsage(usageStore);
249249
}
@@ -253,8 +253,8 @@ public void IncrementNumberOfRemoteBranchCheckouts()
253253
var usageStore = LoadUsage();
254254
var usage = GetCurrentUsage(usageStore);
255255

256-
usage.NumberOfRemoteBranchCheckouts++;
257-
Logger.Trace("NumberOfRemoteBranchCheckouts:{0} Date:{1}", usage.NumberOfRemoteBranchCheckouts, usage.Date);
256+
usage.Measures.NumberOfRemoteBranchCheckouts++;
257+
Logger.Trace("NumberOfRemoteBranchCheckouts:{0} Date:{1}", usage.Measures.NumberOfRemoteBranchCheckouts, usage.Dimensions.Date);
258258

259259
SaveUsage(usageStore);
260260
}
@@ -264,8 +264,8 @@ public void IncrementNumberOfPulls()
264264
var usageStore = LoadUsage();
265265
var usage = GetCurrentUsage(usageStore);
266266

267-
usage.NumberOfPulls++;
268-
Logger.Trace("NumberOfPulls:{0} Date:{1}", usage.NumberOfPulls, usage.Date);
267+
usage.Measures.NumberOfPulls++;
268+
Logger.Trace("NumberOfPulls:{0} Date:{1}", usage.Measures.NumberOfPulls, usage.Dimensions.Date);
269269

270270
SaveUsage(usageStore);
271271
}
@@ -275,8 +275,8 @@ public void IncrementNumberOfAuthentications()
275275
var usageStore = LoadUsage();
276276
var usage = GetCurrentUsage(usageStore);
277277

278-
usage.NumberOfAuthentications++;
279-
Logger.Trace("NumberOfAuthentications:{0} Date:{1}", usage.NumberOfAuthentications, usage.Date);
278+
usage.Measures.NumberOfAuthentications++;
279+
Logger.Trace("NumberOfAuthentications:{0} Date:{1}", usage.Measures.NumberOfAuthentications, usage.Dimensions.Date);
280280

281281
SaveUsage(usageStore);
282282
}

0 commit comments

Comments
 (0)