[Wf-Diagnostics] Failure of usage logs emission should'nt fail the wo…

…rkflow

service/worker/diagnostics/parent_workflow.go

@@ -24,6 +24,7 @@ package diagnostics
 
 import (
 	"fmt"
+	"github.com/uber/cadence/common/log/tag"
 	"time"
 
 	"go.uber.org/cadence/workflow"
@@ -85,6 +86,7 @@ func (w *dw) DiagnosticsStarterWorkflow(ctx workflow.Context, params Diagnostics
 	workflowResult.DiagnosticsCompleted = true
 	childWfEnd = workflow.Now(ctx)
 
+	info := workflow.GetInfo(ctx)
 	activityOptions := workflow.ActivityOptions{
 		ScheduleToCloseTimeout: time.Second * 10,
 		ScheduleToStartTimeout: time.Second * 5,
@@ -103,7 +105,10 @@ func (w *dw) DiagnosticsStarterWorkflow(ctx workflow.Context, params Diagnostics
 		DiagnosticsEndTime:    childWfEnd,
 	}).Get(ctx, nil)
 	if err != nil {
-		return nil, fmt.Errorf("EmitUsageLogs: %w", err)
+		w.logger.Error("wf-diagnostics usage logs emission failed",
+			tag.Error(err),
+			tag.WorkflowID(info.WorkflowExecution.ID),
+			tag.WorkflowRunID(info.WorkflowExecution.RunID))
 	}
 
 	return &workflowResult, nil

service/worker/diagnostics/workflow_test.go

@@ -63,6 +63,7 @@ func (s *diagnosticsWorkflowTestSuite) SetupTest() {
 	mockResource := resource.NewTest(s.T(), controller, metrics.Worker)
 	publicClient := mockResource.GetSDKClient()
 	s.dw = &dw{
+		logger:        mockResource.GetLogger(),
 		svcClient:     publicClient,
 		clientBean:    mockResource.ClientBean,
 		metricsClient: mockResource.GetMetricsClient(),
@@ -164,6 +165,21 @@ func (s *diagnosticsWorkflowTestSuite) TestWorkflow_Error() {
 	s.EqualError(s.workflowEnv.GetWorkflowError(), errExpected.Error())
 }
 
+func (s *diagnosticsWorkflowTestSuite) TestWorkflow_NoErrorIfEmitLogsActivityFails() {
+	params := &DiagnosticsWorkflowInput{
+		Domain:     "test",
+		WorkflowID: "123",
+		RunID:      "abc",
+	}
+	mockErr := errors.New("mockErr")
+	s.workflowEnv.OnActivity(identifyIssuesActivity, mock.Anything, mock.Anything).Return(nil, nil)
+	s.workflowEnv.OnActivity(rootCauseIssuesActivity, mock.Anything, mock.Anything).Return(nil, nil)
+	s.workflowEnv.OnActivity(emitUsageLogsActivity, mock.Anything, mock.Anything).Return(mockErr)
+	s.workflowEnv.ExecuteWorkflow(diagnosticsStarterWorkflow, params)
+	s.True(s.workflowEnv.IsWorkflowCompleted())
+	s.NoError(s.workflowEnv.GetWorkflowError())
+}
+
 func (s *diagnosticsWorkflowTestSuite) queryDiagnostics() DiagnosticsStarterWorkflowResult {
 	queryFuture, err := s.workflowEnv.QueryWorkflow(queryDiagnosticsReport)
 	s.NoError(err)