mirror of
https://github.com/containers/podman.git
synced 2025-06-21 01:19:15 +08:00
Bump github.com/opentracing/opentracing-go from 1.1.0 to 1.2.0
Bumps [github.com/opentracing/opentracing-go](https://github.com/opentracing/opentracing-go) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/opentracing/opentracing-go/releases) - [Changelog](https://github.com/opentracing/opentracing-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/opentracing/opentracing-go/compare/v1.1.0...v1.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
![27856297+dependabot-preview[bot]@users.noreply.github.com](/assets/img/avatar_default.png)
committed by
Daniel J Walsh

parent
e84695213e
commit
c4248e62ca
2
go.mod
2
go.mod
@ -43,7 +43,7 @@ require (
|
||||
github.com/opencontainers/runtime-spec v1.0.3-0.20200520003142-237cc4f519e2
|
||||
github.com/opencontainers/runtime-tools v0.9.0
|
||||
github.com/opencontainers/selinux v1.5.2
|
||||
github.com/opentracing/opentracing-go v1.1.0
|
||||
github.com/opentracing/opentracing-go v1.2.0
|
||||
github.com/pkg/errors v0.9.1
|
||||
github.com/pmezard/go-difflib v1.0.0
|
||||
github.com/rootless-containers/rootlesskit v0.9.5
|
||||
|
4
go.sum
4
go.sum
@ -343,8 +343,8 @@ github.com/opencontainers/selinux v1.5.2 h1:F6DgIsjgBIcDksLW4D5RG9bXok6oqZ3nvMwj
|
||||
github.com/opencontainers/selinux v1.5.2/go.mod h1:yTcKuYAh6R95iDpefGLQaPaRwJFwyzAJufJyiTt7s0g=
|
||||
github.com/openshift/imagebuilder v1.1.5 h1:WAIHV6cGF9e0AcLBA7RIi7XbFoB7R+e/MWu1I+1NUOM=
|
||||
github.com/openshift/imagebuilder v1.1.5/go.mod h1:9aJRczxCH0mvT6XQ+5STAQaPWz7OsWcU5/mRkt8IWeo=
|
||||
github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
|
||||
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
|
||||
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
|
||||
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
|
||||
github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913 h1:TnbXhKzrTOyuvWrjI8W6pcoI9XPbLHFXCdN2dtUw7Rw=
|
||||
github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913/go.mod h1:J6OG6YJVEWopen4avK3VNQSnALmmjvniMmni/YFYAwc=
|
||||
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
|
||||
|
4
vendor/github.com/opentracing/opentracing-go/.travis.yml
generated
vendored
4
vendor/github.com/opentracing/opentracing-go/.travis.yml
generated
vendored
@ -2,8 +2,8 @@ language: go
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- go: "1.11.x"
|
||||
- go: "1.12.x"
|
||||
- go: "1.13.x"
|
||||
- go: "1.14.x"
|
||||
- go: "tip"
|
||||
env:
|
||||
- LINT=true
|
||||
|
17
vendor/github.com/opentracing/opentracing-go/CHANGELOG.md
generated
vendored
17
vendor/github.com/opentracing/opentracing-go/CHANGELOG.md
generated
vendored
@ -1,6 +1,23 @@
|
||||
Changes by Version
|
||||
==================
|
||||
|
||||
|
||||
1.2.0 (2020-07-01)
|
||||
-------------------
|
||||
|
||||
* Restore the ability to reset the current span in context to nil (#231) -- Yuri Shkuro
|
||||
* Use error.object per OpenTracing Semantic Conventions (#179) -- Rahman Syed
|
||||
* Convert nil pointer log field value to string "nil" (#230) -- Cyril Tovena
|
||||
* Add Go module support (#215) -- Zaba505
|
||||
* Make SetTag helper types in ext public (#229) -- Blake Edwards
|
||||
* Add log/fields helpers for keys from specification (#226) -- Dmitry Monakhov
|
||||
* Improve noop impementation (#223) -- chanxuehong
|
||||
* Add an extension to Tracer interface for custom go context creation (#220) -- Krzesimir Nowak
|
||||
* Fix typo in comments (#222) -- meteorlxy
|
||||
* Improve documentation for log.Object() to emphasize the requirement to pass immutable arguments (#219) -- 疯狂的小企鹅
|
||||
* [mock] Return ErrInvalidSpanContext if span context is not MockSpanContext (#216) -- Milad Irannejad
|
||||
|
||||
|
||||
1.1.0 (2019-03-23)
|
||||
-------------------
|
||||
|
||||
|
24
vendor/github.com/opentracing/opentracing-go/ext.go
generated
vendored
Normal file
24
vendor/github.com/opentracing/opentracing-go/ext.go
generated
vendored
Normal file
@ -0,0 +1,24 @@
|
||||
package opentracing
|
||||
|
||||
import (
|
||||
"context"
|
||||
)
|
||||
|
||||
// TracerContextWithSpanExtension is an extension interface that the
|
||||
// implementation of the Tracer interface may want to implement. It
|
||||
// allows to have some control over the go context when the
|
||||
// ContextWithSpan is invoked.
|
||||
//
|
||||
// The primary purpose of this extension are adapters from opentracing
|
||||
// API to some other tracing API.
|
||||
type TracerContextWithSpanExtension interface {
|
||||
// ContextWithSpanHook gets called by the ContextWithSpan
|
||||
// function, when the Tracer implementation also implements
|
||||
// this interface. It allows to put extra information into the
|
||||
// context and make it available to the callers of the
|
||||
// ContextWithSpan.
|
||||
//
|
||||
// This hook is invoked before the ContextWithSpan function
|
||||
// actually puts the span into the context.
|
||||
ContextWithSpanHook(ctx context.Context, span Span) context.Context
|
||||
}
|
17
vendor/github.com/opentracing/opentracing-go/ext/field.go
generated
vendored
Normal file
17
vendor/github.com/opentracing/opentracing-go/ext/field.go
generated
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
package ext
|
||||
|
||||
import (
|
||||
"github.com/opentracing/opentracing-go"
|
||||
"github.com/opentracing/opentracing-go/log"
|
||||
)
|
||||
|
||||
// LogError sets the error=true tag on the Span and logs err as an "error" event.
|
||||
func LogError(span opentracing.Span, err error, fields ...log.Field) {
|
||||
Error.Set(span, true)
|
||||
ef := []log.Field{
|
||||
log.Event("error"),
|
||||
log.Error(err),
|
||||
}
|
||||
ef = append(ef, fields...)
|
||||
span.LogFields(ef...)
|
||||
}
|
65
vendor/github.com/opentracing/opentracing-go/ext/tags.go
generated
vendored
65
vendor/github.com/opentracing/opentracing-go/ext/tags.go
generated
vendored
@ -47,40 +47,40 @@ var (
|
||||
|
||||
// Component is a low-cardinality identifier of the module, library,
|
||||
// or package that is generating a span.
|
||||
Component = stringTagName("component")
|
||||
Component = StringTagName("component")
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// Sampling hint
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
// SamplingPriority determines the priority of sampling this Span.
|
||||
SamplingPriority = uint16TagName("sampling.priority")
|
||||
SamplingPriority = Uint16TagName("sampling.priority")
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// Peer tags. These tags can be emitted by either client-side of
|
||||
// Peer tags. These tags can be emitted by either client-side or
|
||||
// server-side to describe the other side/service in a peer-to-peer
|
||||
// communications, like an RPC call.
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
// PeerService records the service name of the peer.
|
||||
PeerService = stringTagName("peer.service")
|
||||
PeerService = StringTagName("peer.service")
|
||||
|
||||
// PeerAddress records the address name of the peer. This may be a "ip:port",
|
||||
// a bare "hostname", a FQDN or even a database DSN substring
|
||||
// like "mysql://username@127.0.0.1:3306/dbname"
|
||||
PeerAddress = stringTagName("peer.address")
|
||||
PeerAddress = StringTagName("peer.address")
|
||||
|
||||
// PeerHostname records the host name of the peer
|
||||
PeerHostname = stringTagName("peer.hostname")
|
||||
PeerHostname = StringTagName("peer.hostname")
|
||||
|
||||
// PeerHostIPv4 records IP v4 host address of the peer
|
||||
PeerHostIPv4 = ipv4Tag("peer.ipv4")
|
||||
PeerHostIPv4 = IPv4TagName("peer.ipv4")
|
||||
|
||||
// PeerHostIPv6 records IP v6 host address of the peer
|
||||
PeerHostIPv6 = stringTagName("peer.ipv6")
|
||||
PeerHostIPv6 = StringTagName("peer.ipv6")
|
||||
|
||||
// PeerPort records port number of the peer
|
||||
PeerPort = uint16TagName("peer.port")
|
||||
PeerPort = Uint16TagName("peer.port")
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// HTTP Tags
|
||||
@ -88,46 +88,46 @@ var (
|
||||
|
||||
// HTTPUrl should be the URL of the request being handled in this segment
|
||||
// of the trace, in standard URI format. The protocol is optional.
|
||||
HTTPUrl = stringTagName("http.url")
|
||||
HTTPUrl = StringTagName("http.url")
|
||||
|
||||
// HTTPMethod is the HTTP method of the request, and is case-insensitive.
|
||||
HTTPMethod = stringTagName("http.method")
|
||||
HTTPMethod = StringTagName("http.method")
|
||||
|
||||
// HTTPStatusCode is the numeric HTTP status code (200, 404, etc) of the
|
||||
// HTTP response.
|
||||
HTTPStatusCode = uint16TagName("http.status_code")
|
||||
HTTPStatusCode = Uint16TagName("http.status_code")
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// DB Tags
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
// DBInstance is database instance name.
|
||||
DBInstance = stringTagName("db.instance")
|
||||
DBInstance = StringTagName("db.instance")
|
||||
|
||||
// DBStatement is a database statement for the given database type.
|
||||
// It can be a query or a prepared statement (i.e., before substitution).
|
||||
DBStatement = stringTagName("db.statement")
|
||||
DBStatement = StringTagName("db.statement")
|
||||
|
||||
// DBType is a database type. For any SQL database, "sql".
|
||||
// For others, the lower-case database category, e.g. "redis"
|
||||
DBType = stringTagName("db.type")
|
||||
DBType = StringTagName("db.type")
|
||||
|
||||
// DBUser is a username for accessing database.
|
||||
DBUser = stringTagName("db.user")
|
||||
DBUser = StringTagName("db.user")
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// Message Bus Tag
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
// MessageBusDestination is an address at which messages can be exchanged
|
||||
MessageBusDestination = stringTagName("message_bus.destination")
|
||||
MessageBusDestination = StringTagName("message_bus.destination")
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// Error Tag
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
// Error indicates that operation represented by the span resulted in an error.
|
||||
Error = boolTagName("error")
|
||||
Error = BoolTagName("error")
|
||||
)
|
||||
|
||||
// ---
|
||||
@ -163,48 +163,53 @@ func RPCServerOption(client opentracing.SpanContext) opentracing.StartSpanOption
|
||||
|
||||
// ---
|
||||
|
||||
type stringTagName string
|
||||
// StringTagName is a common tag name to be set to a string value
|
||||
type StringTagName string
|
||||
|
||||
// Set adds a string tag to the `span`
|
||||
func (tag stringTagName) Set(span opentracing.Span, value string) {
|
||||
func (tag StringTagName) Set(span opentracing.Span, value string) {
|
||||
span.SetTag(string(tag), value)
|
||||
}
|
||||
|
||||
// ---
|
||||
|
||||
type uint32TagName string
|
||||
// Uint32TagName is a common tag name to be set to a uint32 value
|
||||
type Uint32TagName string
|
||||
|
||||
// Set adds a uint32 tag to the `span`
|
||||
func (tag uint32TagName) Set(span opentracing.Span, value uint32) {
|
||||
func (tag Uint32TagName) Set(span opentracing.Span, value uint32) {
|
||||
span.SetTag(string(tag), value)
|
||||
}
|
||||
|
||||
// ---
|
||||
|
||||
type uint16TagName string
|
||||
// Uint16TagName is a common tag name to be set to a uint16 value
|
||||
type Uint16TagName string
|
||||
|
||||
// Set adds a uint16 tag to the `span`
|
||||
func (tag uint16TagName) Set(span opentracing.Span, value uint16) {
|
||||
func (tag Uint16TagName) Set(span opentracing.Span, value uint16) {
|
||||
span.SetTag(string(tag), value)
|
||||
}
|
||||
|
||||
// ---
|
||||
|
||||
type boolTagName string
|
||||
// BoolTagName is a common tag name to be set to a bool value
|
||||
type BoolTagName string
|
||||
|
||||
// Add adds a bool tag to the `span`
|
||||
func (tag boolTagName) Set(span opentracing.Span, value bool) {
|
||||
// Set adds a bool tag to the `span`
|
||||
func (tag BoolTagName) Set(span opentracing.Span, value bool) {
|
||||
span.SetTag(string(tag), value)
|
||||
}
|
||||
|
||||
type ipv4Tag string
|
||||
// IPv4TagName is a common tag name to be set to an ipv4 value
|
||||
type IPv4TagName string
|
||||
|
||||
// Set adds IP v4 host address of the peer as an uint32 value to the `span`, keep this for backward and zipkin compatibility
|
||||
func (tag ipv4Tag) Set(span opentracing.Span, value uint32) {
|
||||
func (tag IPv4TagName) Set(span opentracing.Span, value uint32) {
|
||||
span.SetTag(string(tag), value)
|
||||
}
|
||||
|
||||
// SetString records IP v4 host address of the peer as a .-separated tuple to the `span`. E.g., "127.0.0.1"
|
||||
func (tag ipv4Tag) SetString(span opentracing.Span, value string) {
|
||||
func (tag IPv4TagName) SetString(span opentracing.Span, value string) {
|
||||
span.SetTag(string(tag), value)
|
||||
}
|
||||
|
5
vendor/github.com/opentracing/opentracing-go/go.mod
generated
vendored
Normal file
5
vendor/github.com/opentracing/opentracing-go/go.mod
generated
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
module github.com/opentracing/opentracing-go
|
||||
|
||||
go 1.14
|
||||
|
||||
require github.com/stretchr/testify v1.3.0
|
7
vendor/github.com/opentracing/opentracing-go/go.sum
generated
vendored
Normal file
7
vendor/github.com/opentracing/opentracing-go/go.sum
generated
vendored
Normal file
@ -0,0 +1,7 @@
|
||||
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
7
vendor/github.com/opentracing/opentracing-go/gocontext.go
generated
vendored
7
vendor/github.com/opentracing/opentracing-go/gocontext.go
generated
vendored
@ -7,8 +7,13 @@ type contextKey struct{}
|
||||
var activeSpanKey = contextKey{}
|
||||
|
||||
// ContextWithSpan returns a new `context.Context` that holds a reference to
|
||||
// `span`'s SpanContext.
|
||||
// the span. If span is nil, a new context without an active span is returned.
|
||||
func ContextWithSpan(ctx context.Context, span Span) context.Context {
|
||||
if span != nil {
|
||||
if tracerWithHook, ok := span.Tracer().(TracerContextWithSpanExtension); ok {
|
||||
ctx = tracerWithHook.ContextWithSpanHook(ctx, span)
|
||||
}
|
||||
}
|
||||
return context.WithValue(ctx, activeSpanKey, span)
|
||||
}
|
||||
|
||||
|
17
vendor/github.com/opentracing/opentracing-go/log/field.go
generated
vendored
17
vendor/github.com/opentracing/opentracing-go/log/field.go
generated
vendored
@ -122,16 +122,19 @@ func Float64(key string, val float64) Field {
|
||||
}
|
||||
}
|
||||
|
||||
// Error adds an error with the key "error" to a Span.LogFields() record
|
||||
// Error adds an error with the key "error.object" to a Span.LogFields() record
|
||||
func Error(err error) Field {
|
||||
return Field{
|
||||
key: "error",
|
||||
key: "error.object",
|
||||
fieldType: errorType,
|
||||
interfaceVal: err,
|
||||
}
|
||||
}
|
||||
|
||||
// Object adds an object-valued key:value pair to a Span.LogFields() record
|
||||
// Please pass in an immutable object, otherwise there may be concurrency issues.
|
||||
// Such as passing in the map, log.Object may result in "fatal error: concurrent map iteration and map write".
|
||||
// Because span is sent asynchronously, it is possible that this map will also be modified.
|
||||
func Object(key string, obj interface{}) Field {
|
||||
return Field{
|
||||
key: key,
|
||||
@ -140,6 +143,16 @@ func Object(key string, obj interface{}) Field {
|
||||
}
|
||||
}
|
||||
|
||||
// Event creates a string-valued Field for span logs with key="event" and value=val.
|
||||
func Event(val string) Field {
|
||||
return String("event", val)
|
||||
}
|
||||
|
||||
// Message creates a string-valued Field for span logs with key="message" and value=val.
|
||||
func Message(val string) Field {
|
||||
return String("message", val)
|
||||
}
|
||||
|
||||
// LazyLogger allows for user-defined, late-bound logging of arbitrary data
|
||||
type LazyLogger func(fv Encoder)
|
||||
|
||||
|
9
vendor/github.com/opentracing/opentracing-go/log/util.go
generated
vendored
9
vendor/github.com/opentracing/opentracing-go/log/util.go
generated
vendored
@ -1,6 +1,9 @@
|
||||
package log
|
||||
|
||||
import "fmt"
|
||||
import (
|
||||
"fmt"
|
||||
"reflect"
|
||||
)
|
||||
|
||||
// InterleavedKVToFields converts keyValues a la Span.LogKV() to a Field slice
|
||||
// a la Span.LogFields().
|
||||
@ -46,6 +49,10 @@ func InterleavedKVToFields(keyValues ...interface{}) ([]Field, error) {
|
||||
case float64:
|
||||
fields[i] = Float64(key, typedVal)
|
||||
default:
|
||||
if typedVal == nil || (reflect.ValueOf(typedVal).Kind() == reflect.Ptr && reflect.ValueOf(typedVal).IsNil()) {
|
||||
fields[i] = String(key, "nil")
|
||||
continue
|
||||
}
|
||||
// When in doubt, coerce to a string
|
||||
fields[i] = String(key, fmt.Sprint(typedVal))
|
||||
}
|
||||
|
8
vendor/github.com/opentracing/opentracing-go/noop.go
generated
vendored
8
vendor/github.com/opentracing/opentracing-go/noop.go
generated
vendored
@ -21,9 +21,9 @@ type noopSpan struct{}
|
||||
type noopSpanContext struct{}
|
||||
|
||||
var (
|
||||
defaultNoopSpanContext = noopSpanContext{}
|
||||
defaultNoopSpan = noopSpan{}
|
||||
defaultNoopTracer = NoopTracer{}
|
||||
defaultNoopSpanContext SpanContext = noopSpanContext{}
|
||||
defaultNoopSpan Span = noopSpan{}
|
||||
defaultNoopTracer Tracer = NoopTracer{}
|
||||
)
|
||||
|
||||
const (
|
||||
@ -35,7 +35,7 @@ func (n noopSpanContext) ForeachBaggageItem(handler func(k, v string) bool) {}
|
||||
|
||||
// noopSpan:
|
||||
func (n noopSpan) Context() SpanContext { return defaultNoopSpanContext }
|
||||
func (n noopSpan) SetBaggageItem(key, val string) Span { return defaultNoopSpan }
|
||||
func (n noopSpan) SetBaggageItem(key, val string) Span { return n }
|
||||
func (n noopSpan) BaggageItem(key string) string { return emptyString }
|
||||
func (n noopSpan) SetTag(key string, value interface{}) Span { return n }
|
||||
func (n noopSpan) LogFields(fields ...log.Field) {}
|
||||
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -437,7 +437,7 @@ github.com/openshift/imagebuilder/dockerfile/command
|
||||
github.com/openshift/imagebuilder/dockerfile/parser
|
||||
github.com/openshift/imagebuilder/signal
|
||||
github.com/openshift/imagebuilder/strslice
|
||||
# github.com/opentracing/opentracing-go v1.1.0
|
||||
# github.com/opentracing/opentracing-go v1.2.0
|
||||
github.com/opentracing/opentracing-go
|
||||
github.com/opentracing/opentracing-go/ext
|
||||
github.com/opentracing/opentracing-go/log
|
||||
|
Reference in New Issue
Block a user