Skip to content

Commit 83757ee

Browse files
authored
Revert change that breaks collector embedding (#404)
1 parent 0c52922 commit 83757ee

File tree

5 files changed

+543
-511
lines changed

5 files changed

+543
-511
lines changed

pkg/components/ebpf/common/pids.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"go.opentelemetry.io/obi/pkg/app/request"
1111
"go.opentelemetry.io/obi/pkg/components/exec"
1212
"go.opentelemetry.io/obi/pkg/components/svc"
13-
"go.opentelemetry.io/obi/pkg/export/otel"
13+
"go.opentelemetry.io/obi/pkg/export/otel/idgen"
1414
"go.opentelemetry.io/obi/pkg/services"
1515
)
1616

@@ -110,11 +110,11 @@ func (pf *PIDsFilter) CurrentPIDs(t PIDType) map[uint32]map[uint32]svc.Attrs {
110110

111111
func (pf *PIDsFilter) normalizeTraceContext(span *request.Span) {
112112
if !span.TraceID.IsValid() {
113-
span.TraceID = otel.RandomTraceID()
113+
span.TraceID = idgen.RandomTraceID()
114114
span.TraceFlags = 1
115115
}
116116
if !span.SpanID.IsValid() {
117-
span.SpanID = otel.RandomSpanID()
117+
span.SpanID = idgen.RandomSpanID()
118118
}
119119
}
120120

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// This implementation was inspired by the code in
1717
// https://github.com/open-telemetry/opentelemetry-go-instrumentation/blob/cdfad4a67b86c282ed29141ca0b3bca46509eee9/internal/pkg/opentelemetry/id_generator.go
1818

19-
package otel
19+
package idgen
2020

2121
import (
2222
"encoding/binary"

0 commit comments

Comments
 (0)