Skip to content

Add scaler api for consumption plan support #963

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

Merged
AmeyaRele merged 12 commits into from
Jul 3, 2024
Merged

Add scaler api for consumption plan support #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4a32ed0
Add scaler api for consumption plan support
AmeyaRele Nov 3, 2023
7359ce1
Make scale method internal
AmeyaRele Nov 3, 2023
7a141c7
Merge branch 'main' into ameyarele/addscv3support
MaddyDev Jan 23, 2024
6ab82fa
Add test, resolve comments
AmeyaRele Feb 12, 2024
b0ea99a
Add packages for test
AmeyaRele Feb 12, 2024
a906365
Fix test
AmeyaRele Feb 13, 2024
91c9a69
Read from both appsettings and options
AmeyaRele Feb 14, 2024
72dcb0d
Merge branch 'main' into ameyarele/addscv3support
AmeyaRele Feb 15, 2024
cf9e72d
Merge branch 'main' into ameyarele/addscv3support
AmeyaRele May 30, 2024
6392487
Modify trigger listener params in test
AmeyaRele May 30, 2024
2e78231
Merge branch 'main' into ameyarele/addscv3support
AmeyaRele Jul 2, 2024
0ed4f9d
Fix indent
AmeyaRele Jul 3, 2024
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: 2 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<PackageVersion Include="Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator" Version="4.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0"/>
<PackageVersion Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="161.9123.0" />
<PackageVersion Include="Grpc.Net.Client" Version="2.63.0"/>

Expand All @@ -39,5 +40,6 @@

<PackageVersion Include="Azure.Identity" Version="1.10.2"/>
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.1.3" />
<PackageVersion Include="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.0" />
</ItemGroup>
</Project>
104 changes: 51 additions & 53 deletions performance/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,15 +318,6 @@
"Microsoft.Extensions.Azure": "1.6.3"
}
},
"Microsoft.Azure.WebJobs.Host.Storage": {
"type": "Transitive",
"resolved": "3.0.14",
"contentHash": "1M9VzF4/skqaFezaNI6QUo5ftI1ifGAc6TQfbDdi94lUkUcnSnlBq/uBzx1P73SQgY9WzIE0KZn2+DOx6CL9Sg==",
"dependencies": {
"Microsoft.Azure.WebJobs": "3.0.14",
"WindowsAzure.Storage": "9.3.1"
}
},
"Microsoft.Bcl.AsyncInterfaces": {
"type": "Transitive",
"resolved": "1.1.1",
Expand Down Expand Up @@ -422,18 +413,19 @@
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
"resolved": "2.1.1",
"contentHash": "LjVKO6P2y52c5ZhTLX/w8zc5H4Y3J/LJsgqTBj49TtFq/hAtVNue/WA0F6/7GMY90xhD7K0MDZ4qpOeWXbLvzg==",
"resolved": "5.0.0",
"contentHash": "LN322qEKHjuVEhhXueTUe7RNePooZmS8aGid5aK2woX3NPjSnONFyKUc6+JknOS6ce6h2tCLfKPTBXE3mN/6Ag==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "2.1.1"
"Microsoft.Extensions.Configuration.Abstractions": "5.0.0",
"Microsoft.Extensions.Primitives": "5.0.0"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
"type": "Transitive",
"resolved": "2.2.0",
"contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
"resolved": "5.0.0",
"contentHash": "ETjSBHMp3OAZ4HxGQYpwyGsD8Sw5FegQXphi0rpoGMT74S4+I2mm7XJEswwn59XAaKOzC15oDSOWEE8SzDCd6Q==",
"dependencies": {
"Microsoft.Extensions.Primitives": "2.2.0"
"Microsoft.Extensions.Primitives": "5.0.0"
}
},
"Microsoft.Extensions.Configuration.Binder": {
Expand All @@ -454,21 +446,14 @@
},
"Microsoft.Extensions.Configuration.FileExtensions": {
"type": "Transitive",
"resolved": "2.1.0",
"contentHash": "xvbjRAIo2Iwxk7vsMg49RwXPOOm5rtvr0frArvlg1uviS60ouVkOLouCNvOv/eRgWYINPbHAU9p//zEjit38Og==",
"dependencies": {
"Microsoft.Extensions.Configuration": "2.1.0",
"Microsoft.Extensions.FileProviders.Physical": "2.1.0"
}
},
"Microsoft.Extensions.Configuration.Json": {
"type": "Transitive",
"resolved": "2.1.0",
"contentHash": "9OCdAv7qiRtRlXQnECxW9zINUK8bYPKbNp5x8FQaLZbm/flv7mPvo1muZ1nsKGMZF4uL4Bl6nHw2v1fi3MqQ1Q==",
"resolved": "5.0.0",
"contentHash": "rRdspYKA18ViPOISwAihhCMbusHsARCOtDMwa23f+BGEdIjpKPlhs3LLjmKlxfhpGXBjIsS0JpXcChjRUN+PAw==",
"dependencies": {
"Microsoft.Extensions.Configuration": "2.1.0",
"Microsoft.Extensions.Configuration.FileExtensions": "2.1.0",
"Newtonsoft.Json": "11.0.2"
"Microsoft.Extensions.Configuration": "5.0.0",
"Microsoft.Extensions.Configuration.Abstractions": "5.0.0",
"Microsoft.Extensions.FileProviders.Abstractions": "5.0.0",
"Microsoft.Extensions.FileProviders.Physical": "5.0.0",
"Microsoft.Extensions.Primitives": "5.0.0"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
Expand All @@ -490,25 +475,26 @@
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
"resolved": "2.2.0",
"contentHash": "EcnaSsPTqx2MGnHrmWOD0ugbuuqVT8iICqSqPzi45V5/MA1LjUNb0kwgcxBGqizV1R+WeBK7/Gw25Jzkyk9bIw==",
"resolved": "5.0.0",
"contentHash": "iuZIiZ3mteEb+nsUqpGXKx2cGF+cv6gWPd5jqQI4hzqdiJ6I94ddLjKhQOuRW1lueHwocIw30xbSHGhQj0zjdQ==",
"dependencies": {
"Microsoft.Extensions.Primitives": "2.2.0"
"Microsoft.Extensions.Primitives": "5.0.0"
}
},
"Microsoft.Extensions.FileProviders.Physical": {
"type": "Transitive",
"resolved": "2.1.0",
"contentHash": "A9xLomqD4tNFqDfleapx2C14ZcSjCTzn/4Od0W/wBYdlLF2tYDJ204e75HjpWDVTkr03kgdZbM3QZ6ZeDsrBYg==",
"resolved": "5.0.0",
"contentHash": "1rkd8UO2qf21biwO7X0hL9uHP7vtfmdv/NLvKgCRHkdz1XnW8zVQJXyEYiN68WYpExgtVWn55QF0qBzgfh1mGg==",
"dependencies": {
"Microsoft.Extensions.FileProviders.Abstractions": "2.1.0",
"Microsoft.Extensions.FileSystemGlobbing": "2.1.0"
"Microsoft.Extensions.FileProviders.Abstractions": "5.0.0",
"Microsoft.Extensions.FileSystemGlobbing": "5.0.0",
"Microsoft.Extensions.Primitives": "5.0.0"
}
},
"Microsoft.Extensions.FileSystemGlobbing": {
"type": "Transitive",
"resolved": "2.1.0",
"contentHash": "JEwwhwbVTEXJu4W4l/FFx7FG9Fh5R8999mZl6qJImjM/LY4DxQsFYzpSkziMdY022n7TQpNUxJlH9bKZc7TqWw=="
"resolved": "5.0.0",
"contentHash": "ArliS8lGk8sWRtrWpqI8yUVYJpRruPjCDT+EIjrgkA/AAPRctlAkRISVZ334chAKktTLzD1+PK8F5IZpGedSqA=="
},
"Microsoft.Extensions.Hosting": {
"type": "Transitive",
Expand Down Expand Up @@ -586,12 +572,8 @@
},
"Microsoft.Extensions.Primitives": {
"type": "Transitive",
"resolved": "2.2.0",
"contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
"dependencies": {
"System.Memory": "4.5.1",
"System.Runtime.CompilerServices.Unsafe": "4.5.1"
}
"resolved": "5.0.0",
"contentHash": "cI/VWn9G1fghXrNDagX9nYaaB/nokkZn0HYAawGaELQrl8InSezfe9OnfPZLcJq3esXxygh3hkq2c3qoV3SDyQ=="
},
"Microsoft.Identity.Client": {
"type": "Transitive",
Expand Down Expand Up @@ -1811,15 +1793,6 @@
"System.Xml.ReaderWriter": "4.3.0"
}
},
"WindowsAzure.Storage": {
"type": "Transitive",
"resolved": "9.3.1",
"contentHash": "NooNF4glP6BO7U4dno/xSfiEVVIv6OFcFfisX24Us2CZa9NQR3TSVEj9eVUlM5rLat5H9CHxk6M/mNSIaq7Vrw==",
"dependencies": {
"NETStandard.Library": "1.6.1",
"Newtonsoft.Json": "10.0.2"
}
},
"xunit.abstractions": {
"type": "Transitive",
"resolved": "2.0.3",
Expand Down Expand Up @@ -1892,6 +1865,8 @@
"Microsoft.Azure.Functions.Extensions": "[1.1.0, )",
"Microsoft.Azure.WebJobs.Extensions.Sql": "[99.99.99, )",
"Microsoft.Azure.WebJobs.Extensions.Sql.Samples": "[1.0.0, )",
"Microsoft.Azure.WebJobs.Host.Storage": "[5.0.0, )",
"Microsoft.Extensions.Configuration.Json": "[5.0.0, )",
"Microsoft.Extensions.DependencyInjection": "[6.0.1, )",
"Microsoft.NET.Sdk.Functions": "[4.4.0, )",
"Microsoft.NET.Test.Sdk": "[17.10.0, )",
Expand Down Expand Up @@ -2002,6 +1977,17 @@
"Microsoft.Azure.WebJobs.Extensions.Storage.Queues": "5.1.3"
}
},
"Microsoft.Azure.WebJobs.Host.Storage": {
"type": "CentralTransitive",
"requested": "[5.0.0, )",
"resolved": "5.0.0",
"contentHash": "GzlFeDj9zsjOAmswk72sHV67YNcls9c03Y7lJBVC96R4P+XmDviSS9wRkidjR0VnLi1wGIKU109wvYEC3j6UoA==",
"dependencies": {
"Azure.Storage.Blobs": "12.13.0",
"Microsoft.Azure.WebJobs": "3.0.37",
"Microsoft.Extensions.Azure": "1.1.1"
}
},
"Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator": {
"type": "CentralTransitive",
"requested": "[4.0.1, )",
Expand Down Expand Up @@ -2032,6 +2018,18 @@
"System.Text.Encodings.Web": "6.0.0"
}
},
"Microsoft.Extensions.Configuration.Json": {
"type": "CentralTransitive",
"requested": "[5.0.0, )",
"resolved": "5.0.0",
"contentHash": "Pak8ymSUfdzPfBTLHxeOwcR32YDbuVfhnH2hkfOLnJNQd19ItlBdpMjIDY9C5O/nS2Sn9bzDMai0ZrvF7KyY/Q==",
"dependencies": {
"Microsoft.Extensions.Configuration": "5.0.0",
"Microsoft.Extensions.Configuration.Abstractions": "5.0.0",
"Microsoft.Extensions.Configuration.FileExtensions": "5.0.0",
"Microsoft.Extensions.FileProviders.Abstractions": "5.0.0"
}
},
"Microsoft.Extensions.DependencyInjection": {
"type": "CentralTransitive",
"requested": "[6.0.1, )",
Expand Down
40 changes: 21 additions & 19 deletions samples/samples-csharp/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,15 +333,6 @@
"Microsoft.Extensions.Azure": "1.6.3"
}
},
"Microsoft.Azure.WebJobs.Host.Storage": {
"type": "Transitive",
"resolved": "3.0.14",
"contentHash": "1M9VzF4/skqaFezaNI6QUo5ftI1ifGAc6TQfbDdi94lUkUcnSnlBq/uBzx1P73SQgY9WzIE0KZn2+DOx6CL9Sg==",
"dependencies": {
"Microsoft.Azure.WebJobs": "3.0.14",
"WindowsAzure.Storage": "9.3.1"
}
},
"Microsoft.Bcl.AsyncInterfaces": {
"type": "Transitive",
"resolved": "1.1.1",
Expand Down Expand Up @@ -427,16 +418,6 @@
"Microsoft.Extensions.FileProviders.Physical": "2.1.0"
}
},
"Microsoft.Extensions.Configuration.Json": {
"type": "Transitive",
"resolved": "2.1.0",
"contentHash": "9OCdAv7qiRtRlXQnECxW9zINUK8bYPKbNp5x8FQaLZbm/flv7mPvo1muZ1nsKGMZF4uL4Bl6nHw2v1fi3MqQ1Q==",
"dependencies": {
"Microsoft.Extensions.Configuration": "2.1.0",
"Microsoft.Extensions.Configuration.FileExtensions": "2.1.0",
"Newtonsoft.Json": "11.0.2"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "Transitive",
"resolved": "2.2.0",
Expand Down Expand Up @@ -1788,6 +1769,16 @@
"System.Threading.Tasks.Dataflow": "4.8.0"
}
},
"Microsoft.Azure.WebJobs.Host.Storage": {
"type": "CentralTransitive",
"requested": "[5.0.0, )",
"resolved": "3.0.14",
"contentHash": "1M9VzF4/skqaFezaNI6QUo5ftI1ifGAc6TQfbDdi94lUkUcnSnlBq/uBzx1P73SQgY9WzIE0KZn2+DOx6CL9Sg==",
"dependencies": {
"Microsoft.Azure.WebJobs": "3.0.14",
"WindowsAzure.Storage": "9.3.1"
}
},
"Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator": {
"type": "CentralTransitive",
"requested": "[4.0.1, )",
Expand Down Expand Up @@ -1818,6 +1809,17 @@
"System.Text.Encodings.Web": "6.0.0"
}
},
"Microsoft.Extensions.Configuration.Json": {
"type": "CentralTransitive",
"requested": "[5.0.0, )",
"resolved": "2.1.0",
"contentHash": "9OCdAv7qiRtRlXQnECxW9zINUK8bYPKbNp5x8FQaLZbm/flv7mPvo1muZ1nsKGMZF4uL4Bl6nHw2v1fi3MqQ1Q==",
"dependencies": {
"Microsoft.Extensions.Configuration": "2.1.0",
"Microsoft.Extensions.Configuration.FileExtensions": "2.1.0",
"Newtonsoft.Json": "11.0.2"
}
},
"Microsoft.Extensions.DependencyInjection": {
"type": "CentralTransitive",
"requested": "[6.0.1, )",
Expand Down
23 changes: 12 additions & 11 deletions samples/samples-outofproc/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,17 +268,6 @@
"Microsoft.Extensions.Primitives": "5.0.0"
}
},
"Microsoft.Extensions.Configuration.Json": {
"type": "Transitive",
"resolved": "5.0.0",
"contentHash": "Pak8ymSUfdzPfBTLHxeOwcR32YDbuVfhnH2hkfOLnJNQd19ItlBdpMjIDY9C5O/nS2Sn9bzDMai0ZrvF7KyY/Q==",
"dependencies": {
"Microsoft.Extensions.Configuration": "5.0.0",
"Microsoft.Extensions.Configuration.Abstractions": "5.0.0",
"Microsoft.Extensions.Configuration.FileExtensions": "5.0.0",
"Microsoft.Extensions.FileProviders.Abstractions": "5.0.0"
}
},
"Microsoft.Extensions.Configuration.UserSecrets": {
"type": "Transitive",
"resolved": "5.0.0",
Expand Down Expand Up @@ -597,6 +586,18 @@
"resolved": "1.3.0",
"contentHash": "+6+/Yb/ouWUweaSQhesbbiIVSmwYEzkSfjIHrBnNqIiCYnx2iLeoYyWjN/wHP3Fnn5COtyDXRDwHKr5A/tCL9Q=="
},
"Microsoft.Extensions.Configuration.Json": {
"type": "CentralTransitive",
"requested": "[5.0.0, )",
"resolved": "5.0.0",
"contentHash": "Pak8ymSUfdzPfBTLHxeOwcR32YDbuVfhnH2hkfOLnJNQd19ItlBdpMjIDY9C5O/nS2Sn9bzDMai0ZrvF7KyY/Q==",
"dependencies": {
"Microsoft.Extensions.Configuration": "5.0.0",
"Microsoft.Extensions.Configuration.Abstractions": "5.0.0",
"Microsoft.Extensions.Configuration.FileExtensions": "5.0.0",
"Microsoft.Extensions.FileProviders.Abstractions": "5.0.0"
}
},
"Microsoft.Extensions.DependencyInjection": {
"type": "CentralTransitive",
"requested": "[6.0.1, )",
Expand Down
18 changes: 18 additions & 0 deletions src/SqlBindingExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Azure.WebJobs.Host.Scale;

namespace Microsoft.Azure.WebJobs.Extensions.Sql
{
Expand All @@ -28,5 +29,22 @@ public static IWebJobsBuilder AddSql(this IWebJobsBuilder builder, Action<SqlOpt

return builder;
}

internal static IWebJobsBuilder AddSqlScaleForTrigger(this IWebJobsBuilder builder, TriggerMetadata triggerMetadata)
{
IServiceProvider serviceProvider = null;
var scalerProvider = new Lazy<SqlScalerProvider>(() => new SqlScalerProvider(serviceProvider, triggerMetadata));
builder.Services.AddSingleton((Func<IServiceProvider, IScaleMonitorProvider>)delegate (IServiceProvider resolvedServiceProvider)
{
Comment thread
AmeyaRele marked this conversation as resolved.
serviceProvider = serviceProvider ?? resolvedServiceProvider;
return scalerProvider.Value;
});
builder.Services.AddSingleton((Func<IServiceProvider, ITargetScalerProvider>)delegate (IServiceProvider resolvedServiceProvider)
{
serviceProvider = serviceProvider ?? resolvedServiceProvider;
return scalerProvider.Value;
});
return builder;
}
}
}
Loading