* Add SiteIdentifierService * Use SiteIdentifierService in TelemetryService * Use SiteIdentifierService when installing * Remove timeout * Use TryGetOrCreateSiteIdentifier in TelemetryService * Add site identifier to dashboard url * Fix and add tests * Don't accept empty guid as valid site identifier * Fix dashboard controller * Fix site id query parameter * Use Optionsmonitor onchange Co-authored-by: nikolajlauridsen <nel@umbraco.dk> Co-authored-by: Bjarke Berg <mail@bergmania.dk>
71 lines
2.2 KiB
C#
71 lines
2.2 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using Umbraco.Cms.Core.Configuration;
|
|
using Umbraco.Cms.Core.Manifest;
|
|
using Umbraco.Cms.Core.Telemetry.Models;
|
|
using Umbraco.Extensions;
|
|
|
|
namespace Umbraco.Cms.Core.Telemetry
|
|
{
|
|
/// <inheritdoc/>
|
|
internal class TelemetryService : ITelemetryService
|
|
{
|
|
private readonly IManifestParser _manifestParser;
|
|
private readonly IUmbracoVersion _umbracoVersion;
|
|
private readonly ISiteIdentifierService _siteIdentifierService;
|
|
|
|
/// <summary>
|
|
/// Initializes a new instance of the <see cref="TelemetryService"/> class.
|
|
/// </summary>
|
|
public TelemetryService(
|
|
IManifestParser manifestParser,
|
|
IUmbracoVersion umbracoVersion,
|
|
ISiteIdentifierService siteIdentifierService)
|
|
{
|
|
_manifestParser = manifestParser;
|
|
_umbracoVersion = umbracoVersion;
|
|
_siteIdentifierService = siteIdentifierService;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public bool TryGetTelemetryReportData(out TelemetryReportData telemetryReportData)
|
|
{
|
|
if (_siteIdentifierService.TryGetOrCreateSiteIdentifier(out Guid telemetryId) is false)
|
|
{
|
|
telemetryReportData = null;
|
|
return false;
|
|
}
|
|
|
|
telemetryReportData = new TelemetryReportData
|
|
{
|
|
Id = telemetryId,
|
|
Version = _umbracoVersion.SemanticVersion.ToSemanticStringWithoutBuild(),
|
|
Packages = GetPackageTelemetry(),
|
|
};
|
|
return true;
|
|
}
|
|
|
|
private IEnumerable<PackageTelemetry> GetPackageTelemetry()
|
|
{
|
|
List<PackageTelemetry> packages = new();
|
|
IEnumerable<PackageManifest> manifests = _manifestParser.GetManifests();
|
|
|
|
foreach (PackageManifest manifest in manifests)
|
|
{
|
|
if (manifest.AllowPackageTelemetry is false)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
packages.Add(new PackageTelemetry
|
|
{
|
|
Name = manifest.PackageName,
|
|
Version = manifest.Version ?? string.Empty,
|
|
});
|
|
}
|
|
|
|
return packages;
|
|
}
|
|
}
|
|
}
|