ddtrace 1.2.0 → 1.10.1

data/ext/ddtrace_profiling_native_extension/stack_recorder.h

@@ -1,37 +1,14 @@
 #pragma once
 
-#include <ddprof/ffi.h>
-
-// Note: Please DO NOT use `VALUE_STRING` anywhere else, instead use `DDPROF_FFI_CHARSLICE_C`.
-// `VALUE_STRING` is only needed because older versions of gcc (4.9.2, used in our Ruby 2.1 and 2.2 CI test images)
-// tripped when compiling `enabled_value_types` using `-std=gnu99` due to the extra cast that is included in
-// `DDPROF_FFI_CHARSLICE_C` with the following error:
-//
-// ```
-// compiling ../../../../ext/ddtrace_profiling_native_extension/stack_recorder.c
-// ../../../../ext/ddtrace_profiling_native_extension/stack_recorder.c:23:1: error: initializer element is not constant
-// static const ddprof_ffi_ValueType enabled_value_types[] = {CPU_TIME_VALUE, CPU_SAMPLES_VALUE, WALL_TIME_VALUE};
-// ^
-// ```
-#define VALUE_STRING(string) {.ptr = "" string, .len = sizeof(string) - 1}
-
-#define      CPU_TIME_VALUE {.type_ = VALUE_STRING("cpu-time"),      .unit = VALUE_STRING("nanoseconds")}
-#define   CPU_SAMPLES_VALUE {.type_ = VALUE_STRING("cpu-samples"),   .unit = VALUE_STRING("count")}
-#define     WALL_TIME_VALUE {.type_ = VALUE_STRING("wall-time"),     .unit = VALUE_STRING("nanoseconds")}
-#define ALLOC_SAMPLES_VALUE {.type_ = VALUE_STRING("alloc-samples"), .unit = VALUE_STRING("count")}
-#define   ALLOC_SPACE_VALUE {.type_ = VALUE_STRING("alloc-space"),   .unit = VALUE_STRING("bytes")}
-#define    HEAP_SPACE_VALUE {.type_ = VALUE_STRING("heap-space"),    .unit = VALUE_STRING("bytes")}
-
-static const ddprof_ffi_ValueType enabled_value_types[] = {
-  #define CPU_TIME_VALUE_POS 0
-  CPU_TIME_VALUE,
-  #define CPU_SAMPLES_VALUE_POS 1
-  CPU_SAMPLES_VALUE,
-  #define WALL_TIME_VALUE_POS 2
-  WALL_TIME_VALUE
-};
-
-#define ENABLED_VALUE_TYPES_COUNT (sizeof(enabled_value_types) / sizeof(ddprof_ffi_ValueType))
-
-void record_sample(VALUE recorder_instance, ddprof_ffi_Sample sample);
-void enforce_recorder_instance(VALUE object);
+#include <datadog/profiling.h>
+
+typedef struct sample_values {
+  int64_t cpu_time_ns;
+  int64_t wall_time_ns;
+  uint32_t cpu_samples;
+  uint32_t alloc_samples;
+} sample_values;
+
+void record_sample(VALUE recorder_instance, ddog_prof_Slice_Location locations, sample_values values, ddog_prof_Slice_Label labels);
+void record_endpoint(VALUE recorder_instance, uint64_t local_root_span_id, ddog_CharSlice endpoint);
+VALUE enforce_recorder_instance(VALUE object);

data/ext/ddtrace_profiling_native_extension/time_helpers.c

@@ -0,0 +1,17 @@
+#include <errno.h>
+#include <time.h>
+
+#include "ruby_helpers.h"
+#include "time_helpers.h"
+
+// Safety: This function is assumed never to raise exceptions by callers when raise_on_failure == false
+long monotonic_wall_time_now_ns(bool raise_on_failure) {
+  struct timespec current_monotonic;
+
+  if (clock_gettime(CLOCK_MONOTONIC, &current_monotonic) != 0) {
+    if (raise_on_failure) ENFORCE_SUCCESS_GVL(errno);
+    return 0;
+  }
+
+  return current_monotonic.tv_nsec + SECONDS_AS_NS(current_monotonic.tv_sec);
+}

data/ext/ddtrace_profiling_native_extension/time_helpers.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#define SECONDS_AS_NS(value) (value * 1000 * 1000 * 1000L)
+#define MILLIS_AS_NS(value) (value * 1000 * 1000L)
+
+#define RAISE_ON_FAILURE true
+#define DO_NOT_RAISE_ON_FAILURE false
+
+// Safety: This function is assumed never to raise exceptions by callers when raise_on_failure == false
+long monotonic_wall_time_now_ns(bool raise_on_failure);