diff --git a/acceptance/bundle/debug/out.stderr.parallel.txt b/acceptance/bundle/debug/out.stderr.parallel.txt index 87530b84c..afb7b51e4 100644 --- a/acceptance/bundle/debug/out.stderr.parallel.txt +++ b/acceptance/bundle/debug/out.stderr.parallel.txt @@ -1,12 +1,12 @@ -< } pid=00000 mutator=validate mutator (read-only)=parallel mutator (read-only)=validate:files_to_sync sdk=true -Debug: ApplyReadOnly pid=00000 mutator=validate mutator (read-only)=parallel -Debug: ApplyReadOnly pid=00000 mutator=validate mutator (read-only)=parallel mutator (read-only)=fast_validate(readonly) -Debug: ApplyReadOnly pid=00000 mutator=validate mutator (read-only)=parallel mutator (read-only)=fast_validate(readonly) mutator (read-only)=parallel -Debug: ApplyReadOnly pid=00000 mutator=validate mutator (read-only)=parallel mutator (read-only)=fast_validate(readonly) mutator (read-only)=parallel mutator (read-only)=validate:SingleNodeCluster -Debug: ApplyReadOnly pid=00000 mutator=validate mutator (read-only)=parallel mutator (read-only)=fast_validate(readonly) mutator (read-only)=parallel mutator (read-only)=validate:artifact_paths -Debug: ApplyReadOnly pid=00000 mutator=validate mutator (read-only)=parallel mutator (read-only)=fast_validate(readonly) mutator (read-only)=parallel mutator (read-only)=validate:job_cluster_key_defined -Debug: ApplyReadOnly pid=00000 mutator=validate mutator (read-only)=parallel mutator (read-only)=fast_validate(readonly) mutator (read-only)=parallel mutator (read-only)=validate:job_task_cluster_spec -Debug: ApplyReadOnly pid=00000 mutator=validate mutator (read-only)=parallel mutator (read-only)=validate:files_to_sync -Debug: ApplyReadOnly pid=00000 mutator=validate mutator (read-only)=parallel mutator (read-only)=validate:folder_permissions -Debug: ApplyReadOnly pid=00000 mutator=validate mutator (read-only)=parallel mutator (read-only)=validate:validate_sync_patterns -Debug: Path has type directory (ID: 1001) pid=00000 mutator=validate mutator (read-only)=parallel mutator (read-only)=validate:files_to_sync +10:07:59 Debug: ApplyReadOnly pid=12345 mutator=validate mutator (read-only)=parallel +10:07:59 Debug: ApplyReadOnly pid=12345 mutator=validate mutator (read-only)=parallel mutator (read-only)=fast_validate(readonly) +10:07:59 Debug: ApplyReadOnly pid=12345 mutator=validate mutator (read-only)=parallel mutator (read-only)=fast_validate(readonly) mutator (read-only)=parallel +10:07:59 Debug: ApplyReadOnly pid=12345 mutator=validate mutator (read-only)=parallel mutator (read-only)=fast_validate(readonly) mutator (read-only)=parallel mutator (read-only)=validate:SingleNodeCluster +10:07:59 Debug: ApplyReadOnly pid=12345 mutator=validate mutator (read-only)=parallel mutator (read-only)=fast_validate(readonly) mutator (read-only)=parallel mutator (read-only)=validate:artifact_paths +10:07:59 Debug: ApplyReadOnly pid=12345 mutator=validate mutator (read-only)=parallel mutator (read-only)=fast_validate(readonly) mutator (read-only)=parallel mutator (read-only)=validate:job_cluster_key_defined +10:07:59 Debug: ApplyReadOnly pid=12345 mutator=validate mutator (read-only)=parallel mutator (read-only)=fast_validate(readonly) mutator (read-only)=parallel mutator (read-only)=validate:job_task_cluster_spec +10:07:59 Debug: ApplyReadOnly pid=12345 mutator=validate mutator (read-only)=parallel mutator (read-only)=validate:files_to_sync +10:07:59 Debug: ApplyReadOnly pid=12345 mutator=validate mutator (read-only)=parallel mutator (read-only)=validate:folder_permissions +10:07:59 Debug: ApplyReadOnly pid=12345 mutator=validate mutator (read-only)=parallel mutator (read-only)=validate:validate_sync_patterns +10:07:59 Debug: Path has type directory (ID: 1001) pid=12345 mutator=validate mutator (read-only)=parallel mutator (read-only)=validate:files_to_sync +< } pid=12345 mutator=validate mutator (read-only)=parallel mutator (read-only)=validate:files_to_sync sdk=true diff --git a/acceptance/bundle/debug/out.stderr.txt b/acceptance/bundle/debug/out.stderr.txt index d128e599e..ea19d5d29 100644 --- a/acceptance/bundle/debug/out.stderr.txt +++ b/acceptance/bundle/debug/out.stderr.txt @@ -1,86 +1,86 @@ -Info: start pid=00000 version=$DEV_VERSION args="$CLI, bundle, validate, --debug" -Debug: Found bundle root at $TMPDIR (file $TMPDIR/databricks.yml) pid=00000 -Debug: Apply pid=00000 mutator=load -Info: Phase: load pid=00000 mutator=load -Debug: Apply pid=00000 mutator=load mutator=seq -Debug: Apply pid=00000 mutator=load mutator=seq mutator=EntryPoint -Debug: Apply pid=00000 mutator=load mutator=seq mutator=scripts.preinit -Debug: No script defined for preinit, skipping pid=00000 mutator=load mutator=seq mutator=scripts.preinit -Debug: Apply pid=00000 mutator=load mutator=seq mutator=ProcessRootIncludes -Debug: Apply pid=00000 mutator=load mutator=seq mutator=ProcessRootIncludes mutator=seq -Debug: Apply pid=00000 mutator=load mutator=seq mutator=VerifyCliVersion -Debug: Apply pid=00000 mutator=load mutator=seq mutator=EnvironmentsToTargets -Debug: Apply pid=00000 mutator=load mutator=seq mutator=ComputeIdToClusterId -Debug: Apply pid=00000 mutator=load mutator=seq mutator=InitializeVariables -Debug: Apply pid=00000 mutator=load mutator=seq mutator=DefineDefaultTarget(default) -Debug: Apply pid=00000 mutator=load mutator=seq mutator=PythonMutator(load) -Debug: Apply pid=00000 mutator=load mutator=seq mutator=validate:unique_resource_keys -Debug: Apply pid=00000 mutator=load mutator=seq mutator=SelectDefaultTarget -Debug: Apply pid=00000 mutator=load mutator=seq mutator=SelectDefaultTarget mutator=SelectTarget(default) -Debug: Apply pid=00000 mutator= -Debug: Apply pid=00000 mutator=initialize -Info: Phase: initialize pid=00000 mutator=initialize -Debug: Apply pid=00000 mutator=initialize mutator=seq -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=validate:AllResourcesHaveValues -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=RewriteSyncPaths -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=SyncDefaultPath -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=SyncInferRoot -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=InitializeWorkspaceClient -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=PopulateCurrentUser -Debug: GET /api/2.0/preview/scim/v2/Me +10:07:59 Info: start pid=12345 version=$DEV_VERSION args="$CLI, bundle, validate, --debug" +10:07:59 Debug: Found bundle root at $TMPDIR (file $TMPDIR/databricks.yml) pid=12345 +10:07:59 Debug: Apply pid=12345 mutator=load +10:07:59 Info: Phase: load pid=12345 mutator=load +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq mutator=EntryPoint +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq mutator=scripts.preinit +10:07:59 Debug: No script defined for preinit, skipping pid=12345 mutator=load mutator=seq mutator=scripts.preinit +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq mutator=ProcessRootIncludes +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq mutator=ProcessRootIncludes mutator=seq +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq mutator=VerifyCliVersion +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq mutator=EnvironmentsToTargets +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq mutator=ComputeIdToClusterId +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq mutator=InitializeVariables +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq mutator=DefineDefaultTarget(default) +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq mutator=PythonMutator(load) +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq mutator=validate:unique_resource_keys +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq mutator=SelectDefaultTarget +10:07:59 Debug: Apply pid=12345 mutator=load mutator=seq mutator=SelectDefaultTarget mutator=SelectTarget(default) +10:07:59 Debug: Apply pid=12345 mutator= +10:07:59 Debug: Apply pid=12345 mutator=initialize +10:07:59 Info: Phase: initialize pid=12345 mutator=initialize +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=validate:AllResourcesHaveValues +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=RewriteSyncPaths +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=SyncDefaultPath +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=SyncInferRoot +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=InitializeWorkspaceClient +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=PopulateCurrentUser +10:07:59 Debug: GET /api/2.0/preview/scim/v2/Me < HTTP/1.1 200 OK < { < "userName": "$USERNAME" -< } pid=00000 mutator=initialize mutator=seq mutator=PopulateCurrentUser sdk=true -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=LoadGitDetails -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=ApplySourceLinkedDeploymentPreset -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=DefineDefaultWorkspaceRoot -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=ExpandWorkspaceRoot -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=DefaultWorkspacePaths -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=PrependWorkspacePrefix -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=RewriteWorkspacePrefix -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=SetVariables -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=PythonMutator(init) -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=PythonMutator(load_resources) -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=PythonMutator(apply_mutators) -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=ResolveVariableReferences -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=ResolveResourceReferences -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=ResolveVariableReferences -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=MergeJobClusters -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=MergeJobParameters -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=MergeJobTasks -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=MergePipelineClusters -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=MergeApps -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=CaptureSchemaDependency -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=CheckPermissions -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=SetRunAs -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=OverrideCompute -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=ConfigureDashboardDefaults -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=ConfigureVolumeDefaults -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=ProcessTargetMode -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=ApplyPresets -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=DefaultQueueing -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=ExpandPipelineGlobPaths -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=ConfigureWSFS -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=TranslatePaths -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=PythonWrapperWarning -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=apps.Validate -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=ValidateSharedRootPermissions -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=ApplyBundlePermissions -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=FilterCurrentUserFromPermissions -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=metadata.AnnotateJobs -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=metadata.AnnotatePipelines -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=terraform.Initialize -Debug: Using Terraform from DATABRICKS_TF_EXEC_PATH at $TMPHOME pid=00000 mutator=initialize mutator=seq mutator=terraform.Initialize -Debug: DATABRICKS_TF_CLI_CONFIG_FILE is not defined pid=00000 mutator=initialize mutator=seq mutator=terraform.Initialize -Debug: Environment variables for Terraform: ...redacted... pid=00000 mutator=initialize mutator=seq mutator=terraform.Initialize -Debug: Apply pid=00000 mutator=initialize mutator=seq mutator=scripts.postinit -Debug: No script defined for postinit, skipping pid=00000 mutator=initialize mutator=seq mutator=scripts.postinit -Debug: Apply pid=00000 mutator=validate -Debug: GET /api/2.0/workspace/get-status?path=/Workspace/Users/$USERNAME/.bundle/debug/default/files +< } pid=12345 mutator=initialize mutator=seq mutator=PopulateCurrentUser sdk=true +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=LoadGitDetails +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ApplySourceLinkedDeploymentPreset +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=DefineDefaultWorkspaceRoot +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ExpandWorkspaceRoot +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=DefaultWorkspacePaths +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=PrependWorkspacePrefix +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=RewriteWorkspacePrefix +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=SetVariables +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=PythonMutator(init) +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=PythonMutator(load_resources) +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=PythonMutator(apply_mutators) +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ResolveVariableReferences +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ResolveResourceReferences +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ResolveVariableReferences +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=MergeJobClusters +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=MergeJobParameters +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=MergeJobTasks +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=MergePipelineClusters +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=MergeApps +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=CaptureSchemaDependency +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=CheckPermissions +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=SetRunAs +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=OverrideCompute +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ConfigureDashboardDefaults +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ConfigureVolumeDefaults +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ProcessTargetMode +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ApplyPresets +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=DefaultQueueing +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ExpandPipelineGlobPaths +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ConfigureWSFS +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=TranslatePaths +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=PythonWrapperWarning +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=apps.Validate +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ValidateSharedRootPermissions +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=ApplyBundlePermissions +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=FilterCurrentUserFromPermissions +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=metadata.AnnotateJobs +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=metadata.AnnotatePipelines +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=terraform.Initialize +10:07:59 Debug: Using Terraform from DATABRICKS_TF_EXEC_PATH at $TMPHOME pid=12345 mutator=initialize mutator=seq mutator=terraform.Initialize +10:07:59 Debug: DATABRICKS_TF_CLI_CONFIG_FILE is not defined pid=12345 mutator=initialize mutator=seq mutator=terraform.Initialize +10:07:59 Debug: Environment variables for Terraform: ...redacted... pid=12345 mutator=initialize mutator=seq mutator=terraform.Initialize +10:07:59 Debug: Apply pid=12345 mutator=initialize mutator=seq mutator=scripts.postinit +10:07:59 Debug: No script defined for postinit, skipping pid=12345 mutator=initialize mutator=seq mutator=scripts.postinit +10:07:59 Debug: Apply pid=12345 mutator=validate +10:07:59 Debug: GET /api/2.0/workspace/get-status?path=/Workspace/Users/$USERNAME/.bundle/debug/default/files < HTTP/1.1 200 OK < { < "object_id": 1001, < "object_type": "DIRECTORY", < "resource_id": "1001" -Info: completed execution pid=00000 exit_code=0 +10:07:59 Info: completed execution pid=12345 exit_code=0 diff --git a/acceptance/bundle/debug/test.toml b/acceptance/bundle/debug/test.toml index 401f48494..07326f299 100644 --- a/acceptance/bundle/debug/test.toml +++ b/acceptance/bundle/debug/test.toml @@ -5,4 +5,8 @@ New = 'Environment variables for Terraform: ...redacted... ' [[Repls]] Old = 'pid=[0-9]+' -New = 'pid=00000' +New = 'pid=12345' + +[[Repls]] +Old = '\d\d:\d\d:\d\d' +New = '10:07:59' diff --git a/libs/log/handler/friendly.go b/libs/log/handler/friendly.go index 8bd8c6e5b..5c60eb13d 100644 --- a/libs/log/handler/friendly.go +++ b/libs/log/handler/friendly.go @@ -185,6 +185,11 @@ func (s *handleState) appendAttr(a slog.Attr) { // Handle implements slog.Handler. func (h *friendlyHandler) Handle(ctx context.Context, r slog.Record) error { state := h.handleState() + + if h.opts.Level.Level() <= slog.LevelDebug { + state.append(h.sprintf(ttyColorTime, "%02d:%02d:%02d ", r.Time.Hour(), r.Time.Minute(), r.Time.Second())) + } + state.appendf("%s ", h.coloredLevel(r)) state.append(h.sprint(ttyColorMessage, r.Message))