Skip to content

Commit ea722f6

Browse files
cuichen01zero3233-bdtaoyifan89
authored
[feat][backend]trace impl mult repo (#323)
* mult repo * mult repo * mult repo * mult repo * mult repo * mult repo * mult repo * mult repo * mult repo * mult repo * mult repo * mult repo * init lib * init lib * update otel lib * update otel lib * update otel lib * update otel lib * update otel lib * update otel lib * update IStorageProvider * update IStorageProvider * update IStorageProvider * merge main * fix * update * update * test * fix oapi * anno callback * anno callback * anno callback * anno callback * anno callback * update lib * update lib * update lib * test * test * test * fix panic * 修复并补充backend/modules/observability目录下的UT - 修复backend/modules/observability/infra/repo/ck/spans_test.go中的未定义QueryParam类型错误 - 修复backend/modules/observability/infra/repo/trace_test.go中的多个构建和运行时错误 - 创建backend/modules/observability/application/convertor/page_test.go用于测试新的convertor函数 - 创建backend/modules/observability/application/convertor/task/filter_test.go用于测试新的TaskFilters转换函数 - 修复mock文件中的包导入和类型引用错误 - 确保所有trace repo测试用例通过 主要修复内容包括： - 修正结构体字段名称不匹配问题(spansDao → spanDaos) - 添加缺失的mockStorageProvider实现 - 更新所有构造函数调用以使用正确的TraceRepoOption模式 - 修复mock期望以匹配实际方法签名 - 解决参数匹配问题 所有测试现已通过，确保代码库保持高质量和可靠性。 * 修复backend/modules/observability/domain下的UT问题 - 修复backend/modules/observability/domain/task/service/task_service_test.go中的构建错误 - 修复NewTaskServiceImpl构造函数调用，添加缺失的必需参数 - 创建stubIDGenerator、stubStorageProvider、stubTenantProvider实现 - 修复测试函数中直接使用未导出类型的问题 - 修复backend/modules/observability/domain/task/service/task_callback_test.go中的mock期望问题 - 添加缺失的GetTask方法期望 - 修复TaskCallbackServiceImpl初始化时缺少的taskRepo字段 - 修复backend/modules/observability/domain/trace/service/trace_service_test.go中的参数匹配问题 - 修复SearchTraceOApi测试中GetTrace参数期望不匹配问题 所有TaskServiceImpl、TaskCallbackServiceImpl和TraceServiceImpl相关的测试现已通过，确保代码库的稳定性和可靠性。 * update * fix UT * fix * fix UT * fix UT * Change auto eval target type. Change-Id: Idef45fe757a98f87c5f731934a47d11e57fcd953 * Change eval target type. Change-Id: I92b5ca667d4bf5aac67ca7ccd069902b664c4713 * fix * 修复并补充auto_evaluate_test.go的单元测试 - 修复了buildTestTask函数中缺失的SpanFilter字段导致的空指针解引用问题 - 修正了SpanFilter相关的类型定义错误 - 补充了buildEvalTargetParam函数的测试用例，覆盖不同平台类型 - 添加了NewAutoEvaluteProcessor构造函数测试 - 补充了错误处理路径的测试用例 - 整体测试覆盖率从74.3%提升到76.5% - 关键函数buildEvalTargetParam覆盖率从66.7%提升到100% * fix UT * ad d UT * remove anno param * Add eval target builder. Change-Id: If250f611f76eea274015338ab60f5182dafbfb91 * Add ctx. Change-Id: I06e02341ff906c1606de20a6e3c4361d24d10bd4 * Fix ut. Change-Id: I3630c4bcd80b1a49a519dce44e2ac5a59e0650d9 * Re push. Change-Id: I74c5826df4f346ea0dfeeba1d96ba67df1d043b8 * add UT * add UT * fix UT * fix UT * fix UT * fix UT * fix UT --------- Co-authored-by: zhaoxun.3233 <zhaoxun.3233@bytedance.com> Co-authored-by: taoyifan89 <taoyifan@bytedance.com>
1 parent e3c8972 commit ea722f6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+4982
-880
lines changed

‎backend/api/api.go‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/api/handler/coze/loop/apis/wire.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import (
4545
foundationapp "github.com/coze-dev/coze-loop/backend/modules/foundation/application"
4646
llmapp "github.com/coze-dev/coze-loop/backend/modules/llm/application"
4747
obapp "github.com/coze-dev/coze-loop/backend/modules/observability/application"
48+
"github.com/coze-dev/coze-loop/backend/modules/observability/domain/component/storage"
4849
promptapp "github.com/coze-dev/coze-loop/backend/modules/prompt/application"
4950
"github.com/coze-dev/coze-loop/backend/pkg/conf"
5051
)
@@ -216,6 +217,7 @@ func InitObservabilityHandler(
216217
datasetClient datasetservice.Client,
217218
redis redis.Cmdable,
218219
persistentCmdable redis.PersistentCmdable,
220+
storageProvider storage.IStorageProvider,
219221
experimentClient experimentservice.Client,
220222
taskProcessor task_processor.TaskProcessor,
221223
aid int32,

‎backend/api/handler/coze/loop/apis/wire_gen.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/go.mod‎

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/coze-dev/coze-loop/backend
22

3-
go 1.24.1
4-
5-
toolchain go1.24.6
3+
go 1.24.6
64

75
replace github.com/apache/thrift => github.com/apache/thrift v0.13.0
86

@@ -17,9 +15,9 @@ require (
1715
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
1816
github.com/aws/aws-sdk-go v1.55.7
1917
github.com/baidubce/bce-qianfan-sdk/go/qianfan v0.0.15
20-
github.com/bytedance/gg v1.0.0
18+
github.com/bytedance/gg v1.1.0
2119
github.com/bytedance/gopkg v0.1.3
22-
github.com/bytedance/sonic v1.14.1
20+
github.com/bytedance/sonic v1.14.2
2321
github.com/cenk/backoff v2.2.1+incompatible
2422
github.com/cloudwego/eino v0.3.55
2523
github.com/cloudwego/eino-ext/components/model/ark v0.1.8
@@ -32,13 +30,12 @@ require (
3230
github.com/cloudwego/eino-ext/components/model/qianfan v0.0.0-20250520101807-b2008771903a
3331
github.com/cloudwego/eino-ext/components/model/qwen v0.0.0-20250520101807-b2008771903a
3432
github.com/cloudwego/eino-ext/libs/acl/openai v0.0.0-20250519084852-38fafa73d9ea
35-
github.com/cloudwego/gopkg v0.1.4
33+
github.com/cloudwego/gopkg v0.1.6
3634
github.com/cloudwego/hertz v0.10.1
37-
github.com/cloudwego/kitex v0.13.1
35+
github.com/cloudwego/kitex v0.15.2
3836
github.com/coocood/freecache v1.2.4
3937
github.com/coreos/go-semver v0.3.0
40-
github.com/coze-dev/cozeloop-go v0.1.14
41-
github.com/coze-dev/cozeloop-go/spec v0.1.4-0.20250829072213-3812ddbfb735
38+
github.com/coze-dev/cozeloop-go/spec v0.1.6
4239
github.com/deatil/go-encoding v1.0.3003
4340
github.com/dimchansky/utfbom v1.1.1
4441
github.com/dolthub/go-mysql-server v0.18.0
@@ -77,18 +74,18 @@ require (
7774
github.com/sirupsen/logrus v1.9.3
7875
github.com/spf13/cast v1.7.1
7976
github.com/spf13/viper v1.20.1
80-
github.com/stretchr/testify v1.10.0
77+
github.com/stretchr/testify v1.11.1
8178
github.com/valyala/fasttemplate v1.2.2
8279
github.com/vincent-petithory/dataurl v1.0.0
8380
github.com/volcengine/volcengine-go-sdk v1.1.4
8481
github.com/xeipuuv/gojsonschema v1.2.0
85-
go.opentelemetry.io/proto/otlp v1.7.1
82+
go.opentelemetry.io/proto/otlp v1.9.0
8683
go.uber.org/mock v0.4.0
87-
golang.org/x/crypto v0.40.0
84+
golang.org/x/crypto v0.41.0
8885
golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476
8986
golang.org/x/sync v0.16.0
90-
golang.org/x/text v0.27.0
91-
gonum.org/v1/gonum v0.15.0
87+
golang.org/x/text v0.28.0
88+
gonum.org/v1/gonum v0.16.0
9289
google.golang.org/api v0.215.0
9390
gorm.io/datatypes v1.2.5
9491
gorm.io/driver/clickhouse v0.6.1
@@ -99,9 +96,13 @@ require (
9996
gorm.io/plugin/soft_delete v1.2.1
10097
)
10198

102-
require github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
99+
require github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
103100

104-
require github.com/brianvoe/gofakeit/v6 v6.28.0
101+
require (
102+
github.com/brianvoe/gofakeit/v6 v6.28.0
103+
github.com/coze-dev/coze-loop/backend/modules/observability/lib v0.0.0-00010101000000-000000000000
104+
github.com/coze-dev/cozeloop-go v0.1.16
105+
)
105106

106107
require (
107108
cloud.google.com/go v0.116.0 // indirect
@@ -132,19 +133,18 @@ require (
132133
github.com/baidubce/bce-sdk-go v0.9.164 // indirect
133134
github.com/bluele/gcache v0.0.2 // indirect
134135
github.com/bufbuild/protocompile v0.8.0 // indirect
135-
github.com/bytedance/sonic/loader v0.3.0 // indirect
136+
github.com/bytedance/sonic/loader v0.4.0 // indirect
136137
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
137138
github.com/cespare/xxhash/v2 v2.3.0 // indirect
138139
github.com/cloudwego/base64x v0.1.6 // indirect
139140
github.com/cloudwego/configmanager v0.2.3 // indirect
140-
github.com/cloudwego/dynamicgo v0.6.2 // indirect
141+
github.com/cloudwego/dynamicgo v0.7.0 // indirect
141142
github.com/cloudwego/fastpb v0.0.5 // indirect
142-
github.com/cloudwego/frugal v0.2.5 // indirect
143-
github.com/cloudwego/iasm v0.2.0 // indirect
143+
github.com/cloudwego/frugal v0.3.0 // indirect
144144
github.com/cloudwego/localsession v0.1.2 // indirect
145-
github.com/cloudwego/netpoll v0.7.0 // indirect
145+
github.com/cloudwego/netpoll v0.7.2 // indirect
146146
github.com/cloudwego/runtimex v0.1.1 // indirect
147-
github.com/cloudwego/thriftgo v0.4.1 // indirect
147+
github.com/cloudwego/thriftgo v0.4.3 // indirect
148148
github.com/cohesion-org/deepseek-go v1.2.8 // indirect
149149
github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect
150150
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -238,23 +238,23 @@ require (
238238
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
239239
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
240240
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
241-
go.opentelemetry.io/otel v1.36.0
242-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
243-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
241+
go.opentelemetry.io/otel v1.38.0 // indirect
242+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
243+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
244244
go.uber.org/atomic v1.11.0 // indirect
245245
go.uber.org/multierr v1.11.0 // indirect
246246
go.uber.org/zap v1.27.0 // indirect
247247
golang.org/x/arch v0.15.0 // indirect
248-
golang.org/x/mod v0.25.0 // indirect
249-
golang.org/x/net v0.42.0 // indirect
248+
golang.org/x/mod v0.26.0 // indirect
249+
golang.org/x/net v0.43.0 // indirect
250250
golang.org/x/oauth2 v0.30.0 // indirect
251-
golang.org/x/sys v0.34.0 // indirect
251+
golang.org/x/sys v0.35.0 // indirect
252252
golang.org/x/time v0.8.0 // indirect
253-
golang.org/x/tools v0.34.0 // indirect
254-
google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0 // indirect
255-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
256-
google.golang.org/grpc v1.74.2
257-
google.golang.org/protobuf v1.36.6
253+
golang.org/x/tools v0.35.0 // indirect
254+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
255+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
256+
google.golang.org/grpc v1.75.1
257+
google.golang.org/protobuf v1.36.10
258258
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
259259
gopkg.in/src-d/go-errors.v1 v1.0.0 // indirect
260260
gopkg.in/yaml.v2 v2.4.0
@@ -264,3 +264,5 @@ require (
264264
gorm.io/rawsql v1.0.3-0.20250401110442-7e49778bc820
265265
stathat.com/c/consistent v1.0.0 // indirect
266266
)
267+
268+
replace github.com/coze-dev/coze-loop/backend/modules/observability/lib => github.com/coze-dev/coze-loop/backend/modules/observability/lib v0.0.0-20251118131611-99b3d466d529

0 commit comments

Comments
 (0)