Instrument the OTel trace API's auto SDK

CHANGELOG.md

@@ -42,6 +42,7 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http
   This is included by default. ([#1859](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/1859))
 - The `WithEnv` function no longer parses `OTEL_SERVICE_NAME` or `OTEL_TRACES_EXPORTER`.
   Use the `Handler` from `go.opentelemtry.io/auto/pipeline/otelsdk` with its own `WithEnv` to replace functionality. ([#1859](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/1859))
+- Instrument spans created with the OpenTelemetry trace API from an empty context. ([#2001](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/2001))
 - Upgrade OpenTelemetry semantic conventions to `v1.30.0`. ([#2032](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/2032))
 
 ### Removed

instrumentation.go

@@ -22,6 +22,7 @@ import (
 	kafkaConsumer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer"
 	kafkaProducer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer"
 	autosdk "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/go.opentelemetry.io/auto/sdk"
+	otelTrace "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/trace"
 	otelTraceGlobal "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal"
 	grpcClient "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/google.golang.org/grpc/client"
 	grpcServer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/google.golang.org/grpc/server"
@@ -73,6 +74,7 @@ func NewInstrumentation(
 		kafkaProducer.New(c.logger, Version()),
 		kafkaConsumer.New(c.logger, Version()),
 		autosdk.New(c.logger),
+		otelTrace.New(c.logger),
 		otelTraceGlobal.New(c.logger),
 	}
 

internal/include/sdk.h

@@ -0,0 +1,64 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#ifndef SDK_H
+#define SDK_H
+
+#include "trace/span_context.h"
+
+#define MAX_CONCURRENT 50
+// TODO: tune this. This is a just a guess, but we should be able to determine
+// the maximum size of a span (based on limits) and set this. Ideally, we could
+// also look into a tiered allocation strategy so we do not over allocate
+// space (i.e. small, medium, large data sizes).
+#define MAX_SIZE 2048
+
+// Injected constants
+volatile const u64 span_context_trace_id_pos;
+volatile const u64 span_context_span_id_pos;
+volatile const u64 span_context_trace_flags_pos;
+
+struct otel_span_t {
+    struct span_context sc;
+    struct span_context psc;
+};
+
+struct {
+    __uint(type, BPF_MAP_TYPE_HASH);
+    __type(key, void*);
+    __type(value, struct otel_span_t);
+    __uint(max_entries, MAX_CONCURRENT);
+} active_spans_by_span_ptr 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;
+}
+
+
+#endif // SDK_H

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

@@ -4,36 +4,13 @@
 #include "arguments.h"
 #include "go_context.h"
 #include "go_types.h"
+#include "sdk.h"
 #include "trace/span_context.h"
 #include "trace/start_span.h"
 #include "trace/span_output.h"
 
 char __license[] SEC("license") = "Dual MIT/GPL";
 
-#define MAX_CONCURRENT 50
-// TODO: tune this. This is a just a guess, but we should be able to determine
-// the maximum size of a span (based on limits) and set this. Ideally, we could
-// also look into a tiered allocation strategy so we do not over allocate
-// space (i.e. small, medium, large data sizes).
-#define MAX_SIZE 2048
-
-// Injected const.
-volatile const u64 span_context_trace_id_pos;
-volatile const u64 span_context_span_id_pos;
-volatile const u64 span_context_trace_flags_pos;
-
-struct otel_span_t {
-    struct span_context sc;
-    struct span_context psc;
-};
-
-struct {
-    __uint(type, BPF_MAP_TYPE_HASH);
-    __type(key, void*);
-    __type(value, struct otel_span_t);
-    __uint(max_entries, MAX_CONCURRENT);
-} active_spans_by_span_ptr SEC(".maps");
-
 struct event_t {
     u32 size;
     char data[MAX_SIZE];
@@ -46,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

@@ -0,0 +1,182 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#include "arguments.h"
+#include "go_context.h"
+#include "go_types.h"
+#include "sdk.h"
+#include "trace/span_context.h"
+#include "trace/start_span.h"
+#include "trace/span_output.h"
+
+char __license[] SEC("license") = "Dual MIT/GPL";
+
+// Records state of our write to auto-instrumentation flag.
+bool wrote_flag = false;
+
+struct control_t {
+    u64 kind; // Required to be 1.
+};
+
+struct event_t {
+    u64 kind; // Required to be 0.
+    u32 size;
+    char data[MAX_SIZE];
+};
+
+struct {
+    __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
+    __uint(key_size, sizeof(u32));
+    __uint(value_size, sizeof(struct event_t));
+    __uint(max_entries, 1);
+} new_event SEC(".maps");
+
+// 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
+SEC("uprobe/tracerProvider")
+int uprobe_tracerProvider(struct pt_regs *ctx) {
+    if (wrote_flag) {
+        // Already wrote flag value.
+        return 0;
+    }
+
+    void *flag_ptr = get_argument(ctx, 3);
+    if (flag_ptr == NULL) {
+        bpf_printk("invalid flag_ptr: NULL");
+        return -1;
+    }
+
+    bool true_value = true;
+    long res = bpf_probe_write_user(flag_ptr, &true_value, sizeof(bool));
+    if (res != 0) {
+        bpf_printk("failed to write bool flag value: %ld", res);
+        return -2;
+    }
+
+    wrote_flag = true;
+
+    // Signal this uprobe should be unloaded.
+    struct control_t ctrl = {1};
+    return bpf_perf_event_output(ctx, &events, BPF_F_CURRENT_CPU, (void *)(&ctrl), sizeof(struct control_t));
+}
+
+// This instrumentation attaches a uprobe to the following function:
+// func (t *autoTracer) start(ctx context.Context, spanPtr *autoSpan, psc *SpanContext, sampled *bool, sc *SpanContext)
+// https://github.com/open-telemetry/opentelemetry-go/blob/2e8d5a99340b1e11ca6b19bcdfcbfe9cd0c2c385/trace/auto.go#L81-L92
+SEC("uprobe/Tracer_start")
+int uprobe_Tracer_start(struct pt_regs *ctx) {
+    struct go_iface go_context = {0};
+    get_Go_context(ctx, 2, 0, true, &go_context);
+
+    struct otel_span_t otel_span;
+    __builtin_memset(&otel_span, 0, sizeof(struct otel_span_t));
+
+    start_span_params_t params = {
+        .ctx = ctx,
+        .go_context = &go_context,
+        .psc = &otel_span.psc,
+        .sc = &otel_span.sc,
+        .get_parent_span_context_fn = NULL,
+        .get_parent_span_context_arg = NULL, // Default to new root. 
+    };
+
+    start_span(&params);
+
+    void *parent_span_context = get_argument(ctx, 5);
+    long rc = write_span_context(parent_span_context, &otel_span.psc);
+    if (rc != 0) {
+        bpf_printk("failed to write parent span context: %ld", rc);
+    }
+
+    if (!is_sampled(params.sc)) {
+        // Default SDK behaviour is to sample everything. Only set the sampled
+        // value to false when needed.
+        void *sampled_ptr_val = get_argument(ctx, 6);
+        if (sampled_ptr_val == NULL) {
+            bpf_printk("nil sampled pointer");
+        } else {
+            bool false_val = false;
+            rc = bpf_probe_write_user(sampled_ptr_val, &false_val, sizeof(bool));
+            if (rc != 0) {
+                bpf_printk("bpf_probe_write_user: failed to write sampled value: %ld", rc);
+            } else {
+                bpf_printk("wrote sampled value");
+            }
+        }
+    }
+
+    void *span_context_ptr_val = get_argument(ctx, 7);
+    rc = write_span_context(span_context_ptr_val, &otel_span.sc);
+    if (rc != 0) {
+        bpf_printk("failed to write span context: %ld", rc);
+    }
+
+    void *span_ptr_val = get_argument(ctx, 4);
+    bpf_map_update_elem(&active_spans_by_span_ptr, &span_ptr_val, &otel_span, 0);
+    start_tracking_span(go_context.data, &otel_span.sc);
+
+    return 0;
+}
+
+// This instrumentation attaches a uprobe to the following function:
+// func (*autoSpan) ended(buf []byte) {}
+// https://github.com/open-telemetry/opentelemetry-go/blob/2e8d5a99340b1e11ca6b19bcdfcbfe9cd0c2c385/trace/auto.go#L435-L448
+SEC("uprobe/Span_ended")
+int uprobe_Span_ended(struct pt_regs *ctx) {
+    void *span_ptr = get_argument(ctx, 1);
+    struct otel_span_t *span = bpf_map_lookup_elem(&active_spans_by_span_ptr, &span_ptr);
+    if (span == NULL) {
+        return 0;
+    }
+    bool sampled = is_sampled(&span->sc);
+    stop_tracking_span(&span->sc, &span->psc);
+    bpf_map_delete_elem(&active_spans_by_span_ptr, &span_ptr);
+
+    // Do not output un-sampled span data.
+    if (!sampled) return 0;
+
+    u64 len = (u64)get_argument(ctx, 3);
+    if (len > MAX_SIZE) {
+        bpf_printk("span data too large: %d", len);
+        return -1;
+    }
+    if (len == 0) {
+        bpf_printk("empty span data");
+        return 0;
+    }
+
+    void *data_ptr = get_argument(ctx, 2);
+    if (data_ptr == NULL) {
+        bpf_printk("empty span data");
+        return 0;
+    }
+
+    u32 key = 0;
+    struct event_t *event = bpf_map_lookup_elem(&new_event, &key);
+    if (event == NULL) {
+        bpf_printk("failed to initialize new event");
+        return -2;
+    }
+    event->size = (u32)len;
+
+    if (event->size < MAX_SIZE) {
+        long rc = bpf_probe_read(&event->data, event->size, data_ptr);
+        if (rc < 0) {
+            bpf_printk("failed to read encoded span data");
+            return -3;
+        }
+    } else {
+        bpf_printk("read too large: %d", event->size);
+        return -4;
+    }
+
+    // Do not send the whole size.buf if it is not needed.
+    u64 size = sizeof(event->kind) + sizeof(event->size) + event->size;
+    // Make the verifier happy, ensure no unbounded memory access.
+    if (size < sizeof(struct event_t)+1) {
+        return bpf_perf_event_output(ctx, &events, BPF_F_CURRENT_CPU, event, size);
+    }
+    bpf_printk("write too large: %d", event->size);
+    return -5;
+}