You've already forked opentelemetry-go
mirror of
https://github.com/open-telemetry/opentelemetry-go.git
synced 2025-11-23 22:34:47 +02:00
Per https://github.com/open-telemetry/opentelemetry-go/pull/7266#issuecomment-3237027300 Related to https://github.com/open-telemetry/opentelemetry-go/issues/7217 ## What This PR adds `WithInstrumentationAttributeSet` option functions to the `log`, `metric`, and `trace` packages as suggested in https://github.com/open-telemetry/opentelemetry-go/pull/7266#issuecomment-3237027300. These new functions provide a more concurrent-safe alternative to the existing `WithInstrumentationAttributes` functions by accepting a pre-constructed `attribute.Set` instead of variadic `attribute.KeyValue` parameters. ## Why As discussed in #7266, the existing `WithInstrumentationAttributes` functions can lead to data races when used concurrently because `attribute.NewSet()` may mutate the passed slice in-place. While the issue was partially addressed by moving the `attribute.NewSet()` call outside the closure, the best long-term solution is to provide an alternative that accepts an immutable `attribute.Set`. **Benefits:** 1. **Concurrent Safety**: Since `attribute.Set` is immutable, these functions are inherently safe for concurrent use 2. **Performance**: Avoids repeated calls to `attribute.NewSet()` when the same attributes are used multiple times 3. **Consistency**: Matches the existing pattern used in `metric.WithAttributeSet()` 4. **Flexibility**: Allows users to pre-compute attribute sets and reuse them Deprecating `WithInstrumentationAttributes` is out of scope. See https://github.com/open-telemetry/opentelemetry-go/pull/7287#issuecomment-3245820459. ## Benchmarks ``` goos: linux goarch: amd64 pkg: go.opentelemetry.io/otel/trace cpu: 13th Gen Intel(R) Core(TM) i7-13800H BenchmarkNewTracerConfig/with_no_options-20 280298306 4.268 ns/op 0 B/op 0 allocs/op BenchmarkNewTracerConfig/with_an_instrumentation_version-20 33389427 30.84 ns/op 0 B/op 0 allocs/op BenchmarkNewTracerConfig/with_a_schema_url-20 35441077 30.46 ns/op 0 B/op 0 allocs/op BenchmarkNewTracerConfig/with_instrumentation_attribute-20 17607649 88.23 ns/op 64 B/op 1 allocs/op BenchmarkNewTracerConfig/with_instrumentation_attribute_set-20 38336211 31.30 ns/op 0 B/op 0 allocs/op ``` ``` goos: linux goarch: amd64 pkg: go.opentelemetry.io/otel/metric cpu: 13th Gen Intel(R) Core(TM) i7-13800H BenchmarkNewMeterConfig/with_no_options-20 262998199 4.525 ns/op 0 B/op 0 allocs/op BenchmarkNewMeterConfig/with_an_instrumentation_version-20 40483780 29.31 ns/op 0 B/op 0 allocs/op BenchmarkNewMeterConfig/with_a_schema_url-20 39162420 30.58 ns/op 0 B/op 0 allocs/op BenchmarkNewMeterConfig/with_instrumentation_attribute-20 19900275 77.50 ns/op 64 B/op 1 allocs/op BenchmarkNewMeterConfig/with_instrumentation_attribute_set-20 37519020 31.93 ns/op 0 B/op 0 allocs/op ``` ``` goos: linux goarch: amd64 pkg: go.opentelemetry.io/otel/log cpu: 13th Gen Intel(R) Core(TM) i7-13800H BenchmarkNewLoggerConfig/with_no_options-20 271100760 4.322 ns/op 0 B/op 0 allocs/op BenchmarkNewLoggerConfig/with_an_instrumentation_version-20 38392390 30.77 ns/op 0 B/op 0 allocs/op BenchmarkNewLoggerConfig/with_a_schema_url-20 39615074 30.25 ns/op 0 B/op 0 allocs/op BenchmarkNewLoggerConfig/with_instrumentation_attribute-20 17108463 82.51 ns/op 64 B/op 1 allocs/op BenchmarkNewLoggerConfig/with_instrumentation_attribute_set-20 37746534 31.70 ns/op 0 B/op 0 allocs/op ```
530 lines
12 KiB
Go
530 lines
12 KiB
Go
// Copyright The OpenTelemetry Authors
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package trace
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
"go.opentelemetry.io/otel/attribute"
|
|
)
|
|
|
|
func TestNewSpanConfig(t *testing.T) {
|
|
k1v1 := attribute.String("key1", "value1")
|
|
k1v2 := attribute.String("key1", "value2")
|
|
k2v2 := attribute.String("key2", "value2")
|
|
|
|
timestamp0 := time.Unix(0, 0)
|
|
timestamp1 := time.Unix(0, 0)
|
|
|
|
link1 := Link{
|
|
SpanContext: SpanContext{traceID: TraceID([16]byte{1, 1}), spanID: SpanID{3}},
|
|
Attributes: []attribute.KeyValue{k1v1},
|
|
}
|
|
link2 := Link{
|
|
SpanContext: SpanContext{traceID: TraceID([16]byte{1, 1}), spanID: SpanID{3}},
|
|
Attributes: []attribute.KeyValue{k1v2, k2v2},
|
|
}
|
|
|
|
tests := []struct {
|
|
options []SpanStartOption
|
|
expected SpanConfig
|
|
}{
|
|
{
|
|
// No non-zero-values should be set.
|
|
[]SpanStartOption{},
|
|
SpanConfig{},
|
|
},
|
|
{
|
|
[]SpanStartOption{
|
|
WithAttributes(k1v1),
|
|
},
|
|
SpanConfig{
|
|
attributes: []attribute.KeyValue{k1v1},
|
|
},
|
|
},
|
|
{
|
|
// Multiple calls should append not overwrite.
|
|
[]SpanStartOption{
|
|
WithAttributes(k1v1),
|
|
WithAttributes(k1v2),
|
|
WithAttributes(k2v2),
|
|
},
|
|
SpanConfig{
|
|
// No uniqueness is guaranteed by the API.
|
|
attributes: []attribute.KeyValue{k1v1, k1v2, k2v2},
|
|
},
|
|
},
|
|
{
|
|
[]SpanStartOption{
|
|
WithAttributes(k1v1, k1v2, k2v2),
|
|
},
|
|
SpanConfig{
|
|
// No uniqueness is guaranteed by the API.
|
|
attributes: []attribute.KeyValue{k1v1, k1v2, k2v2},
|
|
},
|
|
},
|
|
{
|
|
[]SpanStartOption{
|
|
WithTimestamp(timestamp0),
|
|
},
|
|
SpanConfig{
|
|
timestamp: timestamp0,
|
|
},
|
|
},
|
|
{
|
|
[]SpanStartOption{
|
|
// Multiple calls overwrites with last-one-wins.
|
|
WithTimestamp(timestamp0),
|
|
WithTimestamp(timestamp1),
|
|
},
|
|
SpanConfig{
|
|
timestamp: timestamp1,
|
|
},
|
|
},
|
|
{
|
|
[]SpanStartOption{
|
|
WithLinks(link1),
|
|
},
|
|
SpanConfig{
|
|
links: []Link{link1},
|
|
},
|
|
},
|
|
{
|
|
[]SpanStartOption{
|
|
// Multiple calls should append not overwrite.
|
|
WithLinks(link1),
|
|
WithLinks(link1, link2),
|
|
},
|
|
SpanConfig{
|
|
// No uniqueness is guaranteed by the API.
|
|
links: []Link{link1, link1, link2},
|
|
},
|
|
},
|
|
{
|
|
[]SpanStartOption{
|
|
WithNewRoot(),
|
|
},
|
|
SpanConfig{
|
|
newRoot: true,
|
|
},
|
|
},
|
|
{
|
|
[]SpanStartOption{
|
|
// Multiple calls should not change NewRoot state.
|
|
WithNewRoot(),
|
|
WithNewRoot(),
|
|
},
|
|
SpanConfig{
|
|
newRoot: true,
|
|
},
|
|
},
|
|
{
|
|
[]SpanStartOption{
|
|
WithSpanKind(SpanKindConsumer),
|
|
},
|
|
SpanConfig{
|
|
spanKind: SpanKindConsumer,
|
|
},
|
|
},
|
|
{
|
|
[]SpanStartOption{
|
|
// Multiple calls overwrites with last-one-wins.
|
|
WithSpanKind(SpanKindClient),
|
|
WithSpanKind(SpanKindConsumer),
|
|
},
|
|
SpanConfig{
|
|
spanKind: SpanKindConsumer,
|
|
},
|
|
},
|
|
{
|
|
// Everything should work together.
|
|
[]SpanStartOption{
|
|
WithAttributes(k1v1),
|
|
WithTimestamp(timestamp0),
|
|
WithLinks(link1, link2),
|
|
WithNewRoot(),
|
|
WithSpanKind(SpanKindConsumer),
|
|
},
|
|
SpanConfig{
|
|
attributes: []attribute.KeyValue{k1v1},
|
|
timestamp: timestamp0,
|
|
links: []Link{link1, link2},
|
|
newRoot: true,
|
|
spanKind: SpanKindConsumer,
|
|
},
|
|
},
|
|
}
|
|
for _, test := range tests {
|
|
assert.Equal(t, test.expected, NewSpanStartConfig(test.options...))
|
|
}
|
|
}
|
|
|
|
func TestSpanStartConfigAttributeMutability(t *testing.T) {
|
|
a := attribute.String("a", "val")
|
|
b := attribute.String("b", "val")
|
|
attrs := []attribute.KeyValue{a, b}
|
|
conf := NewSpanStartConfig(WithAttributes(attrs...))
|
|
|
|
// Mutating passed arg should not change configured attributes.
|
|
attrs[0] = attribute.String("c", "val")
|
|
|
|
want := SpanConfig{attributes: []attribute.KeyValue{a, b}}
|
|
assert.Equal(t, want, conf)
|
|
}
|
|
|
|
func TestEndSpanConfig(t *testing.T) {
|
|
timestamp := time.Unix(0, 0)
|
|
|
|
tests := []struct {
|
|
options []SpanEndOption
|
|
expected SpanConfig
|
|
}{
|
|
{
|
|
[]SpanEndOption{},
|
|
SpanConfig{},
|
|
},
|
|
{
|
|
[]SpanEndOption{
|
|
WithStackTrace(true),
|
|
},
|
|
SpanConfig{
|
|
stackTrace: true,
|
|
},
|
|
},
|
|
{
|
|
[]SpanEndOption{
|
|
WithTimestamp(timestamp),
|
|
},
|
|
SpanConfig{
|
|
timestamp: timestamp,
|
|
},
|
|
},
|
|
}
|
|
for _, test := range tests {
|
|
assert.Equal(t, test.expected, NewSpanEndConfig(test.options...))
|
|
}
|
|
}
|
|
|
|
func TestTracerConfig(t *testing.T) {
|
|
v1 := "semver:0.0.1"
|
|
v2 := "semver:1.0.0"
|
|
schemaURL := "https://opentelemetry.io/schemas/1.21.0"
|
|
attrs := attribute.NewSet(
|
|
attribute.String("user", "alice"),
|
|
attribute.Bool("admin", true),
|
|
)
|
|
|
|
c := NewTracerConfig(
|
|
// Multiple calls should overwrite.
|
|
WithInstrumentationVersion(v1),
|
|
WithInstrumentationVersion(v2),
|
|
WithSchemaURL(schemaURL),
|
|
WithInstrumentationAttributes(attrs.ToSlice()...),
|
|
)
|
|
|
|
assert.Equal(t, v2, c.InstrumentationVersion(), "instrumentation version")
|
|
assert.Equal(t, schemaURL, c.SchemaURL(), "schema URL")
|
|
assert.Equal(t, attrs, c.InstrumentationAttributes(), "instrumentation attributes")
|
|
}
|
|
|
|
func TestWithInstrumentationAttributeSet(t *testing.T) {
|
|
attrs := attribute.NewSet(
|
|
attribute.String("service", "test"),
|
|
attribute.Int("three", 3),
|
|
)
|
|
|
|
c := NewTracerConfig(
|
|
WithInstrumentationAttributeSet(attrs),
|
|
)
|
|
|
|
assert.Equal(t, attrs, c.InstrumentationAttributes(), "instrumentation attributes")
|
|
}
|
|
|
|
// Save benchmark results to a file level var to avoid the compiler optimizing
|
|
// away the actual work.
|
|
var (
|
|
spanConfig SpanConfig
|
|
eventConfig EventConfig
|
|
)
|
|
|
|
func BenchmarkNewTracerConfig(b *testing.B) {
|
|
for _, bb := range []struct {
|
|
name string
|
|
options []TracerOption
|
|
}{
|
|
{
|
|
name: "with no options",
|
|
},
|
|
{
|
|
name: "with an instrumentation version",
|
|
options: []TracerOption{
|
|
WithInstrumentationVersion("testing version"),
|
|
},
|
|
},
|
|
{
|
|
name: "with a schema url",
|
|
options: []TracerOption{
|
|
WithSchemaURL("testing URL"),
|
|
},
|
|
},
|
|
{
|
|
name: "with instrumentation attribute",
|
|
options: []TracerOption{
|
|
WithInstrumentationAttributes(attribute.String("key", "value")),
|
|
},
|
|
},
|
|
{
|
|
name: "with instrumentation attribute set",
|
|
options: []TracerOption{
|
|
WithInstrumentationAttributeSet(attribute.NewSet(attribute.String("key", "value"))),
|
|
},
|
|
},
|
|
} {
|
|
b.Run(bb.name, func(b *testing.B) {
|
|
b.ReportAllocs()
|
|
b.ResetTimer()
|
|
|
|
for b.Loop() {
|
|
NewTracerConfig(bb.options...)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func BenchmarkNewSpanStartConfig(b *testing.B) {
|
|
for _, bb := range []struct {
|
|
name string
|
|
options []SpanStartOption
|
|
}{
|
|
{
|
|
name: "with no options",
|
|
},
|
|
{
|
|
name: "with attributes",
|
|
options: []SpanStartOption{
|
|
WithAttributes(attribute.Bool("key", true)),
|
|
},
|
|
},
|
|
{
|
|
name: "with attributes set multiple times",
|
|
options: []SpanStartOption{
|
|
WithAttributes(attribute.Bool("key", true)),
|
|
WithAttributes(attribute.Bool("secondKey", false)),
|
|
},
|
|
},
|
|
{
|
|
name: "with a timestamp",
|
|
options: []SpanStartOption{
|
|
WithTimestamp(time.Now()),
|
|
},
|
|
},
|
|
{
|
|
name: "with links",
|
|
options: []SpanStartOption{
|
|
WithLinks(Link{}),
|
|
},
|
|
},
|
|
{
|
|
name: "with links set multiple times",
|
|
options: []SpanStartOption{
|
|
WithLinks(Link{}),
|
|
WithLinks(Link{}),
|
|
},
|
|
},
|
|
{
|
|
name: "with new root",
|
|
options: []SpanStartOption{
|
|
WithNewRoot(),
|
|
},
|
|
},
|
|
{
|
|
name: "with span kind",
|
|
options: []SpanStartOption{
|
|
WithSpanKind(SpanKindClient),
|
|
},
|
|
},
|
|
} {
|
|
b.Run(bb.name, func(b *testing.B) {
|
|
b.ReportAllocs()
|
|
b.ResetTimer()
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
spanConfig = NewSpanStartConfig(bb.options...)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func BenchmarkNewSpanEndConfig(b *testing.B) {
|
|
for _, bb := range []struct {
|
|
name string
|
|
options []SpanEndOption
|
|
}{
|
|
{
|
|
name: "with no options",
|
|
},
|
|
{
|
|
name: "with a timestamp",
|
|
options: []SpanEndOption{
|
|
WithTimestamp(time.Now()),
|
|
},
|
|
},
|
|
{
|
|
name: "with stack trace",
|
|
options: []SpanEndOption{
|
|
WithStackTrace(true),
|
|
},
|
|
},
|
|
} {
|
|
b.Run(bb.name, func(b *testing.B) {
|
|
b.ReportAllocs()
|
|
b.ResetTimer()
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
spanConfig = NewSpanEndConfig(bb.options...)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func BenchmarkNewEventConfig(b *testing.B) {
|
|
for _, bb := range []struct {
|
|
name string
|
|
options []EventOption
|
|
}{
|
|
{
|
|
name: "with no options",
|
|
},
|
|
{
|
|
name: "with attributes",
|
|
options: []EventOption{
|
|
WithAttributes(attribute.Bool("key", true)),
|
|
},
|
|
},
|
|
{
|
|
name: "with attributes set multiple times",
|
|
options: []EventOption{
|
|
WithAttributes(attribute.Bool("key", true)),
|
|
WithAttributes(attribute.Bool("secondKey", false)),
|
|
},
|
|
},
|
|
{
|
|
name: "with a timestamp",
|
|
options: []EventOption{
|
|
WithTimestamp(time.Now()),
|
|
},
|
|
},
|
|
{
|
|
name: "with a stacktrace",
|
|
options: []EventOption{
|
|
WithStackTrace(true),
|
|
},
|
|
},
|
|
} {
|
|
b.Run(bb.name, func(b *testing.B) {
|
|
b.ReportAllocs()
|
|
b.ResetTimer()
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
eventConfig = NewEventConfig(bb.options...)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestWithInstrumentationAttributesMerge(t *testing.T) {
|
|
aliceAttr := attribute.String("user", "Alice")
|
|
bobAttr := attribute.String("user", "Bob")
|
|
adminAttr := attribute.Bool("admin", true)
|
|
|
|
alice := attribute.NewSet(aliceAttr)
|
|
bob := attribute.NewSet(bobAttr)
|
|
aliceAdmin := attribute.NewSet(aliceAttr, adminAttr)
|
|
bobAdmin := attribute.NewSet(bobAttr, adminAttr)
|
|
|
|
t.Run("SameKey", func(t *testing.T) {
|
|
c := NewTracerConfig(
|
|
WithInstrumentationAttributes(aliceAttr),
|
|
WithInstrumentationAttributes(bobAttr),
|
|
)
|
|
assert.Equal(t, bob, c.InstrumentationAttributes(),
|
|
"Later values for the same key should overwrite earlier ones.")
|
|
})
|
|
|
|
t.Run("DifferentKeys", func(t *testing.T) {
|
|
c := NewTracerConfig(
|
|
WithInstrumentationAttributes(aliceAttr),
|
|
WithInstrumentationAttributes(adminAttr),
|
|
)
|
|
assert.Equal(t, aliceAdmin, c.InstrumentationAttributes(),
|
|
"Different keys should be merged")
|
|
})
|
|
|
|
t.Run("Mixed", func(t *testing.T) {
|
|
c := NewTracerConfig(
|
|
WithInstrumentationAttributes(aliceAttr, adminAttr),
|
|
WithInstrumentationAttributes(bobAttr),
|
|
)
|
|
assert.Equal(t, bobAdmin, c.InstrumentationAttributes(),
|
|
"Combination of same and different keys should be merged.")
|
|
})
|
|
|
|
t.Run("MergedEmpty", func(t *testing.T) {
|
|
c := NewTracerConfig(
|
|
WithInstrumentationAttributes(aliceAttr),
|
|
WithInstrumentationAttributes(),
|
|
)
|
|
assert.Equal(t, alice, c.InstrumentationAttributes(),
|
|
"Empty attributes should not affect existing ones.")
|
|
})
|
|
|
|
t.Run("SameKeyWithSet", func(t *testing.T) {
|
|
c := NewTracerConfig(
|
|
WithInstrumentationAttributeSet(alice),
|
|
WithInstrumentationAttributeSet(bob),
|
|
)
|
|
assert.Equal(t, bob, c.InstrumentationAttributes(),
|
|
"Later values for the same key should overwrite earlier ones.")
|
|
})
|
|
|
|
t.Run("DifferentKeysWithSet", func(t *testing.T) {
|
|
c := NewTracerConfig(
|
|
WithInstrumentationAttributeSet(alice),
|
|
WithInstrumentationAttributeSet(attribute.NewSet(adminAttr)),
|
|
)
|
|
assert.Equal(t, aliceAdmin, c.InstrumentationAttributes(),
|
|
"Different keys should be merged.")
|
|
})
|
|
|
|
t.Run("MixedWithSet", func(t *testing.T) {
|
|
c := NewTracerConfig(
|
|
WithInstrumentationAttributeSet(aliceAdmin),
|
|
WithInstrumentationAttributeSet(bob),
|
|
)
|
|
assert.Equal(t, bobAdmin, c.InstrumentationAttributes(),
|
|
"Combination of same and different keys should be merged.")
|
|
})
|
|
|
|
t.Run("MergedEmptyWithSet", func(t *testing.T) {
|
|
c := NewTracerConfig(
|
|
WithInstrumentationAttributeSet(alice),
|
|
WithInstrumentationAttributeSet(attribute.NewSet()),
|
|
)
|
|
assert.Equal(t, alice, c.InstrumentationAttributes(),
|
|
"Empty attribute set should not affect existing ones.")
|
|
})
|
|
|
|
t.Run("MixedAttributesAndSet", func(t *testing.T) {
|
|
c := NewTracerConfig(
|
|
WithInstrumentationAttributes(aliceAttr),
|
|
WithInstrumentationAttributeSet(attribute.NewSet(bobAttr, adminAttr)),
|
|
)
|
|
assert.Equal(t, bobAdmin, c.InstrumentationAttributes(),
|
|
"Attributes and attribute sets should be merged together.")
|
|
})
|
|
}
|