Skip to content

Commit 91a3694

Browse files
committed
Use integer agentless polling durations
1 parent 814dfbf commit 91a3694

5 files changed

Lines changed: 15 additions & 16 deletions

File tree

dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,9 @@ public final class ConfigDefaults {
5050
static final String DEFAULT_SITE = "datadoghq.com";
5151

5252
public static final String DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE = "agentless";
53-
public static final double DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS =
54-
30.0D;
55-
public static final double DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS =
56-
2.0D;
53+
public static final int DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS = 30;
54+
public static final int DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS =
55+
2;
5756

5857
static final boolean DEFAULT_CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT = false;
5958
static final int DEFAULT_CODE_ORIGIN_MAX_USER_FRAMES = 8;

internal-api/src/main/java/datadog/trace/api/Config.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,8 +1222,8 @@ public static String getHostName() {
12221222

12231223
private final String featureFlaggingConfigurationSource;
12241224
private final String featureFlaggingConfigurationSourceAgentlessBaseUrl;
1225-
private final double featureFlaggingConfigurationSourcePollIntervalSeconds;
1226-
private final double featureFlaggingConfigurationSourceRequestTimeoutSeconds;
1225+
private final int featureFlaggingConfigurationSourcePollIntervalSeconds;
1226+
private final int featureFlaggingConfigurationSourceRequestTimeoutSeconds;
12271227

12281228
private final boolean dbmInjectSqlBaseHash;
12291229
private final String dbmPropagationMode;
@@ -2855,11 +2855,11 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
28552855
configProvider.getStringNotEmpty(
28562856
FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL, null);
28572857
featureFlaggingConfigurationSourcePollIntervalSeconds =
2858-
configProvider.getDouble(
2858+
configProvider.getInteger(
28592859
FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS,
28602860
DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS);
28612861
featureFlaggingConfigurationSourceRequestTimeoutSeconds =
2862-
configProvider.getDouble(
2862+
configProvider.getInteger(
28632863
FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS,
28642864
DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS);
28652865

@@ -4698,11 +4698,11 @@ public String getFeatureFlaggingConfigurationSourceAgentlessBaseUrl() {
46984698
return featureFlaggingConfigurationSourceAgentlessBaseUrl;
46994699
}
47004700

4701-
public double getFeatureFlaggingConfigurationSourcePollIntervalSeconds() {
4701+
public int getFeatureFlaggingConfigurationSourcePollIntervalSeconds() {
47024702
return featureFlaggingConfigurationSourcePollIntervalSeconds;
47034703
}
47044704

4705-
public double getFeatureFlaggingConfigurationSourceRequestTimeoutSeconds() {
4705+
public int getFeatureFlaggingConfigurationSourceRequestTimeoutSeconds() {
47064706
return featureFlaggingConfigurationSourceRequestTimeoutSeconds;
47074707
}
47084708

metadata/supported-configurations.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,15 +1516,15 @@
15161516
"DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS": [
15171517
{
15181518
"version": "A",
1519-
"type": "decimal",
1519+
"type": "int",
15201520
"default": "30",
15211521
"aliases": []
15221522
}
15231523
],
15241524
"DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS": [
15251525
{
15261526
"version": "A",
1527-
"type": "decimal",
1527+
"type": "int",
15281528
"default": "2",
15291529
"aliases": []
15301530
}

products/feature-flagging/feature-flagging-lib/src/main/java/com/datadog/featureflag/AgentlessConfigurationSource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ private static String urlEncode(final String value) {
219219
}
220220
}
221221

222-
static long millis(final double seconds) {
223-
return Math.max(1L, Math.round(seconds * 1000));
222+
static long millis(final int seconds) {
223+
return Math.max(1L, seconds * 1000L);
224224
}
225225

226226
interface UfcHttpClient {

products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/AgentlessConfigurationSourceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,10 @@ private static Config config(final String site, final String env) {
429429
final Config config = mock(Config.class);
430430
lenient()
431431
.when(config.getFeatureFlaggingConfigurationSourcePollIntervalSeconds())
432-
.thenReturn(30.0D);
432+
.thenReturn(30);
433433
lenient()
434434
.when(config.getFeatureFlaggingConfigurationSourceRequestTimeoutSeconds())
435-
.thenReturn(2.0D);
435+
.thenReturn(2);
436436
lenient().when(config.getFeatureFlaggingConfigurationSourceAgentlessBaseUrl()).thenReturn(null);
437437
lenient().when(config.getApiKey()).thenReturn("test-api-key");
438438
lenient().when(config.getSite()).thenReturn(site);

0 commit comments

Comments
 (0)