Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "logging test" #723

Merged
merged 1 commit into from
Jan 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion server/neptune/temporalworker/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ func (s Server) Start() error {
Interceptors: []interceptor.WorkerInterceptor{
temporal.NewWorkerInterceptor(),
},
EnableLoggingInReplay: true,
})
prWorker.RegisterActivity(s.GithubActivities)
prWorker.RegisterActivity(s.TerraformActivities)
Expand Down
8 changes: 0 additions & 8 deletions server/neptune/workflows/internal/notifier/github.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ func (c *GithubCheckRunCache) CreateOrUpdate(ctx workflow.Context, deploymentID

// if we haven't created one, let's do so now
if !ok {
workflow.GetLogger(ctx).Info(fmt.Sprintf("cache before create: %v", c.deploymentCheckRunCache))
resp, err := c.load(ctx, deploymentID, request)
if err != nil {
return 0, err
Expand All @@ -67,20 +66,17 @@ func (c *GithubCheckRunCache) CreateOrUpdate(ctx workflow.Context, deploymentID
if resp.ID != 0 {
c.deploymentCheckRunCache[key] = resp.ID
c.deleteIfCompleted(resp.Status, key)
workflow.GetLogger(ctx).Info(fmt.Sprintf("cache after create: %v", c.deploymentCheckRunCache))
}

return resp.ID, nil
}

// update existing checks
workflow.GetLogger(ctx).Info(fmt.Sprintf("cache before update: %v", c.deploymentCheckRunCache))
resp, err := c.update(ctx, deploymentID, request, checkRunID)
if err != nil {
return 0, err
}
c.deleteIfCompleted(resp.Status, key)
workflow.GetLogger(ctx).Info(fmt.Sprintf("cache after create: %v", c.deploymentCheckRunCache))

return checkRunID, nil
}
Expand All @@ -106,9 +102,7 @@ func (c *GithubCheckRunCache) update(ctx workflow.Context, externalID string, re
}

var resp activities.UpdateCheckRunResponse
workflow.GetLogger(ctx).Info(fmt.Sprintf("executing update check run activity: %s %s", request.Title, request.Sha))
err := workflow.ExecuteActivity(ctx, c.activities.GithubUpdateCheckRun, updateCheckRunRequest).Get(ctx, &resp)
workflow.GetLogger(ctx).Info(fmt.Sprintf("update check run activity complete: %s %s", request.Title, request.Sha))
if err != nil {
return resp, errors.Wrapf(err, "updating check run with id: %d", checkRunID)
}
Expand All @@ -128,9 +122,7 @@ func (c *GithubCheckRunCache) load(ctx workflow.Context, externalID string, requ
}

var resp activities.CreateCheckRunResponse
workflow.GetLogger(ctx).Info(fmt.Sprintf("executing create check run activity: %s %s", request.Title, request.Sha))
err := workflow.ExecuteActivity(ctx, c.activities.GithubCreateCheckRun, createCheckRunRequest).Get(ctx, &resp)
workflow.GetLogger(ctx).Info(fmt.Sprintf("create check run activity complete: %s %s", request.Title, request.Sha))
if err != nil {
return resp, errors.Wrap(err, "creating check run")
}
Expand Down
2 changes: 0 additions & 2 deletions server/neptune/workflows/internal/pr/revision/processor.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package revision

import (
"fmt"
"github.com/google/uuid"
metricNames "github.com/runatlantis/atlantis/server/metrics"
internalContext "github.com/runatlantis/atlantis/server/neptune/context"
Expand Down Expand Up @@ -148,7 +147,6 @@ func (p *Processor) awaitChildTerraformWorkflows(ctx workflow.Context, futures [
workflow.GetLogger(workflow.WithValue(ctx, internalContext.ErrKey, err)).Error("executing terraform workflow")
return
}
workflow.GetLogger(ctx).Info(fmt.Sprintf("child tf workflow ready: %s", resp.WorkflowState.ID))
results = append(results, resp)
})
}
Expand Down
1 change: 0 additions & 1 deletion server/neptune/workflows/internal/pr/revision/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ func (s *StateReceiver) Notify(ctx workflow.Context, workflowState *state.Workfl
workflow.GetLogger(ctx).Warn(fmt.Sprintf("skipping notifying root %s", workflowState.ID))
return
}
workflow.GetLogger(ctx).Info(fmt.Sprintf("receiving state change signal: %s", rootInfo.Root.Name))

for _, notifier := range s.InternalNotifiers {
if err := notifier.Notify(ctx, rootInfo.ToInternalInfo(), workflowState); err != nil {
Expand Down
Loading