Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: current settings loading not working for older bot developed by composer #4015

Merged
luhan2017 merged 1 commit into from
Sep 3, 2020
Merged

fix: current settings loading not working for older bot developed by composer #4015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions runtime/dotnet/azurefunctions/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,27 +103,28 @@ public override void Configure(IFunctionsHostBuilder builder)
services.AddSingleton<ChannelServiceHandler, SkillHandler>();

// Register telemetry client, initializers and middleware
services.AddApplicationInsightsTelemetry(settings.ApplicationInsights.InstrumentationKey);
services.AddApplicationInsightsTelemetry(settings?.ApplicationInsights?.InstrumentationKey ?? string.Empty);

services.AddSingleton<ITelemetryInitializer, OperationCorrelationTelemetryInitializer>();
services.AddSingleton<ITelemetryInitializer, TelemetryBotIdInitializer>();
services.AddSingleton<IBotTelemetryClient, BotTelemetryClient>();
services.AddSingleton<TelemetryLoggerMiddleware>(sp =>
{
var telemetryClient = sp.GetService<IBotTelemetryClient>();
return new TelemetryLoggerMiddleware(telemetryClient, logPersonalInformation: settings.Telemetry.LogPersonalInformation);
return new TelemetryLoggerMiddleware(telemetryClient, logPersonalInformation: settings?.Telemetry?.LogPersonalInformation ?? false);
});
services.AddSingleton<TelemetryInitializerMiddleware>(sp =>
{
var httpContextAccessor = sp.GetService<IHttpContextAccessor>();
var telemetryLoggerMiddleware = sp.GetService<TelemetryLoggerMiddleware>();
return new TelemetryInitializerMiddleware(httpContextAccessor, telemetryLoggerMiddleware, settings.Telemetry.LogActivities);
return new TelemetryInitializerMiddleware(httpContextAccessor, telemetryLoggerMiddleware, settings?.Telemetry?.LogActivities ?? false);
});

// Storage
IStorage storage;
if (ConfigSectionValid(settings.CosmosDb.AuthKey))
if (ConfigSectionValid(settings?.CosmosDb?.AuthKey))
{
storage = new CosmosDbPartitionedStorage(settings.CosmosDb);
storage = new CosmosDbPartitionedStorage(settings?.CosmosDb);
}
else
{
Expand All @@ -137,7 +138,7 @@ public override void Configure(IFunctionsHostBuilder builder)
services.AddSingleton(conversationState);

// Resource explorer to track declarative assets
var resourceExplorer = new ResourceExplorer().AddFolder(Path.Combine(rootDirectory, settings.Bot ?? "."));
var resourceExplorer = new ResourceExplorer().AddFolder(Path.Combine(rootDirectory, settings?.Bot ?? "."));
services.AddSingleton(resourceExplorer);

// Adapter
Expand Down Expand Up @@ -193,23 +194,23 @@ public override void Configure(IFunctionsHostBuilder builder)

public void ConfigureTranscriptLoggerMiddleware(BotFrameworkHttpAdapter adapter, BotSettings settings)
{
if (ConfigSectionValid(settings.BlobStorage.ConnectionString) && ConfigSectionValid(settings.BlobStorage.Container))
if (ConfigSectionValid(settings?.BlobStorage?.ConnectionString) && ConfigSectionValid(settings?.BlobStorage?.Container))
{
adapter.Use(new TranscriptLoggerMiddleware(new AzureBlobTranscriptStore(settings.BlobStorage.ConnectionString, settings.BlobStorage.Container)));
adapter.Use(new TranscriptLoggerMiddleware(new AzureBlobTranscriptStore(settings?.BlobStorage?.ConnectionString, settings?.BlobStorage?.Container)));
}
}

public void ConfigureShowTypingMiddleWare(BotFrameworkAdapter adapter, BotSettings settings)
{
if (settings.Feature.UseShowTypingMiddleware)
if (settings?.Feature?.UseShowTypingMiddleware == true)
{
adapter.Use(new ShowTypingMiddleware());
}
}

public void ConfigureInspectionMiddleWare(BotFrameworkAdapter adapter, BotSettings settings, IServiceProvider s)
{
if (settings.Feature.UseInspectionMiddleware)
if (settings?.Feature?.UseInspectionMiddleware == true)
{
adapter.Use(s.GetService<TelemetryInitializerMiddleware>());
}
Expand Down
19 changes: 10 additions & 9 deletions runtime/dotnet/azurewebapp/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,23 @@ public Startup(IWebHostEnvironment env, IConfiguration configuration)

public void ConfigureTranscriptLoggerMiddleware(BotFrameworkHttpAdapter adapter, BotSettings settings)
{
if (ConfigSectionValid(settings.BlobStorage.ConnectionString) && ConfigSectionValid(settings.BlobStorage.Container))
if (ConfigSectionValid(settings?.BlobStorage?.ConnectionString) && ConfigSectionValid(settings?.BlobStorage?.Container))
{
adapter.Use(new TranscriptLoggerMiddleware(new AzureBlobTranscriptStore(settings.BlobStorage.ConnectionString, settings.BlobStorage.Container)));
adapter.Use(new TranscriptLoggerMiddleware(new AzureBlobTranscriptStore(settings?.BlobStorage?.ConnectionString, settings?.BlobStorage?.Container)));
}
}

public void ConfigureShowTypingMiddleWare(BotFrameworkAdapter adapter, BotSettings settings)
{
if (settings.Feature.UseShowTypingMiddleware)
if (settings?.Feature?.UseShowTypingMiddleware == true)
{
adapter.Use(new ShowTypingMiddleware());
}
}

public void ConfigureInspectionMiddleWare(BotFrameworkAdapter adapter, BotSettings settings, IStorage storage)
{
if (settings.Feature.UseInspectionMiddleware)
if (settings?.Feature?.UseInspectionMiddleware == true)
{
adapter.Use(new InspectionMiddleware(new InspectionState(storage)));
}
Expand All @@ -72,9 +72,9 @@ public void ConfigureInspectionMiddleWare(BotFrameworkAdapter adapter, BotSettin
public IStorage ConfigureStorage(BotSettings settings)
{
IStorage storage;
if (ConfigSectionValid(settings.CosmosDb.AuthKey))
if (ConfigSectionValid(settings?.CosmosDb?.AuthKey))
{
storage = new CosmosDbPartitionedStorage(settings.CosmosDb);
storage = new CosmosDbPartitionedStorage(settings?.CosmosDb);
}
else
{
Expand Down Expand Up @@ -143,20 +143,21 @@ public void ConfigureServices(IServiceCollection services)
services.AddSingleton<ChannelServiceHandler, SkillHandler>();

// Register telemetry client, initializers and middleware
services.AddApplicationInsightsTelemetry(settings.ApplicationInsights.InstrumentationKey);
services.AddApplicationInsightsTelemetry(settings?.ApplicationInsights?.InstrumentationKey ?? string.Empty);

services.AddSingleton<ITelemetryInitializer, OperationCorrelationTelemetryInitializer>();
services.AddSingleton<ITelemetryInitializer, TelemetryBotIdInitializer>();
services.AddSingleton<IBotTelemetryClient, BotTelemetryClient>();
services.AddSingleton<TelemetryLoggerMiddleware>(sp =>
{
var telemetryClient = sp.GetService<IBotTelemetryClient>();
return new TelemetryLoggerMiddleware(telemetryClient, logPersonalInformation: settings.Telemetry.LogPersonalInformation);
return new TelemetryLoggerMiddleware(telemetryClient, logPersonalInformation: settings?.Telemetry?.LogPersonalInformation ?? false);
});
services.AddSingleton<TelemetryInitializerMiddleware>(sp =>
{
var httpContextAccessor = sp.GetService<IHttpContextAccessor>();
var telemetryLoggerMiddleware = sp.GetService<TelemetryLoggerMiddleware>();
return new TelemetryInitializerMiddleware(httpContextAccessor, telemetryLoggerMiddleware, settings.Telemetry.LogActivities);
return new TelemetryInitializerMiddleware(httpContextAccessor, telemetryLoggerMiddleware, settings?.Telemetry?.LogActivities ?? false);
});

var storage = ConfigureStorage(settings);
Expand Down