Skip to content

fix: set org header for AI Fix #106

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
merged 5 commits into from
Jul 28, 2025
Merged

fix: set org header for AI Fix #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
619936b
fix: set org header
ShawkyZ Jul 28, 2025
0f6c340
chore: lint
ShawkyZ Jul 28, 2025
d22d718
fix: use span context
ShawkyZ Jul 28, 2025
1cb6a93
fix: use context from span in feedback
ShawkyZ Jul 28, 2025
750d051
fix: use spans
ShawkyZ Jul 28, 2025
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
29 changes: 19 additions & 10 deletions llm/api_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (d *DeepCodeLLMBindingImpl) runExplain(ctx context.Context, options Explain
}
}

responseBody, err := d.submitRequest(ctx, u, requestBody)
responseBody, err := d.submitRequest(span.Context(), u, requestBody, "")
if err != nil {
return Explanations{}, err
}
Expand All @@ -62,17 +62,19 @@ func (d *DeepCodeLLMBindingImpl) runExplain(ctx context.Context, options Explain
return explains, nil
}

func (d *DeepCodeLLMBindingImpl) submitRequest(ctx context.Context, url *url.URL, requestBody []byte) ([]byte, error) {
func (d *DeepCodeLLMBindingImpl) submitRequest(ctx context.Context, url *url.URL, requestBody []byte, orgId string) ([]byte, error) {
logger := d.logger.With().Str("method", "submitRequest").Logger()
logger.Trace().Str("payload body: %s\n", string(requestBody)).Msg("Marshaled payload")
span := d.instrumentor.StartSpan(ctx, "code.SubmitRequest")
defer span.Finish()

req, err := http.NewRequestWithContext(ctx, http.MethodPost, url.String(), bytes.NewBuffer(requestBody))
if err != nil {
logger.Err(err).Str("requestBody", string(requestBody)).Msg("error creating request")
return nil, err
}

d.addDefaultHeaders(req)
d.addDefaultHeaders(req, span.GetTraceId(), orgId)

resp, err := d.httpClientFunc().Do(req) //nolint:bodyclose // this seems to be a false positive
if err != nil {
Expand Down Expand Up @@ -123,11 +125,11 @@ func (d *DeepCodeLLMBindingImpl) explainRequestBody(options *ExplainOptions) ([]

var failed = AutofixStatus{Message: "FAILED"}

func (d *DeepCodeLLMBindingImpl) runAutofix(ctx context.Context, requestId string, options AutofixOptions) (AutofixResponse, AutofixStatus, error) {
func (d *DeepCodeLLMBindingImpl) runAutofix(ctx context.Context, options AutofixOptions) (AutofixResponse, AutofixStatus, error) {
span := d.instrumentor.StartSpan(ctx, "code.RunAutofix")
defer span.Finish()

logger := d.logger.With().Str("method", "code.RunAutofix").Str("requestId", requestId).Logger()
logger := d.logger.With().Str("method", "code.RunAutofix").Str("requestId", span.GetTraceId()).Logger()

endpoint, err := url.Parse(fmt.Sprintf("%s/autofix/suggestions", options.Host))
if err != nil {
Expand All @@ -142,7 +144,7 @@ func (d *DeepCodeLLMBindingImpl) runAutofix(ctx context.Context, requestId strin
}

logger.Info().Msg("Started obtaining autofix Response")
responseBody, err := d.submitRequest(ctx, endpoint, requestBody)
responseBody, err := d.submitRequest(span.Context(), endpoint, requestBody, options.CodeRequestContext.Org.PublicId)
logger.Info().Msg("Finished obtaining autofix Response")

if err != nil {
Expand Down Expand Up @@ -199,11 +201,11 @@ func (d *DeepCodeLLMBindingImpl) autofixRequestBody(options *AutofixOptions) ([]
return requestBody, err
}

func (d *DeepCodeLLMBindingImpl) submitAutofixFeedback(ctx context.Context, requestId string, options AutofixFeedbackOptions) error {
func (d *DeepCodeLLMBindingImpl) submitAutofixFeedback(ctx context.Context, options AutofixFeedbackOptions) error {
span := d.instrumentor.StartSpan(ctx, "code.SubmitAutofixFeedback")
defer span.Finish()

logger := d.logger.With().Str("method", "code.SubmitAutofixFeedback").Str("requestId", requestId).Logger()
logger := d.logger.With().Str("method", "code.SubmitAutofixFeedback").Str("requestId", span.GetTraceId()).Logger()

endpoint, err := url.Parse(fmt.Sprintf("%s/autofix/event", options.Host))
if err != nil {
Expand All @@ -218,7 +220,7 @@ func (d *DeepCodeLLMBindingImpl) submitAutofixFeedback(ctx context.Context, requ
}

logger.Info().Msg("Started obtaining autofix Response")
_, err = d.submitRequest(ctx, endpoint, requestBody)
_, err = d.submitRequest(span.Context(), endpoint, requestBody, options.CodeRequestContext.Org.PublicId)
logger.Info().Msg("Finished obtaining autofix Response")

return err
Expand Down Expand Up @@ -257,7 +259,14 @@ func prepareDiffs(diffs []string) []string {
return encodedDiffs
}

func (d *DeepCodeLLMBindingImpl) addDefaultHeaders(req *http.Request) {
func (d *DeepCodeLLMBindingImpl) addDefaultHeaders(req *http.Request, requestId string, orgId string) {
// if requestId is empty it will be enriched from the Gateway
if len(requestId) > 0 {
req.Header.Set("snyk-request-id", requestId)
}
if len(orgId) > 0 {
req.Header.Set("snyk-org-name", orgId)
}
req.Header.Set("Cache-Control", "private, max-age=0, no-cache")
req.Header.Set("Content-Type", "application/json")
}
2 changes: 1 addition & 1 deletion llm/api_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ func TestAddDefaultHeadersWithExistingHeaders(t *testing.T) {
d := &DeepCodeLLMBindingImpl{} // Initialize your struct if needed
req := &http.Request{Header: http.Header{"Existing-Header": {"existing-value"}}}

d.addDefaultHeaders(req)
d.addDefaultHeaders(req, "", "")

cacheControl := req.Header.Get("Cache-Control")
contentType := req.Header.Get("Content-Type")
Expand Down
11 changes: 6 additions & 5 deletions llm/binding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,27 +63,28 @@ type DeepCodeLLMBindingImpl struct {
instrumentor observability.Instrumentor
}

func (d *DeepCodeLLMBindingImpl) SubmitAutofixFeedback(ctx context.Context, requestId string, options AutofixFeedbackOptions) error {
func (d *DeepCodeLLMBindingImpl) SubmitAutofixFeedback(ctx context.Context, fixId string, options AutofixFeedbackOptions) error {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this wasn't the requestID
LS is sending the fixId here

We will need to refactor this after the planned hotfix.

method := "SubmitAutofixFeedback"
span := d.instrumentor.StartSpan(ctx, method)
defer d.instrumentor.Finish(span)
logger := d.logger.With().Str("method", method).Str("requestId", requestId).Logger()
logger := d.logger.With().Str("method", method).Str("fixId", fixId).Logger()
logger.Info().Msg("Started submitting autofix feedback")
defer logger.Info().Msg("Finished submitting autofix feedback")

err := d.submitAutofixFeedback(ctx, requestId, options)
err := d.submitAutofixFeedback(span.Context(), options)
return err
}

func (d *DeepCodeLLMBindingImpl) GetAutofixDiffs(ctx context.Context, requestId string, options AutofixOptions) (unifiedDiffSuggestions []AutofixUnifiedDiffSuggestion, status AutofixStatus, err error) {
func (d *DeepCodeLLMBindingImpl) GetAutofixDiffs(ctx context.Context, _ string, options AutofixOptions) (unifiedDiffSuggestions []AutofixUnifiedDiffSuggestion, status AutofixStatus, err error) {
method := "GetAutofixDiffs"
span := d.instrumentor.StartSpan(ctx, method)
defer d.instrumentor.Finish(span)
requestId := span.GetTraceId()
logger := d.logger.With().Str("method", method).Str("requestId", requestId).Logger()
logger.Info().Msg("Started obtaining autofix diffs")
defer logger.Info().Msg("Finished obtaining autofix diffs")

autofixResponse, status, err := d.runAutofix(ctx, requestId, options)
autofixResponse, status, err := d.runAutofix(span.Context(), options)
if err != nil {
return nil, status, err
}
Expand Down