Skip to content

Commit f13247d

Browse files
authored
Upgrade go version to 1.18 (#582)
1 parent 64cf448 commit f13247d

File tree

11 files changed

+983
-673
lines changed

11 files changed

+983
-673
lines changed

.github/workflows/go.yml

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
# If you want to matrix build , you can append the following list.
3636
matrix:
3737
go_version:
38-
- 1.16
3938
- 1.18
4039
- 1.19
4140
os:

go.mod

+28-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,38 @@
11
module github.com/alibaba/sentinel-golang
22

3-
go 1.16
3+
go 1.18
44

55
require (
66
github.com/fsnotify/fsnotify v1.4.7
77
github.com/google/uuid v1.1.1
88
github.com/pkg/errors v0.9.1
9-
github.com/prometheus/client_golang v1.9.0
9+
github.com/prometheus/client_golang v1.16.0
1010
github.com/shirou/gopsutil/v3 v3.21.6
11-
github.com/stretchr/testify v1.6.1
11+
github.com/stretchr/testify v1.8.0
1212
go.uber.org/multierr v1.5.0
13-
gopkg.in/yaml.v2 v2.3.0
13+
gopkg.in/yaml.v2 v2.4.0
14+
)
15+
16+
require (
17+
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
18+
github.com/beorn7/perks v1.0.1 // indirect
19+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
20+
github.com/davecgh/go-spew v1.1.1 // indirect
21+
github.com/go-ole/go-ole v1.2.4 // indirect
22+
github.com/golang/protobuf v1.5.3 // indirect
23+
github.com/google/go-cmp v0.6.0 // indirect
24+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
25+
github.com/pmezard/go-difflib v1.0.0 // indirect
26+
github.com/prometheus/client_model v0.3.0 // indirect
27+
github.com/prometheus/common v0.42.0 // indirect
28+
github.com/prometheus/procfs v0.10.1 // indirect
29+
github.com/rogpeppe/go-internal v1.13.1 // indirect
30+
github.com/stretchr/objx v0.4.0 // indirect
31+
github.com/tklauser/go-sysconf v0.3.6 // indirect
32+
github.com/tklauser/numcpus v0.2.2 // indirect
33+
go.uber.org/atomic v1.6.0 // indirect
34+
golang.org/x/sys v0.21.0 // indirect
35+
golang.org/x/tools v0.22.0 // indirect
36+
google.golang.org/protobuf v1.30.0 // indirect
37+
gopkg.in/yaml.v3 v3.0.1 // indirect
1438
)

go.sum

+42-367
Large diffs are not rendered by default.

pkg/datasource/apollo/go.mod

+37-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,51 @@
11
module github.com/alibaba/sentinel-golang/pkg/datasource/apollo
22

3-
go 1.13
3+
go 1.18
44

55
replace github.com/alibaba/sentinel-golang => ../../../
66

77
require (
8-
github.com/alibaba/sentinel-golang v1.0.3
8+
github.com/alibaba/sentinel-golang v1.0.4
99
github.com/apolloconfig/agollo/v4 v4.0.9
1010
github.com/pkg/errors v0.9.1
11-
github.com/stretchr/testify v1.7.0
11+
github.com/stretchr/testify v1.8.0
1212
)
1313

1414
require (
15+
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
16+
github.com/beorn7/perks v1.0.1 // indirect
17+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
18+
github.com/davecgh/go-spew v1.1.1 // indirect
19+
github.com/fsnotify/fsnotify v1.5.1 // indirect
20+
github.com/go-ole/go-ole v1.2.4 // indirect
21+
github.com/golang/protobuf v1.5.3 // indirect
22+
github.com/google/uuid v1.1.2 // indirect
23+
github.com/hashicorp/hcl v1.0.0 // indirect
24+
github.com/magiconair/properties v1.8.5 // indirect
25+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
26+
github.com/mitchellh/mapstructure v1.4.2 // indirect
27+
github.com/pelletier/go-toml v1.9.4 // indirect
28+
github.com/pmezard/go-difflib v1.0.0 // indirect
29+
github.com/prometheus/client_golang v1.16.0 // indirect
30+
github.com/prometheus/client_model v0.3.0 // indirect
31+
github.com/prometheus/common v0.42.0 // indirect
32+
github.com/prometheus/procfs v0.10.1 // indirect
33+
github.com/shirou/gopsutil/v3 v3.21.6 // indirect
34+
github.com/spf13/afero v1.6.0 // indirect
35+
github.com/spf13/cast v1.4.1 // indirect
36+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
37+
github.com/spf13/pflag v1.0.5 // indirect
1538
github.com/spf13/viper v1.9.0 // indirect
16-
golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 // indirect
17-
golang.org/x/text v0.3.7 // indirect
39+
github.com/stretchr/objx v0.4.0 // indirect
40+
github.com/subosito/gotenv v1.2.0 // indirect
41+
github.com/tklauser/go-sysconf v0.3.6 // indirect
42+
github.com/tklauser/numcpus v0.2.2 // indirect
43+
go.uber.org/atomic v1.7.0 // indirect
44+
go.uber.org/multierr v1.6.0 // indirect
45+
golang.org/x/sys v0.21.0 // indirect
46+
golang.org/x/text v0.7.0 // indirect
47+
google.golang.org/protobuf v1.30.0 // indirect
1848
gopkg.in/ini.v1 v1.64.0 // indirect
49+
gopkg.in/yaml.v2 v2.4.0 // indirect
50+
gopkg.in/yaml.v3 v3.0.1 // indirect
1951
)

pkg/datasource/apollo/go.sum

+31-244
Large diffs are not rendered by default.

pkg/datasource/consul/go.mod

+41-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,48 @@
11
module github.com/alibaba/sentinel-golang/pkg/datasource/consul
22

3-
go 1.13
3+
go 1.18
4+
5+
require (
6+
github.com/alibaba/sentinel-golang v1.0.4
7+
github.com/hashicorp/consul/api v1.4.0
8+
github.com/stretchr/testify v1.6.1
9+
)
410

511
require (
612
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
7-
github.com/alibaba/sentinel-golang v1.0.2
13+
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect
14+
github.com/beorn7/perks v1.0.1 // indirect
15+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
16+
github.com/davecgh/go-spew v1.1.1 // indirect
17+
github.com/fatih/color v1.9.0 // indirect
818
github.com/go-ole/go-ole v1.2.5 // indirect
9-
github.com/hashicorp/consul/api v1.4.0
10-
github.com/stretchr/testify v1.5.1
19+
github.com/golang/protobuf v1.4.3 // indirect
20+
github.com/google/uuid v1.1.1 // indirect
21+
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
22+
github.com/hashicorp/go-hclog v0.12.0 // indirect
23+
github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
24+
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
25+
github.com/hashicorp/golang-lru v0.5.1 // indirect
26+
github.com/hashicorp/serf v0.8.2 // indirect
27+
github.com/mattn/go-colorable v0.1.4 // indirect
28+
github.com/mattn/go-isatty v0.0.12 // indirect
29+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
30+
github.com/mitchellh/go-homedir v1.1.0 // indirect
31+
github.com/mitchellh/mapstructure v1.1.2 // indirect
32+
github.com/pkg/errors v0.9.1 // indirect
33+
github.com/pmezard/go-difflib v1.0.0 // indirect
34+
github.com/prometheus/client_golang v1.9.0 // indirect
35+
github.com/prometheus/client_model v0.2.0 // indirect
36+
github.com/prometheus/common v0.15.0 // indirect
37+
github.com/prometheus/procfs v0.2.0 // indirect
38+
github.com/shirou/gopsutil/v3 v3.21.6 // indirect
39+
github.com/stretchr/objx v0.1.1 // indirect
40+
github.com/tklauser/go-sysconf v0.3.6 // indirect
41+
github.com/tklauser/numcpus v0.2.2 // indirect
42+
go.uber.org/atomic v1.6.0 // indirect
43+
go.uber.org/multierr v1.5.0 // indirect
44+
golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa // indirect
45+
google.golang.org/protobuf v1.23.0 // indirect
46+
gopkg.in/yaml.v2 v2.3.0 // indirect
47+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
1148
)

0 commit comments

Comments
 (0)