diff --git a/service/worker/workerdeployment/activities.go b/service/worker/workerdeployment/activities.go index d617b1cba7..84c902019b 100644 --- a/service/worker/workerdeployment/activities.go +++ b/service/worker/workerdeployment/activities.go @@ -182,15 +182,17 @@ func (a *Activities) DeleteWorkerDeploymentVersion(ctx context.Context, args *de if errors.As(err, ¬FoundErr) { metrics.WorkerDeploymentVersionNotFoundDuringDelete.With(a.MetricsHandler).Record( 1, - metrics.NamespaceTag(a.namespace.Name().String()), + metrics.NamespaceTag(a.namespace.Info().GetName()), + metrics.WorkerDeploymentNameTag(versionObj.GetDeploymentName(), true), + metrics.WorkerDeploymentBuildIDTag(versionObj.GetBuildId(), true), ) activity.GetLogger(ctx).Warn( "version workflow not found during deletion; allowing deployment workflow to remove stale reference", - "namespace", a.namespace.Name().String(), - "deploymentName", args.DeploymentName, - "version", args.Version, + "namespace", a.namespace.Info().GetName(), + "deploymentName", versionObj.GetDeploymentName(), + "version", versionObj.GetBuildId(), "versionWorkflowID", workflowID, - "requestID", args.RequestId, + "requestID", args.GetRequestId(), "error", err, ) return nil diff --git a/service/worker/workerdeployment/activities_test.go b/service/worker/workerdeployment/activities_test.go index 3b6ecbe3c8..9fad6b1356 100644 --- a/service/worker/workerdeployment/activities_test.go +++ b/service/worker/workerdeployment/activities_test.go @@ -78,6 +78,10 @@ func TestDeleteWorkerDeploymentVersion(t *testing.T) { require.Equal(t, int64(1), recordings[0].Value) namespaceTag := metrics.NamespaceTag(tv.NamespaceName().String()) require.Equal(t, namespaceTag.Value, recordings[0].Tags[namespaceTag.Key]) + deploymentTag := metrics.WorkerDeploymentNameTag(tv.DeploymentSeries(), true) + require.Equal(t, deploymentTag.Value, recordings[0].Tags[deploymentTag.Key]) + buildIDTag := metrics.WorkerDeploymentBuildIDTag(tv.BuildID(), true) + require.Equal(t, buildIDTag.Value, recordings[0].Tags[buildIDTag.Key]) } }) }