3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-06 10:21:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

linter pass

Browse source
This commit is contained in:
Joe Kralicky 2024-12-20 03:41:09 +00:00
parent 54dc955ad6
commit ec1566187a
No known key found for this signature in database
GPG key ID: 75C4875F34A9FB79
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/telemetry/trace/util.go
View file

@ -43,7 +43,7 @@ func ParseTraceparent(traceparent string) (oteltrace.SpanContext, error) {
return oteltrace.NewSpanContext(oteltrace.SpanContextConfig{ return oteltrace.NewSpanContext(oteltrace.SpanContextConfig{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: oteltrace.TraceFlags(traceFlags), TraceFlags: traceFlags,
}), nil }), nil
} }

6
internal/testenv/selftests/tracing_test.go
View file

@ -155,9 +155,9 @@ func TestSampling(t *testing.T) {
handler := func(w http.ResponseWriter, req *http.Request) { handler := func(w http.ResponseWriter, req *http.Request) {
span := oteltrace.SpanFromContext(req.Context()) span := oteltrace.SpanFromContext(req.Context())
spanId := span.SpanContext().SpanID().String() spanID := span.SpanContext().SpanID().String()
traceId := span.SpanContext().TraceID().String() traceID := span.SpanContext().TraceID().String()
_, _ = spanId, traceId _, _ = spanID, traceID
flags := span.SpanContext().TraceFlags() flags := span.SpanContext().TraceFlags()
path := req.URL.Path path := req.URL.Path
if flags.IsSampled() { if flags.IsSampled() {

34
internal/testutil/tracing.go
View file

@ -42,32 +42,32 @@ type TraceDetails struct {
} }
func (td *TraceDetails) SpanTree() *SpanTree { func (td *TraceDetails) SpanTree() *SpanTree {
nodesById := map[oteltrace.SpanID]*SpanTreeNode{} nodesByID := map[oteltrace.SpanID]*SpanTreeNode{}
nodesById[oteltrace.SpanID([8]byte{})] = &SpanTreeNode{} // root node nodesByID[oteltrace.SpanID([8]byte{})] = &SpanTreeNode{} // root node
for _, span := range td.Spans { for _, span := range td.Spans {
spanId, _ := trace.ToSpanID(span.Raw.SpanId) spanID, _ := trace.ToSpanID(span.Raw.SpanId)
nodesById[spanId] = &SpanTreeNode{ nodesByID[spanID] = &SpanTreeNode{
Span: span, Span: span,
} }
} }
detachedNodesById := map[oteltrace.SpanID]*SpanTreeNode{} detachedNodesById := map[oteltrace.SpanID]*SpanTreeNode{}
for _, span := range td.Spans { for _, span := range td.Spans {
spanId, _ := trace.ToSpanID(span.Raw.SpanId) spanID, _ := trace.ToSpanID(span.Raw.SpanId)
parentSpanId, _ := trace.ToSpanID(span.Raw.ParentSpanId) parentSpanID, _ := trace.ToSpanID(span.Raw.ParentSpanId)
if _, ok := nodesById[parentSpanId]; !ok { if _, ok := nodesByID[parentSpanID]; !ok {
detachedNodesById[parentSpanId] = &SpanTreeNode{} detachedNodesById[parentSpanID] = &SpanTreeNode{}
nodesById[parentSpanId] = detachedNodesById[parentSpanId] nodesByID[parentSpanID] = detachedNodesById[parentSpanID]
} }
nodesById[spanId].Parent = nodesById[parentSpanId] nodesByID[spanID].Parent = nodesByID[parentSpanID]
nodesById[parentSpanId].Children = append(nodesById[parentSpanId].Children, nodesById[spanId]) nodesByID[parentSpanID].Children = append(nodesByID[parentSpanID].Children, nodesByID[spanID])
} }
for _, node := range nodesById { for _, node := range nodesByID {
slices.SortFunc(node.Children, func(a, b *SpanTreeNode) int { slices.SortFunc(node.Children, func(a, b *SpanTreeNode) int {
return cmp.Compare(a.Span.Raw.StartTimeUnixNano, b.Span.Raw.StartTimeUnixNano) return cmp.Compare(a.Span.Raw.StartTimeUnixNano, b.Span.Raw.StartTimeUnixNano)
}) })
} }
return &SpanTree{ return &SpanTree{
Root: nodesById[oteltrace.SpanID([8]byte{})], Root: nodesByID[oteltrace.SpanID([8]byte{})],
DetachedParents: detachedNodesById, DetachedParents: detachedNodesById,
} }
} }
@ -106,15 +106,15 @@ func (tr *TraceResults) computeTraces() *Traces {
for _, scopeSpans := range resSpan.ScopeSpans { for _, scopeSpans := range resSpan.ScopeSpans {
scope := scopeSpans.Scope scope := scopeSpans.Scope
for _, span := range scopeSpans.Spans { for _, span := range scopeSpans.Spans {
traceId, _ := trace.ToTraceID(span.TraceId) traceID, _ := trace.ToTraceID(span.TraceId)
var details *TraceDetails var details *TraceDetails
if d, ok := tracesById[traceId]; ok { if d, ok := tracesById[traceID]; ok {
details = d details = d
} else { } else {
details = &TraceDetails{ details = &TraceDetails{
ID: traceId, ID: traceID,
} }
tracesById[traceId] = details tracesById[traceID] = details
} }
svc := "" svc := ""
for _, attr := range resource.Attributes { for _, attr := range resource.Attributes {