Skip to content

Commit 2a6e1e2

Browse files
Ahbrown41zstone12
Ahbrown41
and
zstone12
authored
Upgraded OTEL libraries and examples (#11)
* Upgraded libraries and got working with new OTEL * Upgrade example applications to newest * Adding sum * Updated action versions to trigger build * style: gofumpt --------- Co-authored-by: zstone12 <522089185@qq.com>
1 parent 6e42611 commit 2a6e1e2

File tree

10 files changed

+192
-1312
lines changed

10 files changed

+192
-1312
lines changed

‎.github/workflows/tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- uses: actions/checkout@v3
1010

1111
- name: Set up Go
12-
uses: actions/setup-go@v3
12+
uses: actions/setup-go@v4
1313
with:
1414
go-version: '1.20'
1515

@@ -23,7 +23,7 @@ jobs:
2323
- name: Lint
2424
run: |
2525
go vet -stdmethods=false $(go list ./...)
26-
go install mvdan.cc/gofumpt@v0.2.0
26+
go install mvdan.cc/gofumpt@v0.5.0
2727
test -z "$(gofumpt -l -extra .)"
2828
2929
- name: Unit Test

‎examples/demo/go.mod

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
module gorm.io/plugin/example
22

3-
go 1.18
3+
go 1.20
44

55
replace gorm.io/plugin/opentelemetry => ./../..
66

77
require (
8-
go.opentelemetry.io/otel v1.8.0
9-
go.opentelemetry.io/otel/exporters/jaeger v1.7.0
10-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.7.0
11-
go.opentelemetry.io/otel/sdk v1.8.0
12-
go.opentelemetry.io/otel/trace v1.8.0
13-
gorm.io/driver/sqlite v1.3.4
14-
gorm.io/gorm v1.23.6
15-
gorm.io/plugin/opentelemetry v0.0.0-00010101000000-000000000000
8+
go.opentelemetry.io/otel v1.16.0
9+
go.opentelemetry.io/otel/exporters/jaeger v1.16.0
10+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0
11+
go.opentelemetry.io/otel/sdk v1.16.0
12+
go.opentelemetry.io/otel/trace v1.16.0
13+
gorm.io/driver/sqlite v1.5.1
14+
gorm.io/gorm v1.25.1
15+
gorm.io/plugin/opentelemetry v0.1.2
1616
)
1717

1818
require (
19-
github.com/go-logr/logr v1.2.3 // indirect
19+
github.com/go-logr/logr v1.2.4 // indirect
2020
github.com/go-logr/stdr v1.2.2 // indirect
2121
github.com/jinzhu/inflection v1.0.0 // indirect
2222
github.com/jinzhu/now v1.1.5 // indirect
23-
github.com/mattn/go-sqlite3 v1.14.12 // indirect
24-
github.com/sirupsen/logrus v1.8.1 // indirect
25-
go.opentelemetry.io/otel/metric v0.31.0 // indirect
26-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
23+
github.com/mattn/go-sqlite3 v1.14.16 // indirect
24+
github.com/sirupsen/logrus v1.9.2 // indirect
25+
go.opentelemetry.io/otel/metric v1.16.0 // indirect
26+
golang.org/x/sys v0.8.0 // indirect
2727
)

‎examples/demo/go.sum

+34-27
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,61 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
22
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
44
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
5-
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
65
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
6+
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
7+
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
78
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
89
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
910
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
10-
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
11+
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
1112
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
1213
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
13-
github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
1414
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
1515
github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
16-
github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0=
17-
github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
16+
github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
17+
github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
18+
github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
19+
github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
1820
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1921
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
20-
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
21-
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
22+
github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=
23+
github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
2224
github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
2325
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
24-
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
2526
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
2627
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
27-
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
28+
github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
2829
go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
29-
go.opentelemetry.io/otel v1.8.0 h1:zcvBFizPbpa1q7FehvFiHbQwGzmPILebO0tyqIR5Djg=
30-
go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM=
30+
go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s=
31+
go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4=
3132
go.opentelemetry.io/otel/exporters/jaeger v1.7.0 h1:wXgjiRldljksZkZrldGVe6XrG9u3kYDyQmkZwmm5dI0=
3233
go.opentelemetry.io/otel/exporters/jaeger v1.7.0/go.mod h1:PwQAOqBgqbLQRKlj466DuD2qyMjbtcPpfPfj+AqbSBs=
33-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.7.0 h1:8hPcgCg0rUJiKE6VWahRvjgLUrNl7rW2hffUEPKXVEM=
34-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.7.0/go.mod h1:K4GDXPY6TjUiwbOh+DkKaEdCF8y+lvMoM6SeAPyfCCM=
35-
go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs=
36-
go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A=
34+
go.opentelemetry.io/otel/exporters/jaeger v1.16.0 h1:YhxxmXZ011C0aDZKoNw+juVWAmEfv/0W2XBOv9aHTaA=
35+
go.opentelemetry.io/otel/exporters/jaeger v1.16.0/go.mod h1:grYbBo/5afWlPpdPZYhyn78Bk04hnvxn2+hvxQhKIQM=
36+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.15.1 h1:2PunuO5SbkN5MhCbuHCd3tC6qrcaj+uDAkX/qBU5BAs=
37+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.15.1/go.mod h1:q8+Tha+5LThjeSU8BW93uUC5w5/+DnYHMKBMpRCsui0=
38+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 h1:+XWJd3jf75RXJq29mxbuXhCXFDG3S3R4vBUeSI2P7tE=
39+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0/go.mod h1:hqgzBPTf4yONMFgdZvL/bK42R/iinTyVQtiWihs3SZc=
40+
go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo=
41+
go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4=
3742
go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe374q6cZwUU=
38-
go.opentelemetry.io/otel/sdk v1.8.0 h1:xwu69/fNuwbSHWe/0PGS888RmjWY181OmcXDQKu7ZQk=
39-
go.opentelemetry.io/otel/sdk v1.8.0/go.mod h1:uPSfc+yfDH2StDM/Rm35WE8gXSNdvCg023J6HeGNO0c=
43+
go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE=
44+
go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4=
4045
go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU=
41-
go.opentelemetry.io/otel/trace v1.8.0 h1:cSy0DF9eGI5WIfNwZ1q2iUyGj00tGzP24dE1lOlHrfY=
42-
go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4=
43-
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
46+
go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs=
47+
go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0=
4448
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
45-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
46-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
49+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
50+
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
51+
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4752
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
4853
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
4954
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
5055
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
51-
gorm.io/driver/sqlite v1.3.4 h1:NnFOPVfzi4CPsJPH4wXr6rMkPb4ElHEqKMvrsx9c9Fk=
52-
gorm.io/driver/sqlite v1.3.4/go.mod h1:B+8GyC9K7VgzJAcrcXMRPdnMcck+8FgJynEehEPM16U=
53-
gorm.io/gorm v1.23.4/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
54-
gorm.io/gorm v1.23.6 h1:KFLdNgri4ExFFGTRGGFWON2P1ZN28+9SJRN8voOoYe0=
55-
gorm.io/gorm v1.23.6/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
56+
gorm.io/driver/sqlite v1.5.0 h1:zKYbzRCpBrT1bNijRnxLDJWPjVfImGEn0lSnUY5gZ+c=
57+
gorm.io/driver/sqlite v1.5.0/go.mod h1:kDMDfntV9u/vuMmz8APHtHF0b4nyBB7sfCieC6G8k8I=
58+
gorm.io/driver/sqlite v1.5.1 h1:hYyrLkAWE71bcarJDPdZNTLWtr8XrSjOWyjUYI6xdL4=
59+
gorm.io/driver/sqlite v1.5.1/go.mod h1:7MZZ2Z8bqyfSQA1gYEV6MagQWj3cpUkJj9Z+d1HEMEQ=
60+
gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
61+
gorm.io/gorm v1.25.1 h1:nsSALe5Pr+cM3V1qwwQ7rOkw+6UeLrX5O4v3llhHa64=
62+
gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=

‎examples/metric/metrics/go.mod

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
module github.com/uptrace/opentelemetry-go-extra/example/prometheus/metrics
22

3-
go 1.17
3+
go 1.20
44

55
require (
6-
go.opentelemetry.io/contrib/instrumentation/runtime v0.39.0
7-
go.opentelemetry.io/otel v1.13.0
8-
go.opentelemetry.io/otel/exporters/jaeger v1.13.0
9-
go.opentelemetry.io/otel/exporters/prometheus v0.36.0
10-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.13.0
11-
go.opentelemetry.io/otel/metric v0.36.0
12-
go.opentelemetry.io/otel/sdk v1.13.0
13-
go.opentelemetry.io/otel/trace v1.13.0
14-
gorm.io/driver/sqlite v1.4.4
15-
gorm.io/gorm v1.24.5
16-
gorm.io/plugin/opentelemetry v0.0.0-00010101000000-000000000000
6+
github.com/prometheus/client_golang v1.15.1
7+
go.opentelemetry.io/contrib/instrumentation/runtime v0.42.0
8+
go.opentelemetry.io/otel v1.16.0
9+
go.opentelemetry.io/otel/exporters/jaeger v1.16.0
10+
go.opentelemetry.io/otel/exporters/prometheus v0.39.0
11+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0
12+
go.opentelemetry.io/otel/sdk v1.16.0
13+
go.opentelemetry.io/otel/sdk/metric v0.39.0
14+
go.opentelemetry.io/otel/trace v1.16.0
15+
gorm.io/driver/sqlite v1.5.1
16+
gorm.io/gorm v1.25.1
17+
gorm.io/plugin/opentelemetry v0.1.2
1718
)
1819

1920
require (
2021
github.com/beorn7/perks v1.0.1 // indirect
2122
github.com/cespare/xxhash/v2 v2.2.0 // indirect
22-
github.com/go-logr/logr v1.2.3 // indirect
23+
github.com/go-logr/logr v1.2.4 // indirect
2324
github.com/go-logr/stdr v1.2.2 // indirect
24-
github.com/golang/protobuf v1.5.2 // indirect
25+
github.com/golang/protobuf v1.5.3 // indirect
2526
github.com/jinzhu/inflection v1.0.0 // indirect
2627
github.com/jinzhu/now v1.1.5 // indirect
2728
github.com/mattn/go-sqlite3 v1.14.16 // indirect
2829
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
29-
github.com/prometheus/client_golang v1.14.0 // indirect
30-
github.com/prometheus/client_model v0.3.0 // indirect
31-
github.com/prometheus/common v0.39.0 // indirect
32-
github.com/prometheus/procfs v0.9.0 // indirect
33-
github.com/sirupsen/logrus v1.9.0 // indirect
34-
go.opentelemetry.io/otel/sdk/metric v0.36.0 // indirect
35-
golang.org/x/sys v0.5.0 // indirect
36-
google.golang.org/protobuf v1.28.1 // indirect
30+
github.com/prometheus/client_model v0.4.0 // indirect
31+
github.com/prometheus/common v0.44.0 // indirect
32+
github.com/prometheus/procfs v0.10.0 // indirect
33+
github.com/sirupsen/logrus v1.9.2 // indirect
34+
go.opentelemetry.io/otel/metric v1.16.0 // indirect
35+
golang.org/x/sys v0.8.0 // indirect
36+
google.golang.org/protobuf v1.30.0 // indirect
3737
)
3838

3939
replace gorm.io/plugin/opentelemetry => ./../../..

0 commit comments

Comments
 (0)