chore: upgrade dependencies
This commit is contained in:
		
							
								
								
									
										79
									
								
								vendor/go.opentelemetry.io/otel/trace/config.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										79
									
								
								vendor/go.opentelemetry.io/otel/trace/config.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -41,20 +41,20 @@ func (t *TracerConfig) SchemaURL() string {
 | 
			
		||||
func NewTracerConfig(options ...TracerOption) TracerConfig {
 | 
			
		||||
	var config TracerConfig
 | 
			
		||||
	for _, option := range options {
 | 
			
		||||
		option.apply(&config)
 | 
			
		||||
		config = option.apply(config)
 | 
			
		||||
	}
 | 
			
		||||
	return config
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// TracerOption applies an option to a TracerConfig.
 | 
			
		||||
type TracerOption interface {
 | 
			
		||||
	apply(*TracerConfig)
 | 
			
		||||
	apply(TracerConfig) TracerConfig
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
type tracerOptionFunc func(*TracerConfig)
 | 
			
		||||
type tracerOptionFunc func(TracerConfig) TracerConfig
 | 
			
		||||
 | 
			
		||||
func (fn tracerOptionFunc) apply(cfg *TracerConfig) {
 | 
			
		||||
	fn(cfg)
 | 
			
		||||
func (fn tracerOptionFunc) apply(cfg TracerConfig) TracerConfig {
 | 
			
		||||
	return fn(cfg)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// SpanConfig is a group of options for a Span.
 | 
			
		||||
@@ -106,7 +106,7 @@ func (cfg *SpanConfig) SpanKind() SpanKind {
 | 
			
		||||
func NewSpanStartConfig(options ...SpanStartOption) SpanConfig {
 | 
			
		||||
	var c SpanConfig
 | 
			
		||||
	for _, option := range options {
 | 
			
		||||
		option.applySpanStart(&c)
 | 
			
		||||
		c = option.applySpanStart(c)
 | 
			
		||||
	}
 | 
			
		||||
	return c
 | 
			
		||||
}
 | 
			
		||||
@@ -118,27 +118,27 @@ func NewSpanStartConfig(options ...SpanStartOption) SpanConfig {
 | 
			
		||||
func NewSpanEndConfig(options ...SpanEndOption) SpanConfig {
 | 
			
		||||
	var c SpanConfig
 | 
			
		||||
	for _, option := range options {
 | 
			
		||||
		option.applySpanEnd(&c)
 | 
			
		||||
		c = option.applySpanEnd(c)
 | 
			
		||||
	}
 | 
			
		||||
	return c
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// SpanStartOption applies an option to a SpanConfig. These options are applicable
 | 
			
		||||
// only when the span is created
 | 
			
		||||
// only when the span is created.
 | 
			
		||||
type SpanStartOption interface {
 | 
			
		||||
	applySpanStart(*SpanConfig)
 | 
			
		||||
	applySpanStart(SpanConfig) SpanConfig
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
type spanOptionFunc func(*SpanConfig)
 | 
			
		||||
type spanOptionFunc func(SpanConfig) SpanConfig
 | 
			
		||||
 | 
			
		||||
func (fn spanOptionFunc) applySpanStart(cfg *SpanConfig) {
 | 
			
		||||
	fn(cfg)
 | 
			
		||||
func (fn spanOptionFunc) applySpanStart(cfg SpanConfig) SpanConfig {
 | 
			
		||||
	return fn(cfg)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// SpanEndOption applies an option to a SpanConfig. These options are
 | 
			
		||||
// applicable only when the span is ended.
 | 
			
		||||
type SpanEndOption interface {
 | 
			
		||||
	applySpanEnd(*SpanConfig)
 | 
			
		||||
	applySpanEnd(SpanConfig) SpanConfig
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// EventConfig is a group of options for an Event.
 | 
			
		||||
@@ -170,7 +170,7 @@ func (cfg *EventConfig) StackTrace() bool {
 | 
			
		||||
func NewEventConfig(options ...EventOption) EventConfig {
 | 
			
		||||
	var c EventConfig
 | 
			
		||||
	for _, option := range options {
 | 
			
		||||
		option.applyEvent(&c)
 | 
			
		||||
		c = option.applyEvent(c)
 | 
			
		||||
	}
 | 
			
		||||
	if c.timestamp.IsZero() {
 | 
			
		||||
		c.timestamp = time.Now()
 | 
			
		||||
@@ -180,7 +180,7 @@ func NewEventConfig(options ...EventOption) EventConfig {
 | 
			
		||||
 | 
			
		||||
// EventOption applies span event options to an EventConfig.
 | 
			
		||||
type EventOption interface {
 | 
			
		||||
	applyEvent(*EventConfig)
 | 
			
		||||
	applyEvent(EventConfig) EventConfig
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// SpanOption are options that can be used at both the beginning and end of a span.
 | 
			
		||||
@@ -203,12 +203,14 @@ type SpanEndEventOption interface {
 | 
			
		||||
 | 
			
		||||
type attributeOption []attribute.KeyValue
 | 
			
		||||
 | 
			
		||||
func (o attributeOption) applySpan(c *SpanConfig) {
 | 
			
		||||
func (o attributeOption) applySpan(c SpanConfig) SpanConfig {
 | 
			
		||||
	c.attributes = append(c.attributes, []attribute.KeyValue(o)...)
 | 
			
		||||
	return c
 | 
			
		||||
}
 | 
			
		||||
func (o attributeOption) applySpanStart(c *SpanConfig) { o.applySpan(c) }
 | 
			
		||||
func (o attributeOption) applyEvent(c *EventConfig) {
 | 
			
		||||
func (o attributeOption) applySpanStart(c SpanConfig) SpanConfig { return o.applySpan(c) }
 | 
			
		||||
func (o attributeOption) applyEvent(c EventConfig) EventConfig {
 | 
			
		||||
	c.attributes = append(c.attributes, []attribute.KeyValue(o)...)
 | 
			
		||||
	return c
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
var _ SpanStartEventOption = attributeOption{}
 | 
			
		||||
@@ -234,10 +236,16 @@ type SpanEventOption interface {
 | 
			
		||||
 | 
			
		||||
type timestampOption time.Time
 | 
			
		||||
 | 
			
		||||
func (o timestampOption) applySpan(c *SpanConfig)      { c.timestamp = time.Time(o) }
 | 
			
		||||
func (o timestampOption) applySpanStart(c *SpanConfig) { o.applySpan(c) }
 | 
			
		||||
func (o timestampOption) applySpanEnd(c *SpanConfig)   { o.applySpan(c) }
 | 
			
		||||
func (o timestampOption) applyEvent(c *EventConfig)    { c.timestamp = time.Time(o) }
 | 
			
		||||
func (o timestampOption) applySpan(c SpanConfig) SpanConfig {
 | 
			
		||||
	c.timestamp = time.Time(o)
 | 
			
		||||
	return c
 | 
			
		||||
}
 | 
			
		||||
func (o timestampOption) applySpanStart(c SpanConfig) SpanConfig { return o.applySpan(c) }
 | 
			
		||||
func (o timestampOption) applySpanEnd(c SpanConfig) SpanConfig   { return o.applySpan(c) }
 | 
			
		||||
func (o timestampOption) applyEvent(c EventConfig) EventConfig {
 | 
			
		||||
	c.timestamp = time.Time(o)
 | 
			
		||||
	return c
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
var _ SpanEventOption = timestampOption{}
 | 
			
		||||
 | 
			
		||||
@@ -249,9 +257,15 @@ func WithTimestamp(t time.Time) SpanEventOption {
 | 
			
		||||
 | 
			
		||||
type stackTraceOption bool
 | 
			
		||||
 | 
			
		||||
func (o stackTraceOption) applyEvent(c *EventConfig)  { c.stackTrace = bool(o) }
 | 
			
		||||
func (o stackTraceOption) applySpan(c *SpanConfig)    { c.stackTrace = bool(o) }
 | 
			
		||||
func (o stackTraceOption) applySpanEnd(c *SpanConfig) { o.applySpan(c) }
 | 
			
		||||
func (o stackTraceOption) applyEvent(c EventConfig) EventConfig {
 | 
			
		||||
	c.stackTrace = bool(o)
 | 
			
		||||
	return c
 | 
			
		||||
}
 | 
			
		||||
func (o stackTraceOption) applySpan(c SpanConfig) SpanConfig {
 | 
			
		||||
	c.stackTrace = bool(o)
 | 
			
		||||
	return c
 | 
			
		||||
}
 | 
			
		||||
func (o stackTraceOption) applySpanEnd(c SpanConfig) SpanConfig { return o.applySpan(c) }
 | 
			
		||||
 | 
			
		||||
// WithStackTrace sets the flag to capture the error with stack trace (e.g. true, false).
 | 
			
		||||
func WithStackTrace(b bool) SpanEndEventOption {
 | 
			
		||||
@@ -261,8 +275,9 @@ func WithStackTrace(b bool) SpanEndEventOption {
 | 
			
		||||
// WithLinks adds links to a Span. The links are added to the existing Span
 | 
			
		||||
// links, i.e. this does not overwrite. Links with invalid span context are ignored.
 | 
			
		||||
func WithLinks(links ...Link) SpanStartOption {
 | 
			
		||||
	return spanOptionFunc(func(cfg *SpanConfig) {
 | 
			
		||||
	return spanOptionFunc(func(cfg SpanConfig) SpanConfig {
 | 
			
		||||
		cfg.links = append(cfg.links, links...)
 | 
			
		||||
		return cfg
 | 
			
		||||
	})
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -270,28 +285,32 @@ func WithLinks(links ...Link) SpanStartOption {
 | 
			
		||||
// existing parent span context will be ignored when defining the Span's trace
 | 
			
		||||
// identifiers.
 | 
			
		||||
func WithNewRoot() SpanStartOption {
 | 
			
		||||
	return spanOptionFunc(func(cfg *SpanConfig) {
 | 
			
		||||
	return spanOptionFunc(func(cfg SpanConfig) SpanConfig {
 | 
			
		||||
		cfg.newRoot = true
 | 
			
		||||
		return cfg
 | 
			
		||||
	})
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// WithSpanKind sets the SpanKind of a Span.
 | 
			
		||||
func WithSpanKind(kind SpanKind) SpanStartOption {
 | 
			
		||||
	return spanOptionFunc(func(cfg *SpanConfig) {
 | 
			
		||||
	return spanOptionFunc(func(cfg SpanConfig) SpanConfig {
 | 
			
		||||
		cfg.spanKind = kind
 | 
			
		||||
		return cfg
 | 
			
		||||
	})
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// WithInstrumentationVersion sets the instrumentation version.
 | 
			
		||||
func WithInstrumentationVersion(version string) TracerOption {
 | 
			
		||||
	return tracerOptionFunc(func(cfg *TracerConfig) {
 | 
			
		||||
	return tracerOptionFunc(func(cfg TracerConfig) TracerConfig {
 | 
			
		||||
		cfg.instrumentationVersion = version
 | 
			
		||||
		return cfg
 | 
			
		||||
	})
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// WithSchemaURL sets the schema URL for the Tracer.
 | 
			
		||||
func WithSchemaURL(schemaURL string) TracerOption {
 | 
			
		||||
	return tracerOptionFunc(func(cfg *TracerConfig) {
 | 
			
		||||
	return tracerOptionFunc(func(cfg TracerConfig) TracerConfig {
 | 
			
		||||
		cfg.schemaURL = schemaURL
 | 
			
		||||
		return cfg
 | 
			
		||||
	})
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								vendor/go.opentelemetry.io/otel/trace/noop.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/go.opentelemetry.io/otel/trace/noop.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -85,5 +85,5 @@ func (noopSpan) AddEvent(string, ...EventOption) {}
 | 
			
		||||
// SetName does nothing.
 | 
			
		||||
func (noopSpan) SetName(string) {}
 | 
			
		||||
 | 
			
		||||
// TracerProvider returns a no-op TracerProvider
 | 
			
		||||
// TracerProvider returns a no-op TracerProvider.
 | 
			
		||||
func (noopSpan) TracerProvider() TracerProvider { return noopTracerProvider{} }
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										8
									
								
								vendor/go.opentelemetry.io/otel/trace/trace.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								vendor/go.opentelemetry.io/otel/trace/trace.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -63,7 +63,7 @@ func (t TraceID) MarshalJSON() ([]byte, error) {
 | 
			
		||||
	return json.Marshal(t.String())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// String returns the hex string representation form of a TraceID
 | 
			
		||||
// String returns the hex string representation form of a TraceID.
 | 
			
		||||
func (t TraceID) String() string {
 | 
			
		||||
	return hex.EncodeToString(t[:])
 | 
			
		||||
}
 | 
			
		||||
@@ -86,7 +86,7 @@ func (s SpanID) MarshalJSON() ([]byte, error) {
 | 
			
		||||
	return json.Marshal(s.String())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// String returns the hex string representation form of a SpanID
 | 
			
		||||
// String returns the hex string representation form of a SpanID.
 | 
			
		||||
func (s SpanID) String() string {
 | 
			
		||||
	return hex.EncodeToString(s[:])
 | 
			
		||||
}
 | 
			
		||||
@@ -151,7 +151,7 @@ func decodeHex(h string, b []byte) error {
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// TraceFlags contains flags that can be set on a SpanContext
 | 
			
		||||
// TraceFlags contains flags that can be set on a SpanContext.
 | 
			
		||||
type TraceFlags byte //nolint:revive // revive complains about stutter of `trace.TraceFlags`.
 | 
			
		||||
 | 
			
		||||
// IsSampled returns if the sampling bit is set in the TraceFlags.
 | 
			
		||||
@@ -174,7 +174,7 @@ func (tf TraceFlags) MarshalJSON() ([]byte, error) {
 | 
			
		||||
	return json.Marshal(tf.String())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// String returns the hex string representation form of TraceFlags
 | 
			
		||||
// String returns the hex string representation form of TraceFlags.
 | 
			
		||||
func (tf TraceFlags) String() string {
 | 
			
		||||
	return hex.EncodeToString([]byte{byte(tf)}[:])
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										20
									
								
								vendor/go.opentelemetry.io/otel/trace/tracestate.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								vendor/go.opentelemetry.io/otel/trace/tracestate.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -58,7 +58,7 @@ func newMember(key, value string) (member, error) {
 | 
			
		||||
	return member{Key: key, Value: value}, nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func parseMemeber(m string) (member, error) {
 | 
			
		||||
func parseMember(m string) (member, error) {
 | 
			
		||||
	matches := memberRe.FindStringSubmatch(m)
 | 
			
		||||
	if len(matches) != 5 {
 | 
			
		||||
		return member{}, fmt.Errorf("%w: %s", errInvalidMember, m)
 | 
			
		||||
@@ -114,7 +114,7 @@ func ParseTraceState(tracestate string) (TraceState, error) {
 | 
			
		||||
			continue
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		m, err := parseMemeber(memberStr)
 | 
			
		||||
		m, err := parseMember(memberStr)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			return TraceState{}, wrapErr(err)
 | 
			
		||||
		}
 | 
			
		||||
@@ -171,7 +171,8 @@ func (ts TraceState) Get(key string) string {
 | 
			
		||||
// specification an error is returned with the original TraceState.
 | 
			
		||||
//
 | 
			
		||||
// If adding a new list-member means the TraceState would have more members
 | 
			
		||||
// than is allowed an error is returned instead with the original TraceState.
 | 
			
		||||
// then is allowed, the new list-member will be inserted and the right-most
 | 
			
		||||
// list-member will be dropped in the returned TraceState.
 | 
			
		||||
func (ts TraceState) Insert(key, value string) (TraceState, error) {
 | 
			
		||||
	m, err := newMember(key, value)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
@@ -179,17 +180,10 @@ func (ts TraceState) Insert(key, value string) (TraceState, error) {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	cTS := ts.Delete(key)
 | 
			
		||||
	if cTS.Len()+1 > maxListMembers {
 | 
			
		||||
		// TODO (MrAlias): When the second version of the Trace Context
 | 
			
		||||
		// specification is published this needs to not return an error.
 | 
			
		||||
		// Instead it should drop the "right-most" member and insert the new
 | 
			
		||||
		// member at the front.
 | 
			
		||||
		//
 | 
			
		||||
		// https://github.com/w3c/trace-context/pull/448
 | 
			
		||||
		return ts, fmt.Errorf("failed to insert: %w", errMemberNumber)
 | 
			
		||||
	if cTS.Len()+1 <= maxListMembers {
 | 
			
		||||
		cTS.list = append(cTS.list, member{})
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	cTS.list = append(cTS.list, member{})
 | 
			
		||||
	// When the number of members exceeds capacity, drop the "right-most".
 | 
			
		||||
	copy(cTS.list[1:], cTS.list)
 | 
			
		||||
	cTS.list[0] = m
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user