Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use PostConfigure for InitialOffsetOptions #17778

Merged
2 commits merged into from
Jan 5, 2021
Merged

Use PostConfigure for InitialOffsetOptions #17778

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f5568b
Use PostConfigure for InitialOffsetOptions
JoshLove-msft Jan 5, 2021
903c542
Add test-resources-post script
JoshLove-msft Jan 5, 2021
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
2 changes: 1 addition & 1 deletion ...crosoft.Azure.WebJobs.Extensions.EventHubs/src/Config/EventHubWebJobsBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static IWebJobsBuilder AddEventHubs(this IWebJobsBuilder builder, Action<
builder.Services.AddAzureClientsCore();
builder.Services.AddSingleton<EventHubClientFactory>();
builder.Services.Configure<EventHubOptions>(configure);
builder.Services.Configure<EventHubOptions>(ConfigureInitialOffsetOptions);
builder.Services.PostConfigure<EventHubOptions>(ConfigureInitialOffsetOptions);

return builder;
}
Expand Down
83 changes: 82 additions & 1 deletion sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/tests/EventHubTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Globalization;
using System.Text;
using Azure.Messaging.EventHubs;
using Azure.Messaging.EventHubs.Consumer;
Expand Down Expand Up @@ -202,7 +203,8 @@ public void InitializeFromHostMetadata()
{ "AzureWebJobs:extensions:EventHubs:EventProcessorOptions:PrefetchCount", "200" },
{ "AzureWebJobs:extensions:EventHubs:BatchCheckpointFrequency", "5" },
{ "AzureWebJobs:extensions:EventHubs:PartitionManagerOptions:LeaseDuration", "00:00:31" },
{ "AzureWebJobs:extensions:EventHubs:PartitionManagerOptions:RenewInterval", "00:00:21" }
{ "AzureWebJobs:extensions:EventHubs:PartitionManagerOptions:RenewInterval", "00:00:21" },
{ "AzureWebJobs:extensions:EventHubs:InitialOffsetOptions:Type", "FromEnd" },
});
})
.Build();
Expand All @@ -217,6 +219,85 @@ public void InitializeFromHostMetadata()
Assert.AreEqual(100, options.MaxBatchSize);
Assert.AreEqual(31, options.EventProcessorOptions.PartitionOwnershipExpirationInterval.TotalSeconds);
Assert.AreEqual(21, options.EventProcessorOptions.LoadBalancingUpdateInterval.TotalSeconds);
Assert.AreEqual(EventPosition.Latest, eventProcessorOptions.DefaultStartingPosition);
}

[Test]
public void InitializeFromCodeRespectsFinalOffsetOptions_FromStart()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice.

{
IHost host = new HostBuilder()
.ConfigureDefaultTestHost(builder =>
{
builder.AddEventHubs(options => options.InitialOffsetOptions.Type = "FromEnd");
})
.ConfigureServices(services =>
{
services.Configure<EventHubOptions>(options =>
{
options.InitialOffsetOptions.Type = "FromStart";
});
})
.Build();

// Force the ExtensionRegistryFactory to run, which will initialize the EventHubConfiguration.
var extensionRegistry = host.Services.GetService<IExtensionRegistry>();
var options = host.Services.GetService<IOptions<EventHubOptions>>().Value;

var eventProcessorOptions = options.EventProcessorOptions;
Assert.AreEqual(EventPosition.Earliest, eventProcessorOptions.DefaultStartingPosition);
}

[Test]
public void InitializeFromCodeRespectsFinalOffsetOptions_FromEnd()
{
var host = new HostBuilder()
.ConfigureDefaultTestHost(builder =>
{
builder.AddEventHubs(options => options.InitialOffsetOptions.Type = "FromStart");
})
.ConfigureServices(services =>
{
services.Configure<EventHubOptions>(options =>
{
options.InitialOffsetOptions.Type = "FromEnd";
});
})
.Build();

// Force the ExtensionRegistryFactory to run, which will initialize the EventHubConfiguration.
var extensionRegistry = host.Services.GetService<IExtensionRegistry>();
var options = host.Services.GetService<IOptions<EventHubOptions>>().Value;

var eventProcessorOptions = options.EventProcessorOptions;
Assert.AreEqual(EventPosition.Latest, eventProcessorOptions.DefaultStartingPosition);
}

[Test]
public void InitializeFromCodeRespectsFinalOffsetOptions_FromEnqueuedTime()
{
var host = new HostBuilder()
.ConfigureDefaultTestHost(builder =>
{
builder.AddEventHubs(options => options.InitialOffsetOptions.Type = "FromStart");
})
.ConfigureServices(services =>
{
services.Configure<EventHubOptions>(options =>
{
options.InitialOffsetOptions.Type = "FromEnqueuedTime";
options.InitialOffsetOptions.EnqueuedTimeUTC = DateTimeOffset.UtcNow.ToString();
});
})
.Build();

// Force the ExtensionRegistryFactory to run, which will initialize the EventHubConfiguration.
var extensionRegistry = host.Services.GetService<IExtensionRegistry>();
var options = host.Services.GetService<IOptions<EventHubOptions>>().Value;

var eventProcessorOptions = options.EventProcessorOptions;
Assert.AreEqual(
EventPosition.FromEnqueuedTime(DateTime.Parse(options.InitialOffsetOptions.EnqueuedTimeUTC,
CultureInfo.InvariantCulture).ToUniversalTime()), eventProcessorOptions.DefaultStartingPosition);
}

internal static EventProcessorHostPartition GetPartitionContext(string partitionId = "0", string eventHubPath = "path",
Expand Down