Skip to content

Commit 1a3defa

Browse files
author
tpfz
committed
fix trace
1 parent a4eede9 commit 1a3defa

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎backend/modules/evaluation/domain/service/evaluator_source_code_impl.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ func (c *EvaluatorSourceCodeServiceImpl) Run(ctx context.Context, evaluator *ent
204204
var code string
205205
startTime := time.Now()
206206
// 创建trace span
207-
rootSpan, ctx := c.newEvaluatorSpan(ctx, evaluator.Name, "LoopEvaluation", strconv.FormatInt(evaluator.SpaceID, 10), disableTracing)
207+
rootSpan, ctx := c.newEvaluatorSpan(ctx, evaluator.Name, "LoopEvaluation", strconv.FormatInt(exptSpaceID, 10), disableTracing)
208208
traceID = rootSpan.GetTraceID()
209209

210210
defer func() {

‎backend/modules/evaluation/domain/service/evaluator_source_prompt_impl.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ func (p *EvaluatorSourcePromptServiceImpl) Run(ctx context.Context, evaluator *e
7777
var rootSpan *evaluatorSpan
7878

7979
if !disableTracing {
80-
rootSpan, ctx = newEvaluatorSpan(ctx, evaluator.Name, "LoopEvaluation", strconv.FormatInt(evaluator.SpaceID, 10), false)
80+
rootSpan, ctx = newEvaluatorSpan(ctx, evaluator.Name, "LoopEvaluation", strconv.FormatInt(exptSpaceID, 10), false)
8181
traceID = rootSpan.GetTraceID()
8282
} else {
8383
traceID = ""
8484
}
8585

86-
defer func() {
86+
defer func() {
8787
if output == nil {
8888
output = &entity.EvaluatorOutputData{
8989
EvaluatorRunError: &entity.EvaluatorRunError{},
@@ -137,24 +137,24 @@ func (p *EvaluatorSourcePromptServiceImpl) Run(ctx context.Context, evaluator *e
137137
modelID = strconv.FormatInt(evaluator.PromptEvaluatorVersion.ModelConfig.ModelID, 10)
138138
}
139139

140-
p.metric.EmitRun(evaluator.SpaceID, err, startTime, modelID)
140+
p.metric.EmitRun(exptSpaceID, err, startTime, modelID)
141141
}()
142142
// 渲染变量
143-
err = renderTemplate(ctx, evaluator.PromptEvaluatorVersion, input, disableTracing)
143+
err = renderTemplate(ctx, evaluator.PromptEvaluatorVersion, input, exptSpaceID, disableTracing)
144144
if err != nil {
145145
logs.CtxError(ctx, "[RunEvaluator] renderTemplate fail, err: %v", err)
146146
runStatus = entity.EvaluatorRunStatusFail
147147
return nil, runStatus, traceID
148148
}
149149
// 执行评估逻辑
150150
userIDInContext := session.UserIDInCtxOrEmpty(ctx)
151-
llmResp, err := p.chat(ctx, evaluator.PromptEvaluatorVersion, userIDInContext, disableTracing)
151+
llmResp, err := p.chat(ctx, evaluator.PromptEvaluatorVersion, exptSpaceID, userIDInContext, disableTracing)
152152
if err != nil {
153153
logs.CtxError(ctx, "[RunEvaluator] chat fail, err: %v", err)
154154
runStatus = entity.EvaluatorRunStatusFail
155155
return nil, runStatus, traceID
156156
}
157-
output, err = parseOutput(ctx, evaluator.PromptEvaluatorVersion, llmResp, disableTracing)
157+
output, err = parseOutput(ctx, evaluator.PromptEvaluatorVersion, llmResp, exptSpaceID, disableTracing)
158158
if err != nil {
159159
logs.CtxWarn(ctx, "[RunEvaluator] parseOutput fail, err: %v", err)
160160
runStatus = entity.EvaluatorRunStatusFail
@@ -163,12 +163,12 @@ func (p *EvaluatorSourcePromptServiceImpl) Run(ctx context.Context, evaluator *e
163163
return output, entity.EvaluatorRunStatusSuccess, traceID
164164
}
165165

166-
func (p *EvaluatorSourcePromptServiceImpl) chat(ctx context.Context, evaluatorVersion *entity.PromptEvaluatorVersion, userIDInContext string, disableTracing bool) (resp *entity.ReplyItem, err error) {
166+
func (p *EvaluatorSourcePromptServiceImpl) chat(ctx context.Context, evaluatorVersion *entity.PromptEvaluatorVersion, exptSpaceID int64, userIDInContext string, disableTracing bool) (resp *entity.ReplyItem, err error) {
167167
var modelSpan *evaluatorSpan
168168
modelCtx := ctx
169169

170-
if !disableTracing {
171-
modelSpan, modelCtx = newEvaluatorSpan(ctx, evaluatorVersion.ModelConfig.ModelName, "model", strconv.FormatInt(evaluatorVersion.SpaceID, 10), true)
170+
if !disableTracing {
171+
modelSpan, modelCtx = newEvaluatorSpan(ctx, evaluatorVersion.ModelConfig.ModelName, "model", strconv.FormatInt(exptSpaceID, 10), true)
172172
defer func() {
173173
modelSpan.reportModelSpan(modelCtx, evaluatorVersion, resp, err)
174174
}()
@@ -182,8 +182,8 @@ func (p *EvaluatorSourcePromptServiceImpl) chat(ctx context.Context, evaluatorVe
182182
}
183183
}
184184

185-
llmCallParam := &entity.LLMCallParam{
186-
SpaceID: evaluatorVersion.GetSpaceID(),
185+
llmCallParam := &entity.LLMCallParam{
186+
SpaceID: exptSpaceID,
187187
EvaluatorID: strconv.FormatInt(evaluatorVersion.EvaluatorID, 10),
188188
UserID: gptr.Of(userIDInContext),
189189
Scenario: entity.ScenarioEvaluator,
@@ -326,14 +326,14 @@ func (e *evaluatorSpan) reportOutputParserSpan(ctx context.Context, replyItem *e
326326
e.Finish(ctx)
327327
}
328328

329-
func parseOutput(ctx context.Context, evaluatorVersion *entity.PromptEvaluatorVersion, replyItem *entity.ReplyItem, disableTracing bool) (output *entity.EvaluatorOutputData, err error) {
329+
func parseOutput(ctx context.Context, evaluatorVersion *entity.PromptEvaluatorVersion, replyItem *entity.ReplyItem, exptSpaceID int64, disableTracing bool) (output *entity.EvaluatorOutputData, err error) {
330330
// 输出数据全空直接返回
331331
var outputParserSpan *evaluatorSpan
332-
if !disableTracing {
333-
outputParserSpan, ctx = newEvaluatorSpan(ctx, "ParseOutput", "LoopEvaluation", strconv.FormatInt(evaluatorVersion.SpaceID, 10), true)
334-
defer func() {
335-
outputParserSpan.reportOutputParserSpan(ctx, replyItem, output, strconv.FormatInt(evaluatorVersion.SpaceID, 10), err)
336-
}()
332+
if !disableTracing {
333+
outputParserSpan, ctx = newEvaluatorSpan(ctx, "ParseOutput", "LoopEvaluation", strconv.FormatInt(exptSpaceID, 10), true)
334+
defer func() {
335+
outputParserSpan.reportOutputParserSpan(ctx, replyItem, output, strconv.FormatInt(exptSpaceID, 10), err)
336+
}()
337337
}
338338
output = &entity.EvaluatorOutputData{
339339
EvaluatorResult: &entity.EvaluatorResult{},
@@ -481,7 +481,7 @@ func parseFunctionCallOutput(ctx context.Context, evaluatorVersion *entity.Promp
481481
return nil
482482
}
483483

484-
func renderTemplate(ctx context.Context, evaluatorVersion *entity.PromptEvaluatorVersion, input *entity.EvaluatorInputData, disableTracing bool) error {
484+
func renderTemplate(ctx context.Context, evaluatorVersion *entity.PromptEvaluatorVersion, input *entity.EvaluatorInputData, exptSpaceID int64, disableTracing bool) error {
485485
// 实现渲染模板的逻辑
486486
variables := make([]*tracespec.PromptArgument, 0)
487487
for k, v := range input.InputFields {
@@ -511,8 +511,8 @@ func renderTemplate(ctx context.Context, evaluatorVersion *entity.PromptEvaluato
511511
}
512512

513513
var renderTemplateSpan *evaluatorSpan
514-
if !disableTracing {
515-
renderTemplateSpan, ctx = newEvaluatorSpan(ctx, "RenderTemplate", "prompt", strconv.FormatInt(evaluatorVersion.SpaceID, 10), true)
514+
if !disableTracing {
515+
renderTemplateSpan, ctx = newEvaluatorSpan(ctx, "RenderTemplate", "prompt", strconv.FormatInt(exptSpaceID, 10), true)
516516
renderTemplateSpan.SetInput(ctx, tracer.Convert2TraceString(tracer.ConvertPrompt2Ob(evaluatorVersion.MessageList, variables)))
517517
}
518518
for _, message := range evaluatorVersion.MessageList {

0 commit comments

Comments
 (0)