Skip to content

chore: separate job dispatching from parent trace #802

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.

Sign up for GitHub

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

Merged
adityachoudhari26 merged 1 commit into from
Feb 11, 2026
Merged

chore: separate job dispatching from parent trace #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions apps/workspace-engine/pkg/workspace/jobagents/argo/argoapp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,12 @@ import (
"github.com/avast/retry-go"
"github.com/charmbracelet/log"
"github.com/goccy/go-yaml"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/trace"
)

var tracer = otel.Tracer("workspace-engine/jobagents/argo")

var _ types.Dispatchable = &ArgoApplication{}

type ArgoApplication struct {
Expand Down Expand Up @@ -66,21 +70,26 @@ func (a *ArgoApplication) Dispatch(ctx context.Context, dispatchCtx types.Dispat
a.makeApplicationK8sCompatible(app)

go func() {
ctx := context.WithoutCancel(ctx)
parentSpanCtx := trace.SpanContextFromContext(ctx)
asyncCtx, span := tracer.Start(context.Background(), "ArgoApplication.AsyncDispatch",
trace.WithLinks(trace.Link{SpanContext: parentSpanCtx}),
)
defer span.End()

ioCloser, appClient, err := a.getApplicationClient(serverAddr, apiKey)
if err != nil {
a.sendJobFailureEvent(dispatchCtx, fmt.Sprintf("failed to create ArgoCD client: %s", err.Error()))
return
}
defer ioCloser.Close()

if err := a.upsertApplicationWithRetry(ctx, app, appClient); err != nil {
if err := a.upsertApplicationWithRetry(asyncCtx, app, appClient); err != nil {
a.sendJobFailureEvent(dispatchCtx, fmt.Sprintf("failed to upsert application: %s", err.Error()))
return
}

verification := newArgoApplicationVerification(a.verifications, dispatchCtx.Job, app.Name, serverAddr, apiKey)
if err := verification.StartVerification(ctx, dispatchCtx.Job); err != nil {
if err := verification.StartVerification(asyncCtx, dispatchCtx.Job); err != nil {
a.sendJobFailureEvent(dispatchCtx, fmt.Sprintf("failed to start verification: %s", err.Error()))
return
}
Expand Down
15 changes: 12 additions & 3 deletions apps/workspace-engine/pkg/workspace/jobagents/github/githubaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@ import (

"github.com/golang-jwt/jwt/v4"
"github.com/google/go-github/v66/github"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/trace"
)

var tracer = otel.Tracer("workspace-engine/jobagents/github")

var _ types.Dispatchable = &GithubAction{}

type GithubAction struct {
Expand Down Expand Up @@ -57,16 +61,21 @@ func (a *GithubAction) Dispatch(ctx context.Context, dispatchCtx types.DispatchC
}

go func() {
ctx := context.WithoutCancel(ctx)
if _, err := client.Actions.CreateWorkflowDispatchEventByID(ctx, cfg.Owner, cfg.Repo, cfg.WorkflowId, github.CreateWorkflowDispatchEventRequest{
parentSpanCtx := trace.SpanContextFromContext(ctx)
asyncCtx, span := tracer.Start(context.Background(), "GithubAction.AsyncDispatch",
trace.WithLinks(trace.Link{SpanContext: parentSpanCtx}),
)
defer span.End()

if _, err := client.Actions.CreateWorkflowDispatchEventByID(asyncCtx, cfg.Owner, cfg.Repo, cfg.WorkflowId, github.CreateWorkflowDispatchEventRequest{
Ref: ref,
Inputs: map[string]any{"job_id": dispatchCtx.Job.Id},
}); err != nil {
message := fmt.Sprintf("failed to dispatch workflow: %s", err.Error())
dispatchCtx.Job.Status = oapi.JobStatusInvalidIntegration
dispatchCtx.Job.UpdatedAt = time.Now()
dispatchCtx.Job.Message = &message
a.store.Jobs.Upsert(ctx, dispatchCtx.Job)
a.store.Jobs.Upsert(asyncCtx, dispatchCtx.Job)
}
}()

Expand Down
Loading