Skip to content

Commit 5e6c849

Browse files
authored
Merge pull request #17 from rogerogers/feature/bumb
feat: update otel version
2 parents be92bf6 + 069014c commit 5e6c849

File tree

9 files changed

+148
-148
lines changed

9 files changed

+148
-148
lines changed

.github/workflows/codeql-analysis.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ develop, main ]
16+
branches: [develop, main]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ develop ]
19+
branches: [develop]
2020
schedule:
21-
- cron: '35 21 * * 4'
21+
- cron: "35 21 * * 4"
2222

2323
jobs:
2424
analyze:
@@ -32,7 +32,7 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
language: [ 'go' ]
35+
language: ["go"]
3636
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
3737
# Learn more:
3838
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
@@ -44,7 +44,7 @@ jobs:
4444
- name: Set up Go
4545
uses: actions/setup-go@v3
4646
with:
47-
go-version: 1.16
47+
go-version: 1.18
4848

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

.github/workflows/pr-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Set up Go
4040
uses: actions/setup-go@v3
4141
with:
42-
go-version: 1.16
42+
go-version: 1.18
4343

4444
- uses: actions/cache@v3
4545
with:

.github/workflows/push-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Set up Go
4040
uses: actions/setup-go@v3
4141
with:
42-
go-version: 1.16
42+
go-version: 1.18
4343

4444
- uses: actions/cache@v3
4545
with:

go.mod

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

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/bytedance/gopkg v0.0.0-20220531084716-665b4f21126f
7-
github.com/cloudwego/kitex v0.4.2
8-
github.com/stretchr/testify v1.8.0
9-
go.opentelemetry.io/contrib/instrumentation/runtime v0.32.0
10-
go.opentelemetry.io/contrib/propagators/b3 v1.9.0
11-
go.opentelemetry.io/contrib/propagators/ot v1.9.0
12-
go.opentelemetry.io/otel v1.9.0
13-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.31.0
14-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.31.0
15-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.9.0
16-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.9.0
17-
go.opentelemetry.io/otel/metric v0.31.0
18-
go.opentelemetry.io/otel/sdk v1.9.0
19-
go.opentelemetry.io/otel/sdk/metric v0.31.0
20-
go.opentelemetry.io/otel/trace v1.9.0
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
2120
)
2221

2322
require (
2423
github.com/apache/thrift v0.13.0 // indirect
25-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
24+
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
2625
github.com/chenzhuoyu/iasm v0.0.0-20220818063314-28c361dae733 // indirect
2726
github.com/choleraehyq/pid v0.0.15 // indirect
28-
github.com/cloudwego/fastpb v0.0.2 // indirect
27+
github.com/cloudwego/fastpb v0.0.3 // indirect
2928
github.com/cloudwego/frugal v0.1.3 // indirect
30-
github.com/cloudwego/netpoll v0.2.6 // indirect
31-
github.com/cloudwego/thriftgo v0.2.1 // indirect
29+
github.com/cloudwego/netpoll v0.3.1 // indirect
30+
github.com/cloudwego/thriftgo v0.2.4 // indirect
3231
github.com/davecgh/go-spew v1.1.1 // indirect
3332
github.com/go-logr/logr v1.2.3 // indirect
3433
github.com/go-logr/stdr v1.2.2 // indirect
3534
github.com/golang/protobuf v1.5.2 // indirect
36-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
35+
github.com/google/pprof v0.0.0-20220608213341-c488b8fa1db3 // indirect
36+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // 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,17 +43,18 @@ 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.9.0 // indirect
47-
go.opentelemetry.io/proto/otlp v0.18.0 // indirect
48-
go.uber.org/atomic v1.7.0 // indirect
49-
go.uber.org/multierr v1.8.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
48+
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
5051
golang.org/x/arch v0.0.0-20220722155209-00200b7164a7 // indirect
51-
golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
52-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
53-
golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 // indirect
54-
golang.org/x/text v0.3.6 // indirect
55-
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 // indirect
56-
google.golang.org/grpc v1.46.2 // indirect
57-
google.golang.org/protobuf v1.28.0 // indirect
52+
golang.org/x/net v0.7.0 // indirect
53+
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
5859
gopkg.in/yaml.v3 v3.0.1 // indirect
5960
)

0 commit comments

Comments
 (0)