From 9bebe9e68493e18301fc3dbaafc967ed62ab7a98 Mon Sep 17 00:00:00 2001 From: ale <ale@incal.net> Date: Sat, 13 Aug 2022 19:07:08 +0100 Subject: [PATCH] Upgrade ai3/go-common --- go.mod | 2 +- go.sum | 7 +++-- vendor/git.autistici.org/ai3/go-common/go.mod | 2 +- vendor/git.autistici.org/ai3/go-common/go.sum | 1 + vendor/go.opentelemetry.io/otel/CHANGELOG.md | 5 ---- vendor/go.opentelemetry.io/otel/README.md | 26 +++++-------------- vendor/modules.txt | 4 +-- 7 files changed, 14 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index c074ce0..10a8810 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.autistici.org/id/usermetadb go 1.14 require ( - git.autistici.org/ai3/go-common v0.0.0-20220813170915-ae4e0887ce1b + git.autistici.org/ai3/go-common v0.0.0-20220813180150-76c80d2dc483 github.com/golang-migrate/migrate/v4 v4.15.2 github.com/google/go-cmp v0.5.8 github.com/mattn/go-sqlite3 v1.14.14 diff --git a/go.sum b/go.sum index ddbb1ee..5f1a0f2 100644 --- a/go.sum +++ b/go.sum @@ -63,8 +63,8 @@ contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0Wk contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= -git.autistici.org/ai3/go-common v0.0.0-20220813170915-ae4e0887ce1b h1:piiUlWywZqmQsEae/In7E+XBt25nc1XxKwZzlGUvQWc= -git.autistici.org/ai3/go-common v0.0.0-20220813170915-ae4e0887ce1b/go.mod h1:CO7KOfVwXUuiUbk/yQUHFjIn6myHfA+MK64XD29YQbE= +git.autistici.org/ai3/go-common v0.0.0-20220813180150-76c80d2dc483 h1:QeLad7AqAmuXx4OE3zKd3i9TLrW8y08d/PTV8MewWHY= +git.autistici.org/ai3/go-common v0.0.0-20220813180150-76c80d2dc483/go.mod h1:CVTMXGk9a0LwKhbHPZbtHY1W+EjDuntoPIR3aOUHbbI= github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU= github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= @@ -1461,9 +1461,8 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1: go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= +go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= -go.opentelemetry.io/otel v1.9.1-0.20220810155701-d96e8d2912af h1:gdlcNfqSRZ86Wj7gU4OtcCoWzJAl8LlyBDbUc7Btksg= -go.opentelemetry.io/otel v1.9.1-0.20220810155701-d96e8d2912af/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8= diff --git a/vendor/git.autistici.org/ai3/go-common/go.mod b/vendor/git.autistici.org/ai3/go-common/go.mod index 9933b74..a6c69cc 100644 --- a/vendor/git.autistici.org/ai3/go-common/go.mod +++ b/vendor/git.autistici.org/ai3/go-common/go.mod @@ -22,7 +22,7 @@ require ( github.com/theckman/go-flock v0.8.1 go.opencensus.io v0.23.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 - go.opentelemetry.io/otel v1.9.1-0.20220810155701-d96e8d2912af + go.opentelemetry.io/otel v1.9.0 go.opentelemetry.io/otel/exporters/zipkin v1.9.0 go.opentelemetry.io/otel/sdk v1.9.0 go.opentelemetry.io/otel/trace v1.9.0 diff --git a/vendor/git.autistici.org/ai3/go-common/go.sum b/vendor/git.autistici.org/ai3/go-common/go.sum index f6972c7..3a56fcb 100644 --- a/vendor/git.autistici.org/ai3/go-common/go.sum +++ b/vendor/git.autistici.org/ai3/go-common/go.sum @@ -859,6 +859,7 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= +go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel v1.9.1-0.20220810155701-d96e8d2912af h1:gdlcNfqSRZ86Wj7gU4OtcCoWzJAl8LlyBDbUc7Btksg= go.opentelemetry.io/otel v1.9.1-0.20220810155701-d96e8d2912af/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= diff --git a/vendor/go.opentelemetry.io/otel/CHANGELOG.md b/vendor/go.opentelemetry.io/otel/CHANGELOG.md index a28332f..c9f73af 100644 --- a/vendor/go.opentelemetry.io/otel/CHANGELOG.md +++ b/vendor/go.opentelemetry.io/otel/CHANGELOG.md @@ -8,11 +8,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] -### Added - -- Support Go 1.19. - Include compatibility testing and document support. (#3077) - ## [1.9.0/0.0.3] - 2022-08-01 ### Added diff --git a/vendor/go.opentelemetry.io/otel/README.md b/vendor/go.opentelemetry.io/otel/README.md index 4aeecb8..c87f800 100644 --- a/vendor/go.opentelemetry.io/otel/README.md +++ b/vendor/go.opentelemetry.io/otel/README.md @@ -30,39 +30,25 @@ Project versioning information and stability guarantees can be found in the ### Compatibility -OpenTelemetry-Go ensures compatibility with the current supported versions of -the [Go language](https://golang.org/doc/devel/release#policy): +OpenTelemetry-Go attempts to track the current supported versions of the +[Go language](https://golang.org/doc/devel/release#policy). The release +schedule after a new minor version of go is as follows: -> Each major Go release is supported until there are two newer major releases. -> For example, Go 1.5 was supported until the Go 1.7 release, and Go 1.6 was supported until the Go 1.8 release. +- The first release or one month, which ever is sooner, will add build steps for the new go version. +- The first release after three months will remove support for the oldest go version. -For versions of Go that are no longer supported upstream, opentelemetry-go will -stop ensuring compatibility with these versions in the following manner: - -- A minor release of opentelemetry-go will be made to add support for the new - supported release of Go. -- The following minor release of opentelemetry-go will remove compatibility - testing for the oldest (now archived upstream) version of Go. This, and - future, releases of opentelemetry-go may include features only supported by - the currently supported versions of Go. - -Currently, this project supports the following environments. +This project is tested on the following systems. | OS | Go Version | Architecture | | ------- | ---------- | ------------ | -| Ubuntu | 1.19 | amd64 | | Ubuntu | 1.18 | amd64 | | Ubuntu | 1.17 | amd64 | -| Ubuntu | 1.19 | 386 | | Ubuntu | 1.18 | 386 | | Ubuntu | 1.17 | 386 | -| MacOS | 1.19 | amd64 | | MacOS | 1.18 | amd64 | | MacOS | 1.17 | amd64 | -| Windows | 1.19 | amd64 | | Windows | 1.18 | amd64 | | Windows | 1.17 | amd64 | -| Windows | 1.19 | 386 | | Windows | 1.18 | 386 | | Windows | 1.17 | 386 | diff --git a/vendor/modules.txt b/vendor/modules.txt index 06f3ce8..7c6cee8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# git.autistici.org/ai3/go-common v0.0.0-20220813170915-ae4e0887ce1b +# git.autistici.org/ai3/go-common v0.0.0-20220813180150-76c80d2dc483 ## explicit git.autistici.org/ai3/go-common git.autistici.org/ai3/go-common/clientutil @@ -69,7 +69,7 @@ github.com/prometheus/procfs/internal/fs github.com/prometheus/procfs/internal/util # go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp -# go.opentelemetry.io/otel v1.9.1-0.20220810155701-d96e8d2912af +# go.opentelemetry.io/otel v1.9.0 go.opentelemetry.io/otel go.opentelemetry.io/otel/attribute go.opentelemetry.io/otel/baggage -- GitLab