Merge branch 'master' into florentclarret/metric_prefix

DataDog · Mar 6, 2024 · 165bcbf · 165bcbf
2 parents 60de11d + 5132145
commit 165bcbf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/datadog_checks_dev/changelog.d/17066.fixed b/datadog_checks_dev/changelog.d/17066.fixed
@@ -0,0 +1 @@
+Print the info logs in the correct order in the `validate models -s` command
diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/models.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/models.py
@@ -190,7 +190,12 @@ def models(ctx, check, sync, verbose):
 
             if not current_model_file_lines or not content_matches(current_model_file_lines, expected_model_file_lines):
                 if sync:
-                    echo_info(f'Writing data model file to `{model_file_path}`')
+                    check_display_queue.append(
+                        (
+                            echo_info,
+                            f'Writing data model file to `{model_file_path}`',
+                        )
+                    )
                     ensure_parent_dir_exists(model_file_path)
                     write_file_lines(model_file_path, expected_model_file_lines)
                 else:

diff --git a/voltdb/hatch.toml b/voltdb/hatch.toml
@@ -27,7 +27,7 @@ tls = ["true"]
 [envs.default.overrides]
 matrix.version.env-vars = [
     { key = "VOLTDB_VERSION", value = "8.4.2", if = ["8.4"] },
-    { key = "VOLTDB_IMAGE", value = "voltdb/voltdb-community:8.4.2", if = ["8.4"] },
+    { key = "VOLTDB_IMAGE", value = "datadog/docker-library:voltdb_8_4", if = ["8.4"] },
     { key = "VOLTDB_VERSION", value = "10.0.0", if = ["10.0"] },
     { key = "VOLTDB_IMAGE", value = "datadog/docker-library:voltdb_10_0", if = ["10.0"] }
 ]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Print the info logs in the correct order in the `validate models -s` command