Move write_span_context to sdk.h

Author: MrAlias

internal/include/sdk.h

@@ -30,7 +30,35 @@ struct {
     __uint(max_entries, MAX_CONCURRENT);
 } active_spans_by_span_ptr SEC(".maps");
 
-// Function declaration
-static __always_inline long write_span_context(void *go_sc, struct span_context *sc);
+static __always_inline long write_span_context(void *go_sc, struct span_context *sc) {
+    if (go_sc == NULL) {
+        bpf_printk("write_span_context: NULL go_sc");
+        return -1;
+    }
+
+    void *tid = (void *)(go_sc + span_context_trace_id_pos);
+    long ret = bpf_probe_write_user(tid, &sc->TraceID, TRACE_ID_SIZE);
+    if (ret != 0) {
+        bpf_printk("write_span_context: failed to write trace ID: %ld", ret);
+        return -2;
+    }
+
+    void *sid = (void *)(go_sc + span_context_span_id_pos);
+    ret = bpf_probe_write_user(sid, &sc->SpanID, SPAN_ID_SIZE);
+    if (ret != 0) {
+        bpf_printk("write_span_context: failed to write span ID: %ld", ret);
+        return -3;
+    }
+
+    void *flags = (void *)(go_sc + span_context_trace_flags_pos);
+    ret = bpf_probe_write_user(flags, &sc->TraceFlags, TRACE_FLAGS_SIZE);
+    if (ret != 0) {
+        bpf_printk("write_span_context: failed to write trace flags: %ld", ret);
+        return -4;
+    }
+
+    return 0;
+}
+
 
 #endif // SDK_H

internal/pkg/instrumentation/bpf/go.opentelemetry.io/auto/sdk/bpf/probe.bpf.c

@@ -23,36 +23,6 @@ struct {
     __uint(max_entries, 1);
 } new_event SEC(".maps");
 
-static __always_inline long write_span_context(void *go_sc, struct span_context *sc) {
-    if (go_sc == NULL) {
-        bpf_printk("write_span_context: NULL go_sc");
-        return -1;
-    }
-
-    void *tid = (void *)(go_sc + span_context_trace_id_pos);
-    long ret = bpf_probe_write_user(tid, &sc->TraceID, TRACE_ID_SIZE);
-    if (ret != 0) {
-        bpf_printk("write_span_context: failed to write trace ID: %ld", ret);
-        return -2;
-    }
-
-    void *sid = (void *)(go_sc + span_context_span_id_pos);
-    ret = bpf_probe_write_user(sid, &sc->SpanID, SPAN_ID_SIZE);
-    if (ret != 0) {
-        bpf_printk("write_span_context: failed to write span ID: %ld", ret);
-        return -3;
-    }
-
-    void *flags = (void *)(go_sc + span_context_trace_flags_pos);
-    ret = bpf_probe_write_user(flags, &sc->TraceFlags, TRACE_FLAGS_SIZE);
-    if (ret != 0) {
-        bpf_printk("write_span_context: failed to write trace flags: %ld", ret);
-        return -4;
-    }
-
-    return 0;
-}
-
 // This instrumentation attaches a uprobe to the following function:
 // func (t *tracer) start(ctx context.Context, spanPtr *span, parentSpanCtx *trace.SpanContext, sampled *bool, spanCtx *trace.SpanContext) {
 // https://github.com/open-telemetry/opentelemetry-go-instrumentation/blob/effdec9ac23e56e9e9655663d386600e62b10871/sdk/trace.go#L56-L66

internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/trace/bpf/probe.bpf.c

@@ -31,36 +31,6 @@ struct {
     __uint(max_entries, 1);
 } new_event SEC(".maps");
 
-static __always_inline long write_span_context(void *go_sc, struct span_context *sc) {
-    if (go_sc == NULL) {
-        bpf_printk("write_span_context: NULL go_sc");
-        return -1;
-    }
-
-    void *tid = (void *)(go_sc + span_context_trace_id_pos);
-    long ret = bpf_probe_write_user(tid, &sc->TraceID, TRACE_ID_SIZE);
-    if (ret != 0) {
-        bpf_printk("write_span_context: failed to write trace ID: %ld", ret);
-        return -2;
-    }
-
-    void *sid = (void *)(go_sc + span_context_span_id_pos);
-    ret = bpf_probe_write_user(sid, &sc->SpanID, SPAN_ID_SIZE);
-    if (ret != 0) {
-        bpf_printk("write_span_context: failed to write span ID: %ld", ret);
-        return -3;
-    }
-
-    void *flags = (void *)(go_sc + span_context_trace_flags_pos);
-    ret = bpf_probe_write_user(flags, &sc->TraceFlags, TRACE_FLAGS_SIZE);
-    if (ret != 0) {
-        bpf_printk("write_span_context: failed to write trace flags: %ld", ret);
-        return -4;
-    }
-
-    return 0;
-}
-
 // This instrumentation attaches uprobe to the following function:
 // func (noopSpan) tracerProvider(autoEnabled *bool) TracerProvider
 // https://github.com/open-telemetry/opentelemetry-go/blob/2e8d5a99340b1e11ca6b19bcdfcbfe9cd0c2c385/trace/noop.go#L98C1-L98C65