From 7bc59ab8cffed2ddd49753b795a5157957bd32c4 Mon Sep 17 00:00:00 2001 From: renovate <renovate-bot@autistici.org> Date: Sun, 14 Aug 2022 15:30:19 +0000 Subject: [PATCH] Update git.autistici.org/ai3/go-common digest to 39e01d3 --- go.mod | 2 +- go.sum | 2 ++ .../ai3/go-common/tracing/tracing.go | 12 +++++++----- vendor/modules.txt | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 400158b..10091e0 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-20220814124137-4f7bac42fbdb + git.autistici.org/ai3/go-common v0.0.0-20220814151247-39e01d32d5ee github.com/google/go-cmp v0.5.8 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf // indirect diff --git a/go.sum b/go.sum index 8a68115..a39bc53 100644 --- a/go.sum +++ b/go.sum @@ -52,6 +52,8 @@ contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcig dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= git.autistici.org/ai3/go-common v0.0.0-20220814124137-4f7bac42fbdb h1:SNnhiNFAy64wKkk+Wxq1lotFPvaQY8GP+Z27wqpIN8E= git.autistici.org/ai3/go-common v0.0.0-20220814124137-4f7bac42fbdb/go.mod h1:yhMB8VKJBBr+EKMft7MtqHVO73vkwdq/O5sVDTs/CNI= +git.autistici.org/ai3/go-common v0.0.0-20220814151247-39e01d32d5ee h1:EPfpfiG3vK9xoMt2sGclSaEXLikOCX1NfqUFRJXV4nk= +git.autistici.org/ai3/go-common v0.0.0-20220814151247-39e01d32d5ee/go.mod h1:yhMB8VKJBBr+EKMft7MtqHVO73vkwdq/O5sVDTs/CNI= 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= github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= diff --git a/vendor/git.autistici.org/ai3/go-common/tracing/tracing.go b/vendor/git.autistici.org/ai3/go-common/tracing/tracing.go index d1b88b9..d418501 100644 --- a/vendor/git.autistici.org/ai3/go-common/tracing/tracing.go +++ b/vendor/git.autistici.org/ai3/go-common/tracing/tracing.go @@ -148,6 +148,8 @@ func Init() { // WrapTransport optionally wraps a http.RoundTripper with OpenCensus // tracing functionality, if it is globally enabled. +// +// Must call Init() first. func WrapTransport(t http.RoundTripper) http.RoundTripper { if Enabled { t = othttp.NewTransport(t) @@ -158,10 +160,10 @@ func WrapTransport(t http.RoundTripper) http.RoundTripper { // WrapHandler wraps a http.Handler with OpenCensus tracing // functionality, if globally enabled. Automatically calls Init(). func WrapHandler(h http.Handler, endpointAddr string) http.Handler { - if Enabled { - serviceName := getServiceName() - initTracing(serviceName) - h = othttp.NewHandler(h, serviceName) + serviceName := getServiceName() + initTracing(serviceName) + if !Enabled { + return h } - return h + return othttp.NewHandler(h, serviceName) } diff --git a/vendor/modules.txt b/vendor/modules.txt index afe5af7..309df36 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# git.autistici.org/ai3/go-common v0.0.0-20220814124137-4f7bac42fbdb +# git.autistici.org/ai3/go-common v0.0.0-20220814151247-39e01d32d5ee ## explicit git.autistici.org/ai3/go-common git.autistici.org/ai3/go-common/clientutil -- GitLab