Skip to content

Commit 908c89f

Browse files
author
nikolajlauridsen
committed
Fix breaking change in ReportSiteTask
1 parent 9959773 commit 908c89f

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22
using System.Net.Http;
33
using System.Text;
44
using System.Threading.Tasks;
5+
using Microsoft.Extensions.DependencyInjection;
56
using Microsoft.Extensions.Logging;
7+
using Microsoft.Extensions.Options;
68
using Newtonsoft.Json;
9+
using Umbraco.Cms.Core.Configuration;
10+
using Umbraco.Cms.Core.Configuration.Models;
711
using Umbraco.Cms.Core.Telemetry;
812
using Umbraco.Cms.Core.Telemetry.Models;
13+
using Umbraco.Cms.Web.Common.DependencyInjection;
914

1015
namespace Umbraco.Cms.Infrastructure.HostedServices
1116
{
@@ -25,6 +30,15 @@ public ReportSiteTask(
2530
s_httpClient = new HttpClient();
2631
}
2732

33+
[Obsolete("Use the constructor that takes ITelemetryService instead, scheduled for removal in V11")]
34+
public ReportSiteTask(
35+
ILogger<ReportSiteTask> logger,
36+
IUmbracoVersion umbracoVersion,
37+
IOptions<GlobalSettings> globalSettings)
38+
: this(logger, StaticServiceProvider.Instance.GetRequiredService<ITelemetryService>())
39+
{
40+
}
41+
2842
/// <summary>
2943
/// Runs the background task to send the anonymous ID
3044
/// to telemetry service

src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
using Umbraco.Cms.Core.Configuration.Models;
2929
using Umbraco.Cms.Core.DependencyInjection;
3030
using Umbraco.Cms.Core.Diagnostics;
31-
using Umbraco.Cms.Core.Events;
3231
using Umbraco.Cms.Core.Hosting;
3332
using Umbraco.Cms.Core.Logging;
3433
using Umbraco.Cms.Core.Macros;
3534
using Umbraco.Cms.Core.Net;
3635
using Umbraco.Cms.Core.Notifications;
3736
using Umbraco.Cms.Core.Security;
3837
using Umbraco.Cms.Core.Services;
38+
using Umbraco.Cms.Core.Telemetry;
3939
using Umbraco.Cms.Core.Templates;
4040
using Umbraco.Cms.Core.Web;
4141
using Umbraco.Cms.Core.WebAssets;
@@ -182,7 +182,10 @@ public static IUmbracoBuilder AddHostedServices(this IUmbracoBuilder builder)
182182
builder.Services.AddHostedService<TempFileCleanup>();
183183
builder.Services.AddHostedService<InstructionProcessTask>();
184184
builder.Services.AddHostedService<TouchServerTask>();
185-
builder.Services.AddHostedService<ReportSiteTask>();
185+
builder.Services.AddHostedService(provider =>
186+
new ReportSiteTask(
187+
provider.GetRequiredService<ILogger<ReportSiteTask>>(),
188+
provider.GetRequiredService<ITelemetryService>()));
186189
return builder;
187190
}
188191

0 commit comments

Comments
 (0)