Skip to content

Commit a2d88c8

Browse files
authored
Merge pull request #51 from kitex-contrib/chore/fix-ci
chore: simply CI & update go mod
2 parents c58c642 + 919ecbd commit a2d88c8

File tree

7 files changed

+71
-427
lines changed

7 files changed

+71
-427
lines changed

.github/workflows/codeql-analysis.yml

-83
This file was deleted.

.github/workflows/pr-check.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Pull Request Check
22

3-
on: pull_request
3+
on: [ pull_request ]
44

55
jobs:
66
resolve-modules:
@@ -28,28 +28,28 @@ jobs:
2828
with:
2929
version: latest
3030
working-directory: ${{ matrix.workdir }}
31-
args: -E gofumpt --timeout 5m --go 1.21
31+
args: -E gofumpt --timeout 5m --go 1.23
3232
skip-pkg-cache: true
3333

34-
build:
34+
compliant-test:
3535
runs-on: ubuntu-latest
3636
steps:
3737
- uses: actions/checkout@v4
3838

3939
- name: Set up Go
40-
uses: actions/setup-go@v4
40+
uses: actions/setup-go@v5
4141
with:
42-
go-version: 1.21
42+
go-version: stable
4343

44-
- uses: actions/cache@v3
44+
- uses: actions/cache@v4
4545
with:
4646
path: ~/go/pkg/mod
4747
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
4848
restore-keys: |
4949
${{ runner.os }}-go-
5050
5151
- name: Check License Header
52-
uses: apache/skywalking-eyes@da0aa5d51adacfcb7d00cf2749246353a62501e4
52+
uses: apache/skywalking-eyes/[email protected]
5353
env:
5454
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5555

.github/workflows/push-check.yml

-60
This file was deleted.

.github/workflows/reviewdog.yml

-19
This file was deleted.

OWNERS

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
approvers:
2-
- CoderPoet
2+
- CoderPoet
3+
- rogerogers

go.mod

+20-19
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ module github.com/kitex-contrib/obs-opentelemetry
33
go 1.21
44

55
require (
6-
github.com/apache/thrift v0.16.0 // indirect
7-
github.com/bytedance/gopkg v0.0.0-20230728082804-614d0af6619b
8-
github.com/cloudwego/kitex v0.9.1
6+
github.com/bytedance/gopkg v0.1.1
7+
github.com/cloudwego/kitex v0.11.3
98
github.com/stretchr/testify v1.9.0
109
go.opentelemetry.io/contrib/instrumentation/runtime v0.45.0
1110
go.opentelemetry.io/contrib/propagators/b3 v1.20.0
@@ -21,24 +20,27 @@ require (
2120
)
2221

2322
require (
24-
github.com/bytedance/sonic v1.11.2 // indirect
23+
github.com/apache/thrift v0.16.0 // indirect
24+
github.com/bytedance/sonic v1.12.2 // indirect
25+
github.com/bytedance/sonic/loader v0.2.0 // indirect
2526
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
26-
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
27-
github.com/chenzhuoyu/iasm v0.9.1 // indirect
28-
github.com/choleraehyq/pid v0.0.18 // indirect
29-
github.com/cloudwego/configmanager v0.2.0 // indirect
30-
github.com/cloudwego/dynamicgo v0.2.0 // indirect
31-
github.com/cloudwego/fastpb v0.0.4 // indirect
32-
github.com/cloudwego/frugal v0.1.14 // indirect
27+
github.com/cloudwego/base64x v0.1.4 // indirect
28+
github.com/cloudwego/configmanager v0.2.2 // indirect
29+
github.com/cloudwego/dynamicgo v0.4.0 // indirect
30+
github.com/cloudwego/fastpb v0.0.5 // indirect
31+
github.com/cloudwego/frugal v0.2.0 // indirect
32+
github.com/cloudwego/gopkg v0.1.2 // indirect
33+
github.com/cloudwego/iasm v0.2.0 // indirect
3334
github.com/cloudwego/localsession v0.0.2 // indirect
34-
github.com/cloudwego/netpoll v0.6.0 // indirect
35-
github.com/cloudwego/thriftgo v0.3.6 // indirect
35+
github.com/cloudwego/netpoll v0.6.4 // indirect
36+
github.com/cloudwego/runtimex v0.1.0 // indirect
37+
github.com/cloudwego/thriftgo v0.3.17 // indirect
3638
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3739
github.com/fatih/structtag v1.2.0 // indirect
3840
github.com/go-logr/logr v1.4.1 // indirect
3941
github.com/go-logr/stdr v1.2.2 // indirect
4042
github.com/golang/protobuf v1.5.4 // indirect
41-
github.com/google/pprof v0.0.0-20230509042627-b1315fad0c5a // indirect
43+
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
4244
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
4345
github.com/iancoleman/strcase v0.2.0 // indirect
4446
github.com/jhump/protoreflect v1.8.2 // indirect
@@ -47,19 +49,18 @@ require (
4749
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
4850
github.com/modern-go/gls v0.0.0-20220109145502-612d0167dce5 // indirect
4951
github.com/modern-go/reflect2 v1.0.2 // indirect
50-
github.com/oleiade/lane v1.0.1 // indirect
5152
github.com/pmezard/go-difflib v1.0.0 // indirect
52-
github.com/tidwall/gjson v1.9.3 // indirect
53+
github.com/tidwall/gjson v1.17.3 // indirect
5354
github.com/tidwall/match v1.1.1 // indirect
5455
github.com/tidwall/pretty v1.2.0 // indirect
5556
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
5657
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect
5758
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
5859
go.uber.org/multierr v1.11.0 // indirect
5960
golang.org/x/arch v0.2.0 // indirect
60-
golang.org/x/net v0.23.0 // indirect
61-
golang.org/x/sync v0.6.0 // indirect
62-
golang.org/x/sys v0.18.0 // indirect
61+
golang.org/x/net v0.24.0 // indirect
62+
golang.org/x/sync v0.8.0 // indirect
63+
golang.org/x/sys v0.19.0 // indirect
6364
golang.org/x/text v0.14.0 // indirect
6465
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
6566
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect

0 commit comments

Comments
 (0)