Mhlidd/migrate to v2 format

buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ParseV2SupportedConfigurationsTask.kt

@@ -130,11 +130,29 @@ abstract class ParseV2SupportedConfigurationsTask  @Inject constructor(
       out.println("  public static final Map<String, String> REVERSE_PROPERTY_KEYS_MAP;")
       out.println()
       out.println("  static {")
+      out.println("    SUPPORTED = initSupported();")
+      out.println("    ALIASES = initAliases();")
+      out.println("    ALIAS_MAPPING = initAliasMapping();")
+      out.println("    DEPRECATED = initDeprecated();")
+      out.println("    REVERSE_PROPERTY_KEYS_MAP = initReversePropertyKeysMap();")
+      out.println("  }")
       out.println()
 
-      // SUPPORTED
+      // initSupported() - split into two helper functions to avoid "code too large" error
+      out.println("  private static Map<String, List<SupportedConfiguration>> initSupported() {")
       out.println("    Map<String, List<SupportedConfiguration>> supportedMap = new HashMap<>();")
-      for ((key, configList) in supported.toSortedMap()) {
+      out.println("    initSupported1(supportedMap);")
+      out.println("    initSupported2(supportedMap);")
+      out.println("    return Collections.unmodifiableMap(supportedMap);")
+      out.println("  }")
+      out.println()
+
+      val sortedSupported = supported.toSortedMap().entries.toList()
+      val midpoint = sortedSupported.size / 2
+
+      // initSupported1() - first half
+      out.println("  private static void initSupported1(Map<String, List<SupportedConfiguration>> supportedMap) {")
+      for ((key, configList) in sortedSupported.take(midpoint)) {
         out.print("    supportedMap.put(\"${esc(key)}\", Collections.unmodifiableList(Arrays.asList(")
         val configIter = configList.iterator()
         while (configIter.hasNext()) {
@@ -148,13 +166,35 @@ abstract class ParseV2SupportedConfigurationsTask  @Inject constructor(
           out.print(")")
           if (configIter.hasNext()) out.print(", ")
         }
-        out.println(")));\n")
+        out.println(")));")
       }
-      out.println("    SUPPORTED = Collections.unmodifiableMap(supportedMap);")
+      out.println("  }")
       out.println()
 
-      // ALIASES
-      out.println("    // Note: This top-level alias mapping will be deprecated once Config Registry is mature enough to understand which version of a config a customer is using")
+      // initSupported2() - second half
+      out.println("  private static void initSupported2(Map<String, List<SupportedConfiguration>> supportedMap) {")
+      for ((key, configList) in sortedSupported.drop(midpoint)) {
+        out.print("    supportedMap.put(\"${esc(key)}\", Collections.unmodifiableList(Arrays.asList(")
+        val configIter = configList.iterator()
+        while (configIter.hasNext()) {
+          val config = configIter.next()
+          out.print("new SupportedConfiguration(")
+          out.print("${escNullableString(config.version)}, ")
+          out.print("${escNullableString(config.type)}, ")
+          out.print("${escNullableString(config.default)}, ")
+          out.print("Arrays.asList(${quoteList(config.aliases)}), ")
+          out.print("Arrays.asList(${quoteList(config.propertyKeys)})")
+          out.print(")")
+          if (configIter.hasNext()) out.print(", ")
+        }
+        out.println(")));")
+      }
+      out.println("  }")
+      out.println()
+
+      // initAliases()
+      out.println("  // Note: This top-level alias mapping will be deprecated once Config Registry is mature enough to understand which version of a config a customer is using")
+      out.println("  private static Map<String, List<String>> initAliases() {")
       out.println("    Map<String, List<String>> aliasesMap = new HashMap<>();")
       for ((canonical, list) in aliases.toSortedMap()) {
         out.printf(
@@ -163,34 +203,39 @@ abstract class ParseV2SupportedConfigurationsTask  @Inject constructor(
           quoteList(list)
         )
       }
-      out.println("    ALIASES = Collections.unmodifiableMap(aliasesMap);")
+      out.println("    return Collections.unmodifiableMap(aliasesMap);")
+      out.println("  }")
       out.println()
 
-      // ALIAS_MAPPING
+      // initAliasMapping()
+      out.println("  private static Map<String, String> initAliasMapping() {")
       out.println("    Map<String, String> aliasMappingMap = new HashMap<>();")
       for ((alias, target) in aliasMapping.toSortedMap()) {
         out.printf("    aliasMappingMap.put(\"%s\", \"%s\");\n", esc(alias), esc(target))
       }
-      out.println("    ALIAS_MAPPING = Collections.unmodifiableMap(aliasMappingMap);")
+      out.println("    return Collections.unmodifiableMap(aliasMappingMap);")
+      out.println("  }")
       out.println()
 
-      // DEPRECATED
+      // initDeprecated()
+      out.println("  private static Map<String, String> initDeprecated() {")
       out.println("    Map<String, String> deprecatedMap = new HashMap<>();")
       for ((oldKey, note) in deprecated.toSortedMap()) {
         out.printf("    deprecatedMap.put(\"%s\", \"%s\");\n", esc(oldKey), esc(note))
       }
-      out.println("    DEPRECATED = Collections.unmodifiableMap(deprecatedMap);")
+      out.println("    return Collections.unmodifiableMap(deprecatedMap);")
+      out.println("  }")
       out.println()
 
-      // REVERSE_PROPERTY_KEYS_MAP
+      // initReversePropertyKeysMap()
+      out.println("  private static Map<String, String> initReversePropertyKeysMap() {")
       out.println("    Map<String, String> reversePropertyKeysMapping = new HashMap<>();")
       for ((propertyKey, config) in reversePropertyKeysMap.toSortedMap()) {
         out.printf("    reversePropertyKeysMapping.put(\"%s\", \"%s\");\n", esc(propertyKey), esc(config))
       }
-      out.println("    REVERSE_PROPERTY_KEYS_MAP = Collections.unmodifiableMap(reversePropertyKeysMapping);")
-      out.println()
-
+      out.println("    return Collections.unmodifiableMap(reversePropertyKeysMapping);")
       out.println("  }")
+
       out.println("}")
     }
   }

buildSrc/src/main/kotlin/datadog/gradle/plugin/config/SupportedConfigPlugin.kt

@@ -13,7 +13,7 @@ class SupportedConfigPlugin : Plugin<Project> {
 
   private fun generateSupportedConfigurations(targetProject: Project, extension: SupportedTracerConfigurations) {
     val generateTask =
-      targetProject.tasks.register("generateSupportedConfigurations", ParseSupportedConfigurationsTask::class.java) {
+      targetProject.tasks.register("generateSupportedConfigurations", ParseV2SupportedConfigurationsTask::class.java) {
         jsonFile.set(extension.jsonFile)
         destinationDirectory.set(extension.destinationDirectory)
         className.set(extension.className)

dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java

@@ -147,7 +147,8 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[
               + "datadog.trace.bootstrap.WeakMapContextStore:build_time,"
               + "datadog.trace.config.inversion.ConfigHelper:rerun,"
               + "datadog.trace.config.inversion.ConfigHelper$StrictnessPolicy:rerun,"
-              + "datadog.trace.config.inversion.GeneratedSupportedConfigurations:rerun,"
+              + "datadog.trace.config.inversion.GeneratedSupportedConfigurations:build_time,"
+              + "datadog.trace.config.inversion.SupportedConfiguration:build_time,"
               + "datadog.trace.instrumentation.guava10.GuavaAsyncResultExtension:build_time,"
               + "datadog.trace.instrumentation.reactivestreams.ReactiveStreamsAsyncResultExtension:build_time,"
               + "datadog.trace.instrumentation.reactor.core.ReactorAsyncResultExtension:build_time,"