vendor: update thrift and zipkin-go-opentracing

Fixes #30576.
Informs #30774.

openzipkin-contrib/zipkin-go-opentracing@4c9fbcb...f0f479a
apache/thrift@327ebb6...2b7365c

I audited every commit in the zipkin-go-opentracing diff and every
commit to the `lib/go` package of the thrift diff.

Release note (bug fix): Updated Zipkin library to avoid deadlock when
stopping Zipkin tracing.

Gopkg.toml

@@ -82,6 +82,10 @@ ignored = [
   name = "github.com/golang/dep"
   branch = "master"
 
+[[constraint]]
+  name = "golang.org/x/crypto"
+  branch = "master"
+
 # github.com/docker/docker depends on a few functions not included in the
 # latest release: reference.{FamiliarName,ParseNormalizedNamed,TagNameOnly}.
 #
@@ -91,6 +95,12 @@ ignored = [
   name = "github.com/docker/distribution"
   branch = "master"
 
+# github.com/openzipkin-contrib/zipkin-go-opentracing requires a newer
+# version of thrift than is currently present in a release.
+[[override]]
+  name = "github.com/apache/thrift"
+  revision = "2b7365c54f823013cc6a4760798051b22743c103"
+
 [prune]
   go-tests = true
   unused-packages = true
@@ -113,13 +123,3 @@ ignored = [
   [[prune.project]]
     name = "github.com/knz/go-libedit"
     unused-packages = false
-
-[[constraint]]
-  branch = "master"
-  name = "golang.org/x/crypto"
-
-# Newer releases of zipkin depend on unreleased bits from
-# github.com/apache/thrift.
-[[constraint]]
-  name = "github.com/openzipkin/zipkin-go-opentracing"
-  version = "=0.3.3"

pkg/util/tracing/shadow.go

@@ -30,7 +30,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	lightstep "github.com/lightstep/lightstep-tracer-go"
 	opentracing "github.com/opentracing/opentracing-go"
-	zipkin "github.com/openzipkin/zipkin-go-opentracing"
+	zipkin "github.com/openzipkin-contrib/zipkin-go-opentracing"
 )
 
 type shadowTracerManager interface {