[Breaking] Preserve integer precision in AdditionalProperties via UseNumber

.generator/src/generator/templates/encoding_json.j2

@@ -4,6 +4,7 @@
 package {{ common_package_name }}
 
 import (
+	stdbytes "bytes"
 	"encoding/json"
 	"io"
 )
@@ -16,6 +17,16 @@ func Unmarshal(data []byte, v interface{}) error {
 	return json.Unmarshal(data, v)
 }
 
+// UnmarshalUseNumber decodes JSON with UseNumber enabled so that JSON numbers
+// landing in interface{} targets (e.g. map[string]interface{} from
+// additionalProperties) are kept as json.Number rather than coerced to float64.
+// This preserves precision for integers above 2^53.
+func UnmarshalUseNumber(data []byte, v interface{}) error {
+	dec := json.NewDecoder(stdbytes.NewReader(data))
+	dec.UseNumber()
+	return dec.Decode(v)
+}
+
 func NewEncoder(w io.Writer) *json.Encoder {
 	return json.NewEncoder(w)
 }

.generator/src/generator/templates/goccy_gojson.j2

@@ -4,6 +4,7 @@
 package {{ common_package_name }}
 
 import (
+	stdbytes "bytes"
 	"io"
 
 	"github.com/goccy/go-json"
@@ -17,6 +18,16 @@ func Unmarshal(data []byte, v interface{}) error {
 	return json.Unmarshal(data, v)
 }
 
+// UnmarshalUseNumber decodes JSON with UseNumber enabled so that JSON numbers
+// landing in interface{} targets (e.g. map[string]interface{} from
+// additionalProperties) are kept as json.Number rather than coerced to float64.
+// This preserves precision for integers above 2^53.
+func UnmarshalUseNumber(data []byte, v interface{}) error {
+	dec := json.NewDecoder(stdbytes.NewReader(data))
+	dec.UseNumber()
+	return dec.Decode(v)
+}
+
 func NewEncoder(w io.Writer) *json.Encoder {
 	return json.NewEncoder(w)
 }

.generator/src/generator/templates/model_simple.j2

@@ -369,7 +369,7 @@ func (o *{{ name }}) UnmarshalJSON(bytes []byte) (err error) {
 
 	{%- if model.additionalProperties is not false %}
 	additionalProperties := make(map[string]{{ get_type(model.get("additionalProperties", True)) }})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{ {% for attr, schema in model.get("properties", {}).items()%}"{{ attr }}", {% endfor %} })
 	} else {
 		return err

api/datadog/encoding_json.go

@@ -7,6 +7,7 @@
 package datadog
 
 import (
+	stdbytes "bytes"
 	"encoding/json"
 	"io"
 )
@@ -19,6 +20,16 @@ func Unmarshal(data []byte, v interface{}) error {
 	return json.Unmarshal(data, v)
 }
 
+// UnmarshalUseNumber decodes JSON with UseNumber enabled so that JSON numbers
+// landing in interface{} targets (e.g. map[string]interface{} from
+// additionalProperties) are kept as json.Number rather than coerced to float64.
+// This preserves precision for integers above 2^53.
+func UnmarshalUseNumber(data []byte, v interface{}) error {
+	dec := json.NewDecoder(stdbytes.NewReader(data))
+	dec.UseNumber()
+	return dec.Decode(v)
+}
+
 func NewEncoder(w io.Writer) *json.Encoder {
 	return json.NewEncoder(w)
 }

api/datadog/goccy_gojson.go

@@ -7,6 +7,7 @@
 package datadog
 
 import (
+	stdbytes "bytes"
 	"io"
 
 	"github.com/goccy/go-json"
@@ -20,6 +21,16 @@ func Unmarshal(data []byte, v interface{}) error {
 	return json.Unmarshal(data, v)
 }
 
+// UnmarshalUseNumber decodes JSON with UseNumber enabled so that JSON numbers
+// landing in interface{} targets (e.g. map[string]interface{} from
+// additionalProperties) are kept as json.Number rather than coerced to float64.
+// This preserves precision for integers above 2^53.
+func UnmarshalUseNumber(data []byte, v interface{}) error {
+	dec := json.NewDecoder(stdbytes.NewReader(data))
+	dec.UseNumber()
+	return dec.Decode(v)
+}
+
 func NewEncoder(w io.Writer) *json.Encoder {
 	return json.NewEncoder(w)
 }

api/datadogV1/model_add_signal_to_incident_request.go

@@ -154,7 +154,7 @@ func (o *AddSignalToIncidentRequest) UnmarshalJSON(bytes []byte) (err error) {
 		return fmt.Errorf("required field incident_id missing")
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"add_to_signal_timeline", "incident_id", "version"})
 	} else {
 		return err

api/datadogV1/model_alert_graph_widget_definition.go

@@ -320,7 +320,7 @@ func (o *AlertGraphWidgetDefinition) UnmarshalJSON(bytes []byte) (err error) {
 		return fmt.Errorf("required field viz_type missing")
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"alert_id", "description", "time", "title", "title_align", "title_size", "type", "viz_type"})
 	} else {
 		return err

api/datadogV1/model_alert_value_widget_definition.go

@@ -357,7 +357,7 @@ func (o *AlertValueWidgetDefinition) UnmarshalJSON(bytes []byte) (err error) {
 		return fmt.Errorf("required field type missing")
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"alert_id", "description", "precision", "text_align", "title", "title_align", "title_size", "type", "unit"})
 	} else {
 		return err

api/datadogV1/model_api_error_response.go

@@ -86,7 +86,7 @@ func (o *APIErrorResponse) UnmarshalJSON(bytes []byte) (err error) {
 		return fmt.Errorf("required field errors missing")
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"errors"})
 	} else {
 		return err

api/datadogV1/model_api_key.go

@@ -189,7 +189,7 @@ func (o *ApiKey) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"created", "created_by", "key", "name"})
 	} else {
 		return err

api/datadogV1/model_api_key_list_response.go

@@ -87,7 +87,7 @@ func (o *ApiKeyListResponse) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"api_keys"})
 	} else {
 		return err

api/datadogV1/model_api_key_response.go

@@ -87,7 +87,7 @@ func (o *ApiKeyResponse) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"api_key"})
 	} else {
 		return err

api/datadogV1/model_apm_stats_query_column_type.go

@@ -188,7 +188,7 @@ func (o *ApmStatsQueryColumnType) UnmarshalJSON(bytes []byte) (err error) {
 		return fmt.Errorf("required field name missing")
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"alias", "cell_display_mode", "name", "order"})
 	} else {
 		return err

api/datadogV1/model_apm_stats_query_definition.go

@@ -278,7 +278,7 @@ func (o *ApmStatsQueryDefinition) UnmarshalJSON(bytes []byte) (err error) {
 		return fmt.Errorf("required field service missing")
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"columns", "env", "name", "primary_tag", "resource", "row_type", "service"})
 	} else {
 		return err

api/datadogV1/model_application_key.go

@@ -155,7 +155,7 @@ func (o *ApplicationKey) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"hash", "name", "owner"})
 	} else {
 		return err

api/datadogV1/model_application_key_list_response.go

@@ -87,7 +87,7 @@ func (o *ApplicationKeyListResponse) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"application_keys"})
 	} else {
 		return err

api/datadogV1/model_application_key_response.go

@@ -87,7 +87,7 @@ func (o *ApplicationKeyResponse) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"application_key"})
 	} else {
 		return err

api/datadogV1/model_authentication_validation_response.go

@@ -87,7 +87,7 @@ func (o *AuthenticationValidationResponse) UnmarshalJSON(bytes []byte) (err erro
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"valid"})
 	} else {
 		return err

api/datadogV1/model_aws_account.go

@@ -492,7 +492,7 @@ func (o *AWSAccount) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"access_key_id", "account_id", "account_specific_namespace_rules", "cspm_resource_collection_enabled", "excluded_regions", "extended_resource_collection_enabled", "filter_tags", "host_tags", "metrics_collection_enabled", "resource_collection_enabled", "role_name", "secret_access_key"})
 	} else {
 		return err

api/datadogV1/model_aws_account_and_lambda_request.go

@@ -117,7 +117,7 @@ func (o *AWSAccountAndLambdaRequest) UnmarshalJSON(bytes []byte) (err error) {
 		return fmt.Errorf("required field lambda_arn missing")
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"account_id", "lambda_arn"})
 	} else {
 		return err

api/datadogV1/model_aws_account_create_response.go

@@ -87,7 +87,7 @@ func (o *AWSAccountCreateResponse) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"external_id"})
 	} else {
 		return err

api/datadogV1/model_aws_account_delete_request.go

@@ -155,7 +155,7 @@ func (o *AWSAccountDeleteRequest) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"access_key_id", "account_id", "role_name"})
 	} else {
 		return err

api/datadogV1/model_aws_account_list_response.go

@@ -87,7 +87,7 @@ func (o *AWSAccountListResponse) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"accounts"})
 	} else {
 		return err

api/datadogV1/model_aws_event_bridge_account_configuration.go

@@ -156,7 +156,7 @@ func (o *AWSEventBridgeAccountConfiguration) UnmarshalJSON(bytes []byte) (err er
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"accountId", "eventHubs", "tags"})
 	} else {
 		return err

api/datadogV1/model_aws_event_bridge_create_request.go

@@ -191,7 +191,7 @@ func (o *AWSEventBridgeCreateRequest) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"account_id", "create_event_bus", "event_generator_name", "region"})
 	} else {
 		return err

api/datadogV1/model_aws_event_bridge_create_response.go

@@ -189,7 +189,7 @@ func (o *AWSEventBridgeCreateResponse) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"event_source_name", "has_bus", "region", "status"})
 	} else {
 		return err

api/datadogV1/model_aws_event_bridge_delete_request.go

@@ -155,7 +155,7 @@ func (o *AWSEventBridgeDeleteRequest) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"account_id", "event_generator_name", "region"})
 	} else {
 		return err

api/datadogV1/model_aws_event_bridge_delete_response.go

@@ -87,7 +87,7 @@ func (o *AWSEventBridgeDeleteResponse) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"status"})
 	} else {
 		return err

api/datadogV1/model_aws_event_bridge_list_response.go

@@ -121,7 +121,7 @@ func (o *AWSEventBridgeListResponse) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"accounts", "isInstalled"})
 	} else {
 		return err

api/datadogV1/model_aws_event_bridge_source.go

@@ -121,7 +121,7 @@ func (o *AWSEventBridgeSource) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"name", "region"})
 	} else {
 		return err

api/datadogV1/model_aws_logs_async_error.go

@@ -121,7 +121,7 @@ func (o *AWSLogsAsyncError) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"code", "message"})
 	} else {
 		return err

api/datadogV1/model_aws_logs_async_response.go

@@ -121,7 +121,7 @@ func (o *AWSLogsAsyncResponse) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"errors", "status"})
 	} else {
 		return err

api/datadogV1/model_aws_logs_lambda.go

@@ -87,7 +87,7 @@ func (o *AWSLogsLambda) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"arn"})
 	} else {
 		return err

api/datadogV1/model_aws_logs_list_response.go

@@ -155,7 +155,7 @@ func (o *AWSLogsListResponse) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"account_id", "lambdas", "services"})
 	} else {
 		return err

api/datadogV1/model_aws_logs_list_services_response.go

@@ -121,7 +121,7 @@ func (o *AWSLogsListServicesResponse) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"id", "label"})
 	} else {
 		return err

api/datadogV1/model_aws_logs_services_request.go

@@ -117,7 +117,7 @@ func (o *AWSLogsServicesRequest) UnmarshalJSON(bytes []byte) (err error) {
 		return fmt.Errorf("required field services missing")
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"account_id", "services"})
 	} else {
 		return err

api/datadogV1/model_aws_tag_filter.go

@@ -121,7 +121,7 @@ func (o *AWSTagFilter) UnmarshalJSON(bytes []byte) (err error) {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
-	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
+	if err = datadog.UnmarshalUseNumber(bytes, &additionalProperties); err == nil {
 		datadog.DeleteKeys(additionalProperties, &[]string{"namespace", "tag_filter_str"})
 	} else {
 		return err