Merge pull request #7716 from DataDog/mhlidd/server_error_statuses

Add support for `TRACE_HTTP_SERVER_ERROR_STATUSES`

Author: mhlidd

dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java

@@ -65,7 +65,9 @@ public final class TracerConfig {
       "trace.http.server.path-resource-name-mapping";
   public static final String TRACE_HTTP_CLIENT_PATH_RESOURCE_NAME_MAPPING =
       "trace.http.client.path-resource-name-mapping";
-  public static final String HTTP_SERVER_ERROR_STATUSES = "http.server.error.statuses";
+  // Use TRACE_HTTP_SERVER_ERROR_STATUSES instead
+  @Deprecated public static final String HTTP_SERVER_ERROR_STATUSES = "http.server.error.statuses";
+  public static final String TRACE_HTTP_SERVER_ERROR_STATUSES = "trace.http.server.error.statuses";
   public static final String HTTP_CLIENT_ERROR_STATUSES = "http.client.error.statuses";
 
   public static final String SPLIT_BY_TAGS = "trace.split-by-tags";

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

@@ -777,7 +777,9 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
 
     httpServerErrorStatuses =
         configProvider.getIntegerRange(
-            HTTP_SERVER_ERROR_STATUSES, DEFAULT_HTTP_SERVER_ERROR_STATUSES);
+            TRACE_HTTP_SERVER_ERROR_STATUSES,
+            DEFAULT_HTTP_SERVER_ERROR_STATUSES,
+            HTTP_SERVER_ERROR_STATUSES);
 
     httpClientErrorStatuses =
         configProvider.getIntegerRange(

internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java

@@ -309,8 +309,8 @@ public Map<String, String> getMergedMapWithOptionalMappings(
     return merged;
   }
 
-  public BitSet getIntegerRange(final String key, final BitSet defaultValue) {
-    final String value = getString(key);
+  public BitSet getIntegerRange(final String key, final BitSet defaultValue, String... aliases) {
+    final String value = getString(key, null, aliases);
     try {
       if (value != null) {
         return ConfigConverter.parseIntegerRangeSet(value, key);