mirror of
https://github.com/hanzoai/telemetry.git
synced 2026-10-30 20:01:49 +00:00
Jade GuitonandGitHub
0f3b0c974e
#### Description This PR splits the code handling component attribute injection, currently in `internal/telemetry` and `internal/telemetry/componentattribute`, into three parts: - the part meant to be called by components to drop unwanted injected attributes, which remains in `internal/telemetry`; - the part which handles copying Zap logs to an OTel LoggerProvider (where injected attributes are surfaced as instrumentation scope attributes), which is moved into `service/telemetry/otelconftelemetry`, since this "copying" behavior is specific to the otelconf-based telemetry provider; - the rest is moved into `service/internal/componentattribute`. The main goals of this split are: - to address #13842, by moving most dependencies of `componentattribute` into the service - to prepare for the availability of alternate telemetry providers. I also rewrote a lot of the attribute injection code along the way: - Instead of adding an unexported field in `TelemetrySettings` to store the current set of injected attributes, this set is now stored inside the provider wrappers (which was already partly the case). This allowed me to move the `TelemetrySettings` definition back into `component`, removing the dependency it had on `componentattribute`. - I completely changed the approach for injection in logs. Instead of a chain of custom core wrappers with a `withAttributeSet` method, injected attributes are now set through the standard `zapcore.Core.With` method. By introducing a custom `ObjectMarshaler`, we can make injected attributes act like regular Zap fields, while also allowing special handling in the otelzap wrapper core, which will set them as instrumentation scope attributes instead of log record attributes. If I'm not mistaken, this PR should have no externally-visible changes, so no changelog should be necessary. (Except maybe the `_ struct{}` in `TelemetrySettings`, but there was no changelog when we added those elsewhere) #### Link to tracking issue Updates #13842 #### Testing The large amounts of splitting and refactoring led me to abandon the existing tests, as they would be too hard to adapt. I wrote new tests for the code in `service/telemetry/otelconftelemetry` and `service/internal/componentattribute`, which hopefully should fill that gap appropriately.
104 lines
3.2 KiB
Go
104 lines
3.2 KiB
Go
// Copyright The OpenTelemetry Authors
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package attribute // import "go.opentelemetry.io/collector/service/internal/attribute"
|
|
|
|
import (
|
|
"hash/fnv"
|
|
"strings"
|
|
|
|
"go.opentelemetry.io/otel/attribute"
|
|
|
|
"go.opentelemetry.io/collector/component"
|
|
"go.opentelemetry.io/collector/internal/telemetry"
|
|
"go.opentelemetry.io/collector/pipeline"
|
|
)
|
|
|
|
const (
|
|
capabiltiesKind = "capabilities"
|
|
fanoutKind = "fanout"
|
|
)
|
|
|
|
type Attributes struct {
|
|
set attribute.Set
|
|
id int64
|
|
}
|
|
|
|
func newAttributes(attrs ...attribute.KeyValue) Attributes {
|
|
h := fnv.New64a()
|
|
for _, kv := range attrs {
|
|
h.Write([]byte("(" + string(kv.Key) + "|" + kv.Value.AsString() + ")"))
|
|
}
|
|
return Attributes{
|
|
set: attribute.NewSet(attrs...),
|
|
|
|
// The graph identifies nodes by an int64 ID, but fnv gives us a uint64.
|
|
// It is safe to cast because the meaning of the number is irrelevant.
|
|
// We only care that each node has a unique 64 bit ID, which is unaltered by this cast.
|
|
id: int64(h.Sum64()), // #nosec G115
|
|
}
|
|
}
|
|
|
|
func (a Attributes) Set() *attribute.Set {
|
|
return &a.set
|
|
}
|
|
|
|
func (a Attributes) ID() int64 {
|
|
return a.id
|
|
}
|
|
|
|
func Receiver(pipelineType pipeline.Signal, id component.ID) Attributes {
|
|
return newAttributes(
|
|
attribute.String(telemetry.ComponentKindKey, strings.ToLower(component.KindReceiver.String())),
|
|
attribute.String(telemetry.SignalKey, pipelineType.String()),
|
|
attribute.String(telemetry.ComponentIDKey, id.String()),
|
|
)
|
|
}
|
|
|
|
func Processor(pipelineID pipeline.ID, id component.ID) Attributes {
|
|
return newAttributes(
|
|
attribute.String(telemetry.ComponentKindKey, strings.ToLower(component.KindProcessor.String())),
|
|
attribute.String(telemetry.SignalKey, pipelineID.Signal().String()),
|
|
attribute.String(telemetry.PipelineIDKey, pipelineID.String()),
|
|
attribute.String(telemetry.ComponentIDKey, id.String()),
|
|
)
|
|
}
|
|
|
|
func Exporter(pipelineType pipeline.Signal, id component.ID) Attributes {
|
|
return newAttributes(
|
|
attribute.String(telemetry.ComponentKindKey, strings.ToLower(component.KindExporter.String())),
|
|
attribute.String(telemetry.SignalKey, pipelineType.String()),
|
|
attribute.String(telemetry.ComponentIDKey, id.String()),
|
|
)
|
|
}
|
|
|
|
func Connector(exprPipelineType, rcvrPipelineType pipeline.Signal, id component.ID) Attributes {
|
|
return newAttributes(
|
|
attribute.String(telemetry.ComponentKindKey, strings.ToLower(component.KindConnector.String())),
|
|
attribute.String(telemetry.SignalKey, exprPipelineType.String()),
|
|
attribute.String(telemetry.SignalOutputKey, rcvrPipelineType.String()),
|
|
attribute.String(telemetry.ComponentIDKey, id.String()),
|
|
)
|
|
}
|
|
|
|
func Extension(id component.ID) Attributes {
|
|
return newAttributes(
|
|
attribute.String(telemetry.ComponentKindKey, strings.ToLower(component.KindExtension.String())),
|
|
attribute.String(telemetry.ComponentIDKey, id.String()),
|
|
)
|
|
}
|
|
|
|
func Capabilities(pipelineID pipeline.ID) Attributes {
|
|
return newAttributes(
|
|
attribute.String(telemetry.ComponentKindKey, capabiltiesKind),
|
|
attribute.String(telemetry.PipelineIDKey, pipelineID.String()),
|
|
)
|
|
}
|
|
|
|
func Fanout(pipelineID pipeline.ID) Attributes {
|
|
return newAttributes(
|
|
attribute.String(telemetry.ComponentKindKey, fanoutKind),
|
|
attribute.String(telemetry.PipelineIDKey, pipelineID.String()),
|
|
)
|
|
}
|