SERVER-67728 Use FeatureFlagUtil in timeseries jstests

10 files changed, 29 insertions, 24 deletions

diff --git a/jstests/core/timeseries/partialFilterExpression_with_internalBucketGeoWithin.js b/jstests/core/timeseries/partialFilterExpression_with_internalBucketGeoWithin.js
index 5be75d79e28..61521e7f86e 100644
--- a/jstests/core/timeseries/partialFilterExpression_with_internalBucketGeoWithin.js
+++ b/jstests/core/timeseries/partialFilterExpression_with_internalBucketGeoWithin.js
@@ -10,12 +10,11 @@
  */
 
 load("jstests/libs/analyze_plan.js");
+load("jstests/libs/feature_flag_util.js");
 load('jstests/noPassthrough/libs/index_build.js');
-(function() {
-const isFeatureEnabled = db.adminCommand({getParameter: 1, featureFlagTimeseriesMetricIndexes: 1})
-                             .featureFlagTimeseriesMetricIndexes.value;
 
-if (isFeatureEnabled) {
+(function() {
+if (FeatureFlagUtil.isEnabled(db, "TimeseriesMetricIndexes")) {
     const timeFieldName = "timestamp";
 
     const coll = db.partialFilterExpression_with_internalBucketGeoWithin;
diff --git a/jstests/core/timeseries/timeseries_delete_hint.js b/jstests/core/timeseries/timeseries_delete_hint.js
index cf8edf3b70d..bb03e56e650 100644
--- a/jstests/core/timeseries/timeseries_delete_hint.js
+++ b/jstests/core/timeseries/timeseries_delete_hint.js
@@ -16,11 +16,11 @@
 (function() {
 "use strict";
 
-load("jstests/core/timeseries/libs/timeseries.js");
 load("jstests/libs/curop_helpers.js");
+load("jstests/libs/feature_flag_util.js");
 load('jstests/libs/parallel_shell_helpers.js');
 
-if (!TimeseriesTest.timeseriesUpdatesAndDeletesEnabled(db.getMongo())) {
+if (!FeatureFlagUtil.isEnabled(db, "TimeseriesUpdatesAndDeletes")) {
     jsTestLog("Skipping test because the time-series updates and deletes feature flag is disabled");
     return;
 }
diff --git a/jstests/core/timeseries/timeseries_geonear_measurements.js b/jstests/core/timeseries/timeseries_geonear_measurements.js
index 5c5427a02d1..abbf7db9596 100644
--- a/jstests/core/timeseries/timeseries_geonear_measurements.js
+++ b/jstests/core/timeseries/timeseries_geonear_measurements.js
@@ -23,10 +23,10 @@
 (function() {
 "use strict";
 
-load("jstests/core/timeseries/libs/timeseries.js");
 load("jstests/libs/analyze_plan.js");
+load("jstests/libs/feature_flag_util.js");
 
-if (!TimeseriesTest.timeseriesMetricIndexesEnabled(db.getMongo())) {
+if (!FeatureFlagUtil.isEnabled(db, "TimeseriesMetricIndexes")) {
     jsTestLog(
         "Skipped test as the featureFlagTimeseriesMetricIndexes feature flag is not enabled.");
     return;
diff --git a/jstests/core/timeseries/timeseries_index.js b/jstests/core/timeseries/timeseries_index.js
index 86bf86eb479..711d072164c 100644
--- a/jstests/core/timeseries/timeseries_index.js
+++ b/jstests/core/timeseries/timeseries_index.js
@@ -9,8 +9,9 @@
 (function() {
 "use strict";
 
-load("jstests/libs/fixture_helpers.js");
 load("jstests/core/timeseries/libs/timeseries.js");
+load("jstests/libs/feature_flag_util.js");
+load("jstests/libs/fixture_helpers.js");
 
 TimeseriesTest.run((insert) => {
     const collNamePrefix = 'timeseries_index_';
@@ -63,7 +64,7 @@ TimeseriesTest.run((insert) => {
 
         // When the collection is sharded, there is 1 extra index for the shard key.
         const numExtraIndexes = (FixtureHelpers.isSharded(bucketsColl) ? 1 : 0) +
-            (TimeseriesTest.timeseriesScalabilityImprovementsEnabled(db) ? 1 : 0);
+            (FeatureFlagUtil.isEnabled(db, "TimeseriesScalabilityImprovements") ? 1 : 0);
         {
             const indexes = bucketsColl.getIndexes();
             assert.eq(numExtraIndexes,
@@ -224,7 +225,7 @@ TimeseriesTest.run((insert) => {
     runTest({[metaFieldName + '.location']: "2d", [metaFieldName + '.tag1']: -1},
             {'meta.location': "2d", 'meta.tag1': -1});
 
-    if (TimeseriesTest.timeseriesMetricIndexesEnabled(db.getMongo())) {
+    if (FeatureFlagUtil.isEnabled(db, "TimeseriesMetricIndexes")) {
         // Measurement 2dsphere index
         runTest({'loc': '2dsphere'}, {'data.loc': '2dsphere_bucket'});
     }
@@ -241,7 +242,7 @@ TimeseriesTest.run((insert) => {
         coll.getName(), {timeseries: {timeField: timeFieldName, metaField: metaFieldName}}));
     assert.commandWorked(insert(coll, doc), 'failed to insert doc: ' + tojson(doc));
 
-    if (!TimeseriesTest.timeseriesMetricIndexesEnabled(db.getMongo())) {
+    if (!FeatureFlagUtil.isEnabled(db, "TimeseriesMetricIndexes")) {
         // Reject index keys that do not include the metadata field.
         assert.commandFailedWithCode(coll.createIndex({not_metadata: 1}),
                                      ErrorCodes.CannotCreateIndex);
@@ -264,7 +265,7 @@ TimeseriesTest.run((insert) => {
                                      [ErrorCodes.CannotCreateIndex, ErrorCodes.InvalidOptions]);
     };
 
-    if (!TimeseriesTest.timeseriesMetricIndexesEnabled(db.getMongo())) {
+    if (!FeatureFlagUtil.isEnabled(db, "TimeseriesMetricIndexes")) {
         // Partial indexes are not supported on time-series collections if the time-series metric
         // feature flag is disabled.
         testCreateIndexFailed({[metaFieldName]: 1}, {partialFilterExpression: {meta: {$gt: 5}}});
@@ -287,7 +288,7 @@ TimeseriesTest.run((insert) => {
     assert.commandWorked(bucketsColl.createIndex({not_metadata: 1}),
                          'failed to create index: ' + tojson({not_metadata: 1}));
     const numExtraIndexes = (FixtureHelpers.isSharded(bucketsColl) ? 1 : 0) +
-        (TimeseriesTest.timeseriesScalabilityImprovementsEnabled(db) ? 1 : 0);
+        (FeatureFlagUtil.isEnabled(db, "TimeseriesScalabilityImprovements") ? 1 : 0);
     assert.eq(
         1 + numExtraIndexes, bucketsColl.getIndexes().length, tojson(bucketsColl.getIndexes()));
     assert.eq(0 + numExtraIndexes, coll.getIndexes().length, tojson(coll.getIndexes()));
diff --git a/jstests/core/timeseries/timeseries_index_partial.js b/jstests/core/timeseries/timeseries_index_partial.js
index 1d2eed7913a..bf61bbe8ce8 100644
--- a/jstests/core/timeseries/timeseries_index_partial.js
+++ b/jstests/core/timeseries/timeseries_index_partial.js
@@ -12,10 +12,10 @@
 (function() {
 "use strict";
 
-load("jstests/core/timeseries/libs/timeseries.js");
 load("jstests/libs/analyze_plan.js");
+load("jstests/libs/feature_flag_util.js");
 
-if (!TimeseriesTest.timeseriesMetricIndexesEnabled(db.getMongo())) {
+if (!FeatureFlagUtil.isEnabled(db, "TimeseriesMetricIndexes")) {
     jsTestLog(
         "Skipped test as the featureFlagTimeseriesMetricIndexes feature flag is not enabled.");
     return;
@@ -47,7 +47,7 @@ if (FixtureHelpers.isSharded(buckets)) {
     });
 }
 
-if (TimeseriesTest.timeseriesScalabilityImprovementsEnabled(db)) {
+if (FeatureFlagUtil.isEnabled(db, "TimeseriesScalabilityImprovements")) {
     // When enabled, the {meta: 1, time: 1} index gets built by default on the time-series
     // bucket collection.
     extraIndexes.push({
diff --git a/jstests/core/timeseries/timeseries_index_spec.js b/jstests/core/timeseries/timeseries_index_spec.js
index 13377cc9ab7..9ce5d524f8a 100644
--- a/jstests/core/timeseries/timeseries_index_spec.js
+++ b/jstests/core/timeseries/timeseries_index_spec.js
@@ -14,6 +14,7 @@
 "use strict";
 
 load("jstests/core/timeseries/libs/timeseries.js");
+load("jstests/libs/feature_flag_util.js");
 
 TimeseriesTest.run(() => {
     const collName = "timeseries_index_spec";
@@ -83,7 +84,7 @@ TimeseriesTest.run(() => {
                                           {name: "time_meta_field_downgradable"}));
     verifyAndDropIndex(/*shouldHaveOriginalSpec=*/false, "time_meta_field_downgradable");
 
-    if (TimeseriesTest.timeseriesMetricIndexesEnabled(db.getMongo())) {
+    if (FeatureFlagUtil.isEnabled(db, "TimeseriesMetricIndexes")) {
         assert.commandWorked(coll.createIndex({x: 1}, {name: "x_1"}));
         verifyAndDropIndex(/*shouldHaveOriginalSpec=*/true, "x_1");
 
@@ -108,7 +109,7 @@ TimeseriesTest.run(() => {
     // Creating an index directly on the buckets collection is permitted. However, these types of
     // index creations will not have an "originalSpec" field and rely on the reverse mapping
     // mechanism.
-    if (TimeseriesTest.timeseriesMetricIndexesEnabled(db.getMongo())) {
+    if (FeatureFlagUtil.isEnabled(db, "TimeseriesMetricIndexes")) {
         assert.commandWorked(
             bucketsColl.createIndex({"control.min.y": 1, "control.max.y": 1}, {name: "y"}));
 
diff --git a/jstests/core/timeseries/timeseries_metric_index_2dsphere.js b/jstests/core/timeseries/timeseries_metric_index_2dsphere.js
index d0a8b387598..af9a696d8ce 100644
--- a/jstests/core/timeseries/timeseries_metric_index_2dsphere.js
+++ b/jstests/core/timeseries/timeseries_metric_index_2dsphere.js
@@ -16,8 +16,9 @@
 
 load("jstests/core/timeseries/libs/timeseries.js");
 load("jstests/libs/analyze_plan.js");
+load("jstests/libs/feature_flag_util.js");
 
-if (!TimeseriesTest.timeseriesMetricIndexesEnabled(db.getMongo())) {
+if (!FeatureFlagUtil.isEnabled(db, "TimeseriesMetricIndexes")) {
     return;
 }
 
diff --git a/jstests/core/timeseries/timeseries_metric_index_ascending_descending.js b/jstests/core/timeseries/timeseries_metric_index_ascending_descending.js
index 223cf746b4f..d73aae26dc8 100644
--- a/jstests/core/timeseries/timeseries_metric_index_ascending_descending.js
+++ b/jstests/core/timeseries/timeseries_metric_index_ascending_descending.js
@@ -11,9 +11,10 @@
 "use strict";
 
 load("jstests/core/timeseries/libs/timeseries.js");
+load("jstests/libs/feature_flag_util.js");
 load("jstests/libs/fixture_helpers.js");
 
-if (!TimeseriesTest.timeseriesMetricIndexesEnabled(db.getMongo())) {
+if (!FeatureFlagUtil.isEnabled(db, "TimeseriesMetricIndexes")) {
     jsTestLog(
         "Skipped test as the featureFlagTimeseriesMetricIndexes feature flag is not enabled.");
     return;
@@ -157,7 +158,7 @@ TimeseriesTest.run((insert) => {
     // time-series scalability improvements are enabled, the {meta: 1, time: 1} index gets built by
     // default on the time-series bucket collection.
     const numExtraIndexes = (FixtureHelpers.isSharded(bucketsColl) ? 1 : 0) +
-        (TimeseriesTest.timeseriesScalabilityImprovementsEnabled(db) ? 1 : 0);
+        (FeatureFlagUtil.isEnabled(db, "TimeseriesScalabilityImprovements") ? 1 : 0);
 
     userIndexes = coll.getIndexes();
     assert.eq(numExtraIndexes, userIndexes.length);
diff --git a/jstests/core/timeseries/timeseries_metric_index_compound.js b/jstests/core/timeseries/timeseries_metric_index_compound.js
index 76051e62456..cc15e06a871 100644
--- a/jstests/core/timeseries/timeseries_metric_index_compound.js
+++ b/jstests/core/timeseries/timeseries_metric_index_compound.js
@@ -11,8 +11,9 @@
 "use strict";
 
 load("jstests/core/timeseries/libs/timeseries.js");
+load("jstests/libs/feature_flag_util.js");
 
-if (!TimeseriesTest.timeseriesMetricIndexesEnabled(db.getMongo())) {
+if (!FeatureFlagUtil.isEnabled(db, "TimeseriesMetricIndexes")) {
     jsTestLog(
         "Skipped test as the featureFlagTimeseriesMetricIndexes feature flag is not enabled.");
     return;
diff --git a/jstests/core/timeseries/timeseries_sparse_index.js b/jstests/core/timeseries/timeseries_sparse_index.js
index 4f0c3e96e43..1c16ffed959 100644
--- a/jstests/core/timeseries/timeseries_sparse_index.js
+++ b/jstests/core/timeseries/timeseries_sparse_index.js
@@ -11,8 +11,9 @@
 "use strict";
 
 load("jstests/core/timeseries/libs/timeseries.js");
+load("jstests/libs/feature_flag_util.js");
 
-if (!TimeseriesTest.timeseriesMetricIndexesEnabled(db.getMongo())) {
+if (!FeatureFlagUtil.isEnabled(db, "TimeseriesMetricIndexes")) {
     jsTestLog(
         "Skipped test as the featureFlagTimeseriesMetricIndexes feature flag is not enabled.");
     return;