fix tests, fix NPE in ConfigSetting.equals, include configId in telemetryrequestbody when nonnull

Author: mtoffl01

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

@@ -11,6 +11,7 @@ public final class ConfigSetting {
   public final String key;
   public final Object value;
   public final ConfigOrigin origin;
+  /** The config ID associated with this setting, or {@code null} if not applicable. */
   public final String configId;
 
   private static final Set<String> CONFIG_FILTER_LIST =
@@ -108,7 +109,7 @@ public boolean equals(Object o) {
     return key.equals(that.key)
         && Objects.equals(value, that.value)
         && origin == that.origin
-        && configId.equals(that.configId);
+        && Objects.equals(configId, that.configId);
   }
 
   @Override

telemetry/src/main/java/datadog/telemetry/TelemetryRequestBody.java

@@ -230,6 +230,9 @@ public void writeConfiguration(ConfigSetting configSetting) throws IOException {
     bodyWriter.name("value").value(configSetting.stringValue());
     bodyWriter.setSerializeNulls(false);
     bodyWriter.name("origin").value(configSetting.origin.value);
+    if (configSetting.configId != null) {
+      bodyWriter.name("configId").value(configSetting.configId);
+    }
     bodyWriter.endObject();
   }