Skip to content

align attributes and report env #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jay-418 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

align attributes and report env #192

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion tracker/metrics/tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,19 @@ func emitDeviceConnectedSpan(ctx context.Context) {
func (t *MetricsTracker) RoutedConnection(ctx context.Context, conn net.Conn, metadata adapter.InboundContext, matchedRule adapter.Rule, matchOutbound adapter.Outbound) net.Conn {
emitDeviceConnectedSpan(ctx)
attrs := metadataToAttributes(metadata)
if info, ok := clientcontext.ClientInfoFromContext(ctx); ok {
attrs.client = &info
}
metrics.conns.Add(context.Background(), 1, metric.WithAttributes(attrs.AsSlice()...))
return NewConn(conn, attrs, t)
}

func (t *MetricsTracker) RoutedPacketConnection(ctx context.Context, conn N.PacketConn, metadata adapter.InboundContext, matchedRule adapter.Rule, matchOutbound adapter.Outbound) N.PacketConn {
emitDeviceConnectedSpan(ctx)
attrs := metadataToAttributes(metadata)
if info, ok := clientcontext.ClientInfoFromContext(ctx); ok {
attrs.client = &info
}
metrics.conns.Add(context.Background(), 1, metric.WithAttributes(attrs.AsSlice()...))
return NewPacketConn(conn, attrs, t)
}
Expand All @@ -115,19 +121,37 @@ func (t *MetricsTracker) Leave(duration int64, attrs *attributes) {
a := append(attrs.attrs,
otelsc.GeoCountryISOCodeKey.String(attrs.country.Load().(string)),
)
if attrs.client != nil {
a = append(a,
semconv.ClientDeviceIDKey.String(attrs.client.DeviceID),
semconv.ClientPlatformKey.String(attrs.client.Platform),
semconv.ClientIsProKey.Bool(attrs.client.IsPro),
semconv.ClientVersionKey.String(attrs.client.Version),
)
}
metrics.duration.Record(context.Background(), duration, metric.WithAttributes(a...))
metrics.conns.Add(context.Background(), -1, metric.WithAttributes(a...))
}

type attributes struct {
attrs []attribute.KeyValue
country atomic.Value // string
client *clientcontext.ClientInfo
}

func (a *attributes) AsSlice() []attribute.KeyValue {
return append(a.attrs,
s := append(a.attrs,
otelsc.GeoCountryISOCodeKey.String(a.country.Load().(string)),
)
if a.client != nil {
s = append(s,
semconv.ClientDeviceIDKey.String(a.client.DeviceID),
semconv.ClientPlatformKey.String(a.client.Platform),
semconv.ClientIsProKey.Bool(a.client.IsPro),
semconv.ClientVersionKey.String(a.client.Version),
)
}
return s
}

func metadataToAttributes(metadata adapter.InboundContext) *attributes {
Expand Down
Loading