From 15ed4aa114e8f893a52952366c933912329c8e75 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Mon, 16 Nov 2026 19:31:15 +0000 Subject: [PATCH] Enable ObjectStore by default on Java 17 and later --- .../src/main/java/datadog/trace/api/InstrumenterConfig.java | 4 ++-- .../test/java/datadog/trace/api/InstrumenterConfigTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java b/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java index 205da9aef2c..ef8768c8bb9 100644 --- a/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java +++ b/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java @@ -403,8 +403,8 @@ private InstrumenterConfig() { runtimeContextMapPerStore = configProvider.getBoolean( RUNTIME_CONTEXT_MAP_PER_STORE, - // Gradually roll out shared context storage, starting with Java 25. - DEFAULT_RUNTIME_CONTEXT_MAP_PER_STORE && !isJavaVersionAtLeast(25)); + // Gradually roll out shared context storage, starting with Java 17. + DEFAULT_RUNTIME_CONTEXT_MAP_PER_STORE && !isJavaVersionAtLeast(17)); instrumentationConfigId = configProvider.getString(INSTRUMENTATION_CONFIG_ID, ""); diff --git a/internal-api/src/test/java/datadog/trace/api/InstrumenterConfigTest.java b/internal-api/src/test/java/datadog/trace/api/InstrumenterConfigTest.java index a2540030bf3..7eda104a57a 100644 --- a/internal-api/src/test/java/datadog/trace/api/InstrumenterConfigTest.java +++ b/internal-api/src/test/java/datadog/trace/api/InstrumenterConfigTest.java @@ -163,8 +163,8 @@ void invalidResolverPresets(String preset) { } @Test - void sharedContextStorageIsDefaultFromJava25() { - assertEquals(!isJavaVersionAtLeast(25), InstrumenterConfig.get().isRuntimeContextMapPerStore()); + void sharedContextStorageIsDefaultFromJava17() { + assertEquals(!isJavaVersionAtLeast(17), InstrumenterConfig.get().isRuntimeContextMapPerStore()); } @TableTest({