Skip to content

Commit 07bb2f4

Browse files
authored
Merge branch 'master' into feat-add-rpc-name
2 parents b1db165 + 46e466f commit 07bb2f4

File tree

8 files changed

+13
-21
lines changed

8 files changed

+13
-21
lines changed

.codecov.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/go.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ jobs:
4141

4242
- name: Codecov
4343
uses: codecov/codecov-action@v5
44+
with:
45+
files: ./coverage.txt
46+
flags: unittests
47+
name: codecov-umbrella
48+
fail_ci_if_error: false
4449

4550
test-win:
4651
name: Windows

core/stores/sqlx/bulkinserter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ type (
2525
ResultHandler func(sql.Result, error)
2626

2727
// A BulkInserter is used to batch insert records.
28-
// Postgresql is not supported yet, because of the sql is formated with symbol `$`.
29-
// Oracle is not supported yet, because of the sql is formated with symbol `:`.
28+
// Postgresql is not supported yet, because of the sql is formatted with symbol `$`.
29+
// Oracle is not supported yet, because of the sql is formatted with symbol `:`.
3030
BulkInserter struct {
3131
executor *executors.PeriodicalExecutor
3232
inserter *dbInserter

core/trace/tracer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func TestExtractValidTraceContext(t *testing.T) {
8282
}),
8383
},
8484
{
85-
name: "invalid tracestate perserves traceparent",
85+
name: "invalid tracestate preserves traceparent",
8686
traceparent: "00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-00",
8787
tracestate: "invalid$@#=invalid",
8888
sc: trace.NewSpanContext(trace.SpanContextConfig{

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/jhump/protoreflect v1.17.0
1818
github.com/pelletier/go-toml/v2 v2.2.2
1919
github.com/prometheus/client_golang v1.21.1
20-
github.com/redis/go-redis/v9 v9.11.0
20+
github.com/redis/go-redis/v9 v9.12.0
2121
github.com/spaolacci/murmur3 v1.1.0
2222
github.com/stretchr/testify v1.10.0
2323
go.etcd.io/etcd/api/v3 v3.5.15

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ
158158
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
159159
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
160160
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
161-
github.com/redis/go-redis/v9 v9.11.0 h1:E3S08Gl/nJNn5vkxd2i78wZxWAPNZgUNTp8WIJUAiIs=
162-
github.com/redis/go-redis/v9 v9.11.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
161+
github.com/redis/go-redis/v9 v9.12.0 h1:XlVPGlflh4nxfhsNXPA8Qp6EmEfTo0rp8oaBzPipXnU=
162+
github.com/redis/go-redis/v9 v9.12.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
163163
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
164164
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
165165
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=

mcp/server_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1741,7 +1741,7 @@ func TestHandleSSEPing(t *testing.T) {
17411741
mock.server.clientsLock.Unlock()
17421742

17431743
assert.Equal(t, 1, clientCount, "One client should be added during the test")
1744-
assert.Equal(t, 0, finalClientCount, "Client should be cleaned up after context cancelation")
1744+
assert.Equal(t, 0, finalClientCount, "Client should be cleaned up after context cancellation")
17451745
}
17461746

17471747
// TestHandleSSEPing tests the automatic ping functionality in the SSE handler

tools/goctl/api/parser/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ line comments
639639
以下为对应语法块解析后细带doc和comment的写法
640640
``` api
641641
// syntaxLit doc
642-
syntax = "v1" // syntaxLit commnet
642+
syntax = "v1" // syntaxLit comment
643643
644644
info(
645645
// kvLit doc

0 commit comments

Comments
 (0)