Skip to content

Limit frequency of feature last-used time updates #133004

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
merged 12 commits into from
Aug 19, 2025
Merged

Limit frequency of feature last-used time updates #133004

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
ea8a9ce
Only update a feature's lastUsed time every ten seconds
joegallo Aug 15, 2025
3657ad9
Update docs/changelog/133004.yaml
joegallo Aug 15, 2025
b0c7f0b
Merge branch 'main' into update-feature-usage-less-frequently
joegallo Aug 17, 2025
bfdeb0c
Simplify the logic -- only update if it has increased
joegallo Aug 17, 2025
8586fc1
Rewrite this comment
joegallo Aug 17, 2025
0c95040
Rewrite the tests
joegallo Aug 17, 2025
b511c50
Do the time check before doing the map get
joegallo Aug 17, 2025
27de051
Tweak the comment to explain the reason
joegallo Aug 18, 2025
e4bf3e1
Merge branch 'main' into update-feature-usage-less-frequently
joegallo Aug 18, 2025
262263b
Update changelog to match PR title
joegallo Aug 18, 2025
3502fa1
Update docs/changelog/133004.yaml
joegallo Aug 19, 2025
f298a36
Merge branch 'main' into update-feature-usage-less-frequently
joegallo Aug 19, 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
5 changes: 5 additions & 0 deletions docs/changelog/133004.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 133004
summary: Limit frequency of feature last-used time updates
area: License
type: bug
issues: []
8 changes: 7 additions & 1 deletion x-pack/plugin/core/src/main/java/org/elasticsearch/license/XPackLicenseState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,13 @@ public String statusDescription() {

void featureUsed(LicensedFeature feature) {
checkExpiry();
usage.put(new FeatureUsage(feature, null), epochMillisProvider.getAsLong());
final long now = epochMillisProvider.getAsLong();
final FeatureUsage feat = new FeatureUsage(feature, null);
final Long mostRecent = usage.get(feat);
// only update if needed, to prevent ConcurrentHashMap lock-contention on writes
if (mostRecent == null || now > mostRecent) {
usage.put(feat, now);
}
}

void enableUsageTracking(LicensedFeature feature, String contextName) {
Expand Down
7 changes: 7 additions & 0 deletions x-pack/plugin/core/src/test/java/org/elasticsearch/license/XPackLicenseStateTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,13 @@ public void testLastUsedMomentaryFeature() {
lastUsed = licenseState.getLastUsed();
assertThat("feature.check updates usage", lastUsed.keySet(), containsInAnyOrder(usage));
assertThat(lastUsed.get(usage), equalTo(200L));

// updates to the last used timestamp only happen if the time has increased
currentTime.set(199);
goldFeature.check(licenseState);
lastUsed = licenseState.getLastUsed();
assertThat("feature.check updates usage", lastUsed.keySet(), containsInAnyOrder(usage));
assertThat(lastUsed.get(usage), equalTo(200L));
}

public void testLastUsedMomentaryFeatureWithSameNameDifferentFamily() {
Expand Down