Skip to content

Commit 5f5a227

Browse files
authored
Merge pull request #20 from rogerogers/chore/bump
chore: bump otel metric version to 1.15.1
2 parents 5e6c849 + c640f9c commit 5f5a227

15 files changed

+868
-237
lines changed

.github/workflows/codeql-analysis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ jobs:
4242
uses: actions/checkout@v3
4343

4444
- name: Set up Go
45-
uses: actions/setup-go@v3
45+
uses: actions/setup-go@v4
4646
with:
47-
go-version: 1.18
47+
go-version: 1.19
4848

4949
- uses: actions/cache@v3
5050
with:

.github/workflows/pr-check.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,17 @@ jobs:
2222
strategy:
2323
matrix: ${{ fromJson(needs.resolve-modules.outputs.matrix) }}
2424
steps:
25+
- name: Set up Go
26+
uses: actions/setup-go@v4
27+
with:
28+
go-version: 1.19
2529
- uses: actions/checkout@v3
2630
- name: Lint
2731
uses: golangci/golangci-lint-action@v3
2832
with:
2933
version: latest
3034
working-directory: ${{ matrix.workdir }}
31-
args: -E gofumpt
35+
args: -E gofumpt --timeout 5m
3236
skip-pkg-cache: true
3337

3438
build:
@@ -37,9 +41,9 @@ jobs:
3741
- uses: actions/checkout@v3
3842

3943
- name: Set up Go
40-
uses: actions/setup-go@v3
44+
uses: actions/setup-go@v4
4145
with:
42-
go-version: 1.18
46+
go-version: 1.19
4347

4448
- uses: actions/cache@v3
4549
with:

.github/workflows/push-check.yml

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

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

55
jobs:
66
resolve-modules:
@@ -22,6 +22,10 @@ jobs:
2222
strategy:
2323
matrix: ${{ fromJson(needs.resolve-modules.outputs.matrix) }}
2424
steps:
25+
- - name: Set up Go
26+
uses: actions/setup-go@v4
27+
with:
28+
go-version: 1.19
2529
- uses: actions/checkout@v3
2630
- name: Lint
2731
uses: golangci/golangci-lint-action@v3
@@ -37,9 +41,9 @@ jobs:
3741
- uses: actions/checkout@v3
3842

3943
- name: Set up Go
40-
uses: actions/setup-go@v3
44+
uses: actions/setup-go@v4
4145
with:
42-
go-version: 1.18
46+
go-version: 1.19
4347

4448
- uses: actions/cache@v3
4549
with:

go.mod

+37-38
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
module github.com/kitex-contrib/obs-opentelemetry
22

3-
go 1.18
3+
go 1.19
44

55
require (
6-
github.com/bytedance/gopkg v0.0.0-20220531084716-665b4f21126f
7-
github.com/cloudwego/kitex v0.4.4
8-
github.com/stretchr/testify v1.8.1
9-
go.opentelemetry.io/contrib/instrumentation/runtime v0.39.0
10-
go.opentelemetry.io/contrib/propagators/b3 v1.14.0
11-
go.opentelemetry.io/contrib/propagators/ot v1.14.0
12-
go.opentelemetry.io/otel v1.13.0
13-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.36.0
14-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.13.0
15-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.13.0
16-
go.opentelemetry.io/otel/metric v0.36.0
17-
go.opentelemetry.io/otel/sdk v1.13.0
18-
go.opentelemetry.io/otel/sdk/metric v0.36.0
19-
go.opentelemetry.io/otel/trace v1.13.0
6+
github.com/apache/thrift v0.13.0 // indirect
7+
github.com/bytedance/gopkg v0.0.0-20230418090422-343ae5fedd5f
8+
github.com/cloudwego/kitex v0.5.2
9+
github.com/stretchr/testify v1.8.2
10+
go.opentelemetry.io/contrib/instrumentation/runtime v0.41.1
11+
go.opentelemetry.io/contrib/propagators/b3 v1.16.1
12+
go.opentelemetry.io/contrib/propagators/ot v1.16.1
13+
go.opentelemetry.io/otel v1.15.1
14+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.38.1
15+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.15.1
16+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.15.1
17+
go.opentelemetry.io/otel/metric v0.38.1
18+
go.opentelemetry.io/otel/sdk v1.15.1
19+
go.opentelemetry.io/otel/sdk/metric v0.38.1
20+
go.opentelemetry.io/otel/trace v1.15.1
2021
)
2122

2223
require (
23-
github.com/apache/thrift v0.13.0 // indirect
24-
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
25-
github.com/chenzhuoyu/iasm v0.0.0-20220818063314-28c361dae733 // indirect
26-
github.com/choleraehyq/pid v0.0.15 // indirect
27-
github.com/cloudwego/fastpb v0.0.3 // indirect
28-
github.com/cloudwego/frugal v0.1.3 // indirect
29-
github.com/cloudwego/netpoll v0.3.1 // indirect
30-
github.com/cloudwego/thriftgo v0.2.4 // indirect
24+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
25+
github.com/chenzhuoyu/iasm v0.0.0-20230222070914-0b1b64b0e762 // indirect
26+
github.com/choleraehyq/pid v0.0.16 // indirect
27+
github.com/cloudwego/fastpb v0.0.4 // indirect
28+
github.com/cloudwego/frugal v0.1.6 // indirect
29+
github.com/cloudwego/netpoll v0.3.2 // indirect
30+
github.com/cloudwego/thriftgo v0.2.9 // indirect
3131
github.com/davecgh/go-spew v1.1.1 // indirect
32-
github.com/go-logr/logr v1.2.3 // indirect
32+
github.com/go-logr/logr v1.2.4 // indirect
3333
github.com/go-logr/stdr v1.2.2 // indirect
34-
github.com/golang/protobuf v1.5.2 // indirect
35-
github.com/google/pprof v0.0.0-20220608213341-c488b8fa1db3 // indirect
36-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
34+
github.com/golang/protobuf v1.5.3 // indirect
35+
github.com/google/pprof v0.0.0-20230509042627-b1315fad0c5a // indirect
36+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
3737
github.com/jhump/protoreflect v1.8.2 // indirect
3838
github.com/json-iterator/go v1.1.12 // indirect
3939
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
@@ -43,18 +43,17 @@ require (
4343
github.com/tidwall/gjson v1.9.3 // indirect
4444
github.com/tidwall/match v1.1.1 // indirect
4545
github.com/tidwall/pretty v1.2.0 // indirect
46-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0 // indirect
47-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.36.0 // indirect
46+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1 // indirect
47+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.38.1 // indirect
4848
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
49-
go.uber.org/atomic v1.10.0 // indirect
50-
go.uber.org/multierr v1.9.0 // indirect
51-
golang.org/x/arch v0.0.0-20220722155209-00200b7164a7 // indirect
52-
golang.org/x/net v0.7.0 // indirect
49+
go.uber.org/multierr v1.11.0 // indirect
50+
golang.org/x/arch v0.2.0 // indirect
51+
golang.org/x/net v0.10.0 // indirect
5352
golang.org/x/sync v0.1.0 // indirect
54-
golang.org/x/sys v0.5.0 // indirect
55-
golang.org/x/text v0.7.0 // indirect
56-
google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 // indirect
57-
google.golang.org/grpc v1.53.0 // indirect
58-
google.golang.org/protobuf v1.28.1 // indirect
53+
golang.org/x/sys v0.8.0 // indirect
54+
golang.org/x/text v0.9.0 // indirect
55+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
56+
google.golang.org/grpc v1.55.0 // indirect
57+
google.golang.org/protobuf v1.30.0 // indirect
5958
gopkg.in/yaml.v3 v3.0.1 // indirect
6059
)

0 commit comments

Comments
 (0)