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 Singleton Metrics Provider for Listener #285

Merged
merged 12 commits into from
Feb 12, 2025
Merged

Use Singleton Metrics Provider for Listener #285

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b7e7995
initial commit
nytian Feb 10, 2025
62fca50
update version
nytian Feb 10, 2025
309526e
add nullable makr
nytian Feb 10, 2025
83a9554
udpate test
nytian Feb 11, 2025
47cdece
remove back to v1.5.1
nytian Feb 11, 2025
c0b2720
Fix typo in CHANGELOG.md entry
nytian Feb 11, 2025
16e4bf5
Update Directory.Packages.props
nytian Feb 11, 2025
349156c
update scalemonitor and target scaler per functionid
nytian Feb 11, 2025
fbb899a
update comments
nytian Feb 11, 2025
89de7d9
update by comments:
nytian Feb 11, 2025
5c161b8
add query metrics throttle
nytian Feb 11, 2025
d95d8ca
refactor code a little bit:
nytian Feb 11, 2025
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Changelog

## v1.5.1 (Unreleased)
## v1.5.1

### Updates

* Use Singelton metrics provider instead of IScaleMonitor and ITargetScaler ([#285]https://github.com/microsoft/durabletask-mssql/pull/285)
* Updated repo to use central package management
* Resolved multiple CVEs in dependencies

Expand Down
Binary file modified Directory.Packages.props
View file
Open in desktop
Binary file not shown.
21 changes: 8 additions & 13 deletions src/DurableTask.SqlServer.AzureFunctions/SqlDurabilityProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ class SqlDurabilityProvider : DurabilityProvider
readonly SqlDurabilityOptions durabilityOptions;
readonly SqlOrchestrationService service;

SqlScaleMonitor? scaleMonitor;
#if FUNCTIONS_V4
SqlTargetScaler? targetScaler;
#endif
SqlMetricsProvider? singletonSqlMetricsProvider;

public SqlDurabilityProvider(
SqlOrchestrationService service,
Expand Down Expand Up @@ -200,13 +197,12 @@ public override bool TryGetScaleMonitor(
string storageConnectionString,
out IScaleMonitor scaleMonitor)
{
if (this.scaleMonitor == null)
if (this.singletonSqlMetricsProvider == null)
{
var sqlMetricsProvider = new SqlMetricsProvider(this.service);
this.scaleMonitor = new SqlScaleMonitor(hubName, sqlMetricsProvider);
this.singletonSqlMetricsProvider = new SqlMetricsProvider(this.service);
Copy link
Member

Choose a reason for hiding this comment

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

One last thing. I recall the final fix that Alexey made to the Azure Storage metrics provider was to throttle it so that we only fetch metrics once every few seconds or so. This is how we ensured that we don't have too many storage transactions, even if the app has a lot of triggers. I think it will be important to do that for the SqlMetricsProvider too so that we don't overwhelm the customer's database with expensive SQL queries.

}

scaleMonitor = this.scaleMonitor;
scaleMonitor = new SqlScaleMonitor(hubName, this.singletonSqlMetricsProvider);

return true;
}

Expand All @@ -218,13 +214,12 @@ public override bool TryGetTargetScaler(
string connectionName,
out ITargetScaler targetScaler)
{
if (this.targetScaler == null)
if (this.singletonSqlMetricsProvider == null)
{
var sqlMetricsProvider = new SqlMetricsProvider(this.service);
this.targetScaler = new SqlTargetScaler(hubName, sqlMetricsProvider);
this.singletonSqlMetricsProvider = new SqlMetricsProvider(this.service);
}

targetScaler = this.targetScaler;
targetScaler = new SqlTargetScaler(hubName, this.singletonSqlMetricsProvider);
return true;
}
#endif
Expand Down
Loading