From 97324e819141e147f2f8bf79b023e827cbafeae6 Mon Sep 17 00:00:00 2001 From: Tedi Mitiku Date: Thu, 2 Jan 2025 17:18:32 -0500 Subject: [PATCH] fix: use ISO 8601 year number (#2621) ## Description The Vector logs aggregator output `%Y` specifier for year which is the [proleptic Gregorian year](https://docs.rs/chrono/0.4.19/chrono/format/strftime/index.html#specifiers) instead of `%G` specifier the ISO 8601. Logs are read with the ISO format so this created a mismatch in logs being read / written at the end of 2024 (eg. `Y` output the year 2024 on Dec. 30th 2024 whereas the ISO 8601 year on that date is 2025) ## Is this change user facing? NO --- .../logs_aggregator_functions/implementations/vector/consts.go | 2 +- .../builtin_argument/argument_value_copier_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/logs_aggregator_functions/implementations/vector/consts.go b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/logs_aggregator_functions/implementations/vector/consts.go index 0dbab25c2b..e9c6dcc526 100644 --- a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/logs_aggregator_functions/implementations/vector/consts.go +++ b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/logs_aggregator_functions/implementations/vector/consts.go @@ -24,7 +24,7 @@ const ( // We instruct vector to store log files per-year, per-week (00-53), per-enclave, per-service // To construct the filepath, we utilize vectors template syntax that allows us to reference fields in log events // https://vector.dev/docs/reference/configuration/template-syntax/ - baseLogsFilepath = "\"" + logsStorageDirpath + "%%Y/%%V/" + baseLogsFilepath = "\"" + logsStorageDirpath + "%%G/%%V/" uuidLogsFilepath = baseLogsFilepath + "{{ enclave_uuid }}/{{ service_uuid }}.json\"" diff --git a/core/server/api_container/server/startosis_engine/kurtosis_starlark_framework/builtin_argument/argument_value_copier_test.go b/core/server/api_container/server/startosis_engine/kurtosis_starlark_framework/builtin_argument/argument_value_copier_test.go index 632a678e10..71d98c805f 100644 --- a/core/server/api_container/server/startosis_engine/kurtosis_starlark_framework/builtin_argument/argument_value_copier_test.go +++ b/core/server/api_container/server/startosis_engine/kurtosis_starlark_framework/builtin_argument/argument_value_copier_test.go @@ -98,7 +98,7 @@ func TestCopyValueTuple(t *testing.T) { valueCopy, err := DeepCopyArgumentValue(value) require.NoError(t, err) require.Equal(t, valueCopy, value) - require.NotSame(t, valueCopy, value) + require.NotSame(t, &valueCopy, &value) } func TestCopyValueDict(t *testing.T) {