ddtrace 1.1.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6517e04d64a4ad46051c9841bf7438809e6379693f5796a26c063e3335788963
-  data.tar.gz: 646ad1cdabd82d2c94c4d4d5d1e4ab96f6a36890a9f50ea4cbbedac4c123a00e
+  metadata.gz: b4e4740121e3fe300ff3f114e1ef7f968e104f46644fb0355fc1f1f3f977e725
+  data.tar.gz: 914ba68d4f3be6ad282bfe21e03bbeecd4b6a0c37fd6efb625ae4c9cfe386518
 SHA512:
-  metadata.gz: 6d17badd3ed215171d47529092da1ea2a90e0acbdd9071237fc3637052d2b8fb72c422594dfd504a773dc504bcb8862c07d40123fdd97df207d07e07dee5a491
-  data.tar.gz: 9cbde75b86ba09ccb13161ab106ec24d3b10d93bab1b5996fdec72c14c429b227df3bbc965ab528369ac25e36a5650368b1339e89c17e632605c1e95566bae87
+  metadata.gz: 26d08410fc6d1ce577df1eb6dc8df1d49aa04c3581aeae799e74c0fb682ea314e788755b910654a5a8682fbf648e68c38393baeba559470153aff6776bd6bd0c
+  data.tar.gz: ad50fc9303b945511e2f886a4bbedf7c5d813889829ddfdf9f904361ec5f36e3a02d331c224933ef7b9a9524dbfb2a889fabbc93511eb7bd099ac38928de3b2a

data/CHANGELOG.md

@@ -2,8 +2,91 @@
 
 ## [Unreleased]
 
+## [1.4.0] - 2022-08-25
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v1.4.0
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v1.3.0...v1.4.0
+
+### Added
+
+* gRPC: tag `grpc.client.deadline` ([#2200][])
+* Implement telemetry, disable by default ([#2153][])
+
+### Changed
+
+* Bump `libdatadog` dependency version ([#2229][])
+
+### Fixed
+
+* Fix CI instrumentation configuration ([#2219][])
+
+## [1.3.0] - 2022-08-04
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v1.3.0
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v1.2.0...v1.3.0
+
+### Added
+
+* Top-level span being tagged to avoid duplicate computation ([#2138][])
+
+### Changed
+
+* ActiveSupport: Optionally disable tracing with Rails ([@marcotc][])
+* Rack: Resource overwritten by nested application ([#2180][])
+* Rake: Explicit task instrumentation to prevent memory bloat ([#2174][])
+* Sidekiq and DelayedJob: Add spans to improve tracing ([#2170][])
+* Drop Profiling support for Ruby 2.1 ([#2140][])
+* Migrate `libddprof` dependency to `libdatadog` ([#2061][])
+
+### Fixed
+
+* Fix OpenTracing propagation with TraceDigest ([#2201][])
+* Fix SpanFilter dropping descendant spans ([#2074][])
+* Redis: Fix Empty pipelined span being dropped ([#757][]) ([@sponomarev][])
+* Fix profiler not restarting on `Process.daemon` ([#2150][])
+* Fix setting service from Rails configuration ([#2118][]) ([@agrobbin][])
+* Some document and development improvement ([@marocchino][]) ([@yukimurasawa][])
+
+## [1.2.0] - 2022-07-11
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v1.2.0
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v1.1.0...v1.2.0
+
+Special thanks go to [@miketheman][] for gifting Datadog access to the `datadog` gem a few days ago.
+
+### Added
+
+* Add Postgres (`pg` gem) instrumentation ([#2054][]) ([@jennchenn][])
+* Add env var for debugging profiling native extension compilation issues ([#2069][])
+* Teach Rest Client integration the `:split_by_domain` option ([#2079][]) ([@agrobbin][])
+* Allow passing request_queuing option to Rack through Rails tracer ([#2082][]) ([@KieranP][])
+* Add Utility to Collect Platform Information ([#2097][]) ([@jennchenn][])
+* Add convenient interface for getting and setting tags using `[]` and `[]=` respectively ([#2076][]) ([@ioquatix][])
+* Add b3 metadata in grpc ([#2110][]) ([@henrich-m][])
+
+### Changed
+
+* Profiler now reports profiling data using the libddprof gem ([#2059][])
+* Rename `Kernel#at_fork_blocks` monkey patch to `Kernel#ddtrace_at_fork_blocks` ([#2070][])
+* Improved error message for enabling profiling when `pkg-config` system tool is not installed ([#2134][])
+
+### Fixed
+
+* Prevent errors in `action_controller` integration when tracing is disabled ([#2027][]) ([@ahorner][])
+* Fix profiler not building on ruby-head (3.2) due to VM refactoring ([#2066][])
+* Span and trace IDs should not be zero ([#2113][]) ([@albertvaka][])
+* Fix object_id usage as thread local key ([#2096][])
+* Fix profiling not working on Heroku and AWS Elastic Beanstalk due to linking issues ([#2125][])
+
 ## [1.1.0] - 2022-05-25
 
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v1.1.0
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v1.0.0...v1.1.0
+
 ### Added
 
 * [Application Security Monitoring](https://docs.datadoghq.com/security_platform/application_security/)
@@ -2318,6 +2401,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#753]: https://github.com/DataDog/dd-trace-rb/issues/753
 [#754]: https://github.com/DataDog/dd-trace-rb/issues/754
 [#756]: https://github.com/DataDog/dd-trace-rb/issues/756
+[#757]: https://github.com/DataDog/dd-trace-rb/issues/757
 [#760]: https://github.com/DataDog/dd-trace-rb/issues/760
 [#762]: https://github.com/DataDog/dd-trace-rb/issues/762
 [#765]: https://github.com/DataDog/dd-trace-rb/issues/765
@@ -2852,7 +2936,40 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#2010]: https://github.com/DataDog/dd-trace-rb/issues/2010
 [#2011]: https://github.com/DataDog/dd-trace-rb/issues/2011
 [#2022]: https://github.com/DataDog/dd-trace-rb/issues/2022
+[#2027]: https://github.com/DataDog/dd-trace-rb/issues/2027
 [#2028]: https://github.com/DataDog/dd-trace-rb/issues/2028
+[#2054]: https://github.com/DataDog/dd-trace-rb/issues/2054
+[#2059]: https://github.com/DataDog/dd-trace-rb/issues/2059
+[#2061]: https://github.com/DataDog/dd-trace-rb/issues/2061
+[#2066]: https://github.com/DataDog/dd-trace-rb/issues/2066
+[#2069]: https://github.com/DataDog/dd-trace-rb/issues/2069
+[#2070]: https://github.com/DataDog/dd-trace-rb/issues/2070
+[#2074]: https://github.com/DataDog/dd-trace-rb/issues/2074
+[#2076]: https://github.com/DataDog/dd-trace-rb/issues/2076
+[#2079]: https://github.com/DataDog/dd-trace-rb/issues/2079
+[#2082]: https://github.com/DataDog/dd-trace-rb/issues/2082
+[#2096]: https://github.com/DataDog/dd-trace-rb/issues/2096
+[#2097]: https://github.com/DataDog/dd-trace-rb/issues/2097
+[#2110]: https://github.com/DataDog/dd-trace-rb/issues/2110
+[#2113]: https://github.com/DataDog/dd-trace-rb/issues/2113
+[#2118]: https://github.com/DataDog/dd-trace-rb/issues/2118
+[#2125]: https://github.com/DataDog/dd-trace-rb/issues/2125
+[#2134]: https://github.com/DataDog/dd-trace-rb/issues/2134
+[#2138]: https://github.com/DataDog/dd-trace-rb/issues/2138
+[#2140]: https://github.com/DataDog/dd-trace-rb/issues/2140
+[#2150]: https://github.com/DataDog/dd-trace-rb/issues/2150
+[#2153]: https://github.com/DataDog/dd-trace-rb/issues/2153
+[#2158]: https://github.com/DataDog/dd-trace-rb/issues/2158
+[#2162]: https://github.com/DataDog/dd-trace-rb/issues/2162
+[#2163]: https://github.com/DataDog/dd-trace-rb/issues/2163
+[#2170]: https://github.com/DataDog/dd-trace-rb/issues/2170
+[#2173]: https://github.com/DataDog/dd-trace-rb/issues/2173
+[#2174]: https://github.com/DataDog/dd-trace-rb/issues/2174
+[#2180]: https://github.com/DataDog/dd-trace-rb/issues/2180
+[#2200]: https://github.com/DataDog/dd-trace-rb/issues/2200
+[#2201]: https://github.com/DataDog/dd-trace-rb/issues/2201
+[#2219]: https://github.com/DataDog/dd-trace-rb/issues/2219
+[#2229]: https://github.com/DataDog/dd-trace-rb/issues/2229
 [@AdrianLC]: https://github.com/AdrianLC
 [@Azure7111]: https://github.com/Azure7111
 [@BabyGroot]: https://github.com/BabyGroot
@@ -2865,6 +2982,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@Jared-Prime]: https://github.com/Jared-Prime
 [@Joas1988]: https://github.com/Joas1988
 [@JustSnow]: https://github.com/JustSnow
+[@KieranP]: https://github.com/KieranP
 [@MMartyn]: https://github.com/MMartyn
 [@NobodysNightmare]: https://github.com/NobodysNightmare
 [@Redapted]: https://github.com/Redapted
@@ -2875,7 +2993,9 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@agirlnamedsophia]: https://github.com/agirlnamedsophia
 [@agrobbin]: https://github.com/agrobbin
 [@ahammel]: https://github.com/ahammel
+[@ahorner]: https://github.com/ahorner
 [@al-kudryavtsev]: https://github.com/al-kudryavtsev
+[@albertvaka]: https://github.com/albertvaka
 [@alksl]: https://github.com/alksl
 [@alloy]: https://github.com/alloy
 [@aurelian]: https://github.com/aurelian
@@ -2921,11 +3041,14 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@guizmaii]: https://github.com/guizmaii
 [@hatstand]: https://github.com/hatstand
 [@hawknewton]: https://github.com/hawknewton
+[@henrich-m]: https://github.com/henrich-m
 [@hs-bguven]: https://github.com/hs-bguven
 [@illdelph]: https://github.com/illdelph
+[@ioquatix]: https://github.com/ioquatix
 [@jamiehodge]: https://github.com/jamiehodge
 [@janz93]: https://github.com/janz93
 [@jeffjo]: https://github.com/jeffjo
+[@jennchenn]: https://github.com/jennchenn
 [@jfrancoist]: https://github.com/jfrancoist
 [@joeyAghion]: https://github.com/joeyAghion
 [@jpaulgs]: https://github.com/jpaulgs
@@ -2939,12 +3062,15 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@link04]: https://github.com/link04
 [@lloeki]: https://github.com/lloeki
 [@mantrala]: https://github.com/mantrala
+[@marcotc]: https://github.com/marcotc
+[@marocchino]: https://github.com/marocchino
 [@masato-hi]: https://github.com/masato-hi
 [@matchbookmac]: https://github.com/matchbookmac
 [@mberlanda]: https://github.com/mberlanda
 [@mdehoog]: https://github.com/mdehoog
 [@mdross95]: https://github.com/mdross95
 [@michaelkl]: https://github.com/michaelkl
+[@miketheman]: https://github.com/miketheman
 [@mriddle]: https://github.com/mriddle
 [@mscrivo]: https://github.com/mscrivo
 [@mstruve]: https://github.com/mstruve
@@ -2969,6 +3095,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@sinsoku]: https://github.com/sinsoku
 [@skcc321]: https://github.com/skcc321
 [@soulcutter]: https://github.com/soulcutter
+[@sponomarev]: https://github.com/sponomarev
 [@stefanahman]: https://github.com/stefanahman
 [@steveh]: https://github.com/steveh
 [@stormsilver]: https://github.com/stormsilver
@@ -2983,4 +3110,5 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@vramaiah]: https://github.com/vramaiah
 [@walterking]: https://github.com/walterking
 [@y-yagi]: https://github.com/y-yagi
-[@zachmccormick]: https://github.com/zachmccormick
+[@yukimurasawa]: https://github.com/yukimurasawa
+[@zachmccormick]: https://github.com/zachmccormick

data/LICENSE-3rdparty.csv

@@ -2,3 +2,5 @@ Component,Origin,License,Copyright
 lib/datadog/core/vendor/multipart-post,https://github.com/socketry/multipart-post,MIT,"Copyright (c) 2007-2013 Nick Sieger."
 lib/datadog/tracing/contrib/active_record/vendor,https://github.com/rails/rails/,MIT,"Copyright (c) 2005-2018 David Heinemeier Hansson"
 ext/ddtrace_profiling_native_extension/private_vm_api_access,https://github.com/ruby/ruby,BSD-2-Clause,"Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved."
+msgpack,https://rubygems.org/gems/msgpack,Apache-2.0,"Copyright (c) 2008-2015 Sadayuki Furuhashi"
+debase-ruby_core_source,https://rubygems.org/gems/debase-ruby_core_source,MIT for gem and BSD-2-Clause for Ruby sources,"Copyright (c) 2012 Gabriel Horner. Files from Ruby sources are Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved."

data/README.md

@@ -1,11 +1,11 @@
-***Version 1.0.0 has recently been released. Check out our [upgrade guide](https://github.com/DataDog/dd-trace-rb/blob/master/docs/UpgradeGuide.md#from-0x-to-10) for more details.***
+**We've recently released the 1.x version series. If you're upgrading from a 0.x version, check out our [upgrade guide](https://github.com/DataDog/dd-trace-rb/blob/master/docs/UpgradeGuide.md#from-0x-to-10).**
 
 # Datadog Trace Client
 
 [![Gem](https://img.shields.io/gem/v/ddtrace)](https://rubygems.org/gems/ddtrace/)
 [![CircleCI](https://circleci.com/gh/DataDog/dd-trace-rb/tree/master.svg?style=svg&circle-token=b0bd5ef866ec7f7b018f48731bb495f2d1372cc1)](https://circleci.com/gh/DataDog/dd-trace-rb/tree/master)
 [![codecov](https://codecov.io/gh/DataDog/dd-trace-rb/branch/master/graph/badge.svg)](https://app.codecov.io/gh/DataDog/dd-trace-rb/branch/master)
-[![YARD documentation](https://img.shields.io/badge/YARD-documentation-blue)](https://www.rubydoc.info/gems/ddtrace/)
+[![YARD documentation](https://img.shields.io/badge/YARD-documentation-blue)](https://s3.amazonaws.com/gems.datadoghq.com/trace/docs/index.html)
 
 ``ddtrace`` is Datadog’s tracing client for Ruby. It is used to trace requests as they flow across web servers,
 databases and microservices so that developers have great visiblity into bottlenecks and troublesome requests.
@@ -22,7 +22,12 @@ For contributing, checkout the [contribution guidelines][contribution docs] and
 
 [setup docs]: https://docs.datadoghq.com/tracing/setup/ruby/
 [api docs]: https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md
-[gem docs]: http://gems.datadoghq.com/trace/docs/
+[gem docs]: https://s3.amazonaws.com/gems.datadoghq.com/trace/docs/index.html
 [visualization docs]: https://docs.datadoghq.com/tracing/visualization/
 [contribution docs]: https://github.com/DataDog/dd-trace-rb/blob/master/CONTRIBUTING.md
 [development docs]: https://github.com/DataDog/dd-trace-rb/blob/master/docs/DevelopmentGuide.md
+
+## Special thanks
+
+* [Mike Fiedler](https://github.com/miketheman) for working on a number of Datadog Ruby projects, as well as graciously
+  gifting control of the `datadog` gem

data/ext/ddtrace_profiling_loader/ddtrace_profiling_loader.c

@@ -20,7 +20,7 @@
 // This idea was shamelessly stolen from @lloeki's work in https://github.com/rubyjs/mini_racer/pull/179, big thanks!
 //
 // Extra note: Currently (May 2022), that we know of, the profiling native extension only exposes one potentially
-// problematic symbol: `rust_eh_personality` (coming from libddprof/libdatadog).
+// problematic symbol: `rust_eh_personality` (coming from libdatadog).
 // Future versions of Rust have been patched not to expose this
 // (see https://github.com/rust-lang/rust/pull/95604#issuecomment-1108563434) so we may want to revisit the need
 // for this loader in the future, and perhaps delete it if we no longer require its services :)
@@ -41,7 +41,7 @@ static void unload_failed_library(void *handle);
 
 #define DDTRACE_EXPORT __attribute__ ((visibility ("default")))
 
-void DDTRACE_EXPORT Init_ddtrace_profiling_loader() {
+void DDTRACE_EXPORT Init_ddtrace_profiling_loader(void) {
   VALUE datadog_module = rb_define_module("Datadog");
   VALUE profiling_module = rb_define_module_under(datadog_module, "Profiling");
   VALUE loader_module = rb_define_module_under(profiling_module, "Loader");

data/ext/ddtrace_profiling_loader/extconf.rb

@@ -1,4 +1,5 @@
 # typed: ignore
+
 # rubocop:disable Style/StderrPuts
 # rubocop:disable Style/GlobalVars
 

data/ext/ddtrace_profiling_native_extension/NativeExtensionDesign.md

@@ -2,7 +2,7 @@
 
 The profiling native extension is used to:
 1. Implement features which are expensive (in terms of resources) or otherwise impossible to implement using Ruby code.
-2. Bridge between Ruby-specific profiling features and [`libddprof`](https://github.com/DataDog/libddprof), a Rust-based
+2. Bridge between Ruby-specific profiling features and [`libdatadog`](https://github.com/DataDog/libdatadog), a Rust-based
 library with common profiling functionality.
 
 Due to (1), this extension is quite coupled with MRI Ruby ("C Ruby") internals, and is not intended to support other rubies such as
@@ -10,13 +10,18 @@ JRuby or TruffleRuby. When below we say "Ruby", read it as "MRI Ruby".
 
 ## Disabling
 
-The profiling native extension can be disabled by setting `DD_PROFILING_NO_EXTENSION=true` when installing or running
+The profiling native extension can be disabled by setting `DD_PROFILING_NO_EXTENSION=true` when installing
 the gem. Setting `DD_PROFILING_NO_EXTENSION` at installation time skips compilation of the extension entirely.
 
 (If you're a customer and needed to use this, please tell us why on <https://github.com/DataDog/dd-trace-rb/issues/new>.)
 
-Currently the profiler can still "limp along" when the native extension is disabled, but the plan is to require it
-in future releases -- e.g. disabling the extension will disable profiling entirely.
+In past releases, it was possible for the profiler to run without the native extension, but that's no longer the case,
+and disabling the extension will disable profiling.
+
+## Who is this page for?
+
+This documentation is intended to be used by dd-trace-rb developers. Please see the `docs/` folder for user-level
+documentation.
 
 ## Must not block or break users that cannot use it
 
@@ -44,13 +49,15 @@ We avoid issues using a combination of:
 * Avoiding calling Ruby VM APIs after doing dynamic allocations
 * Wrapping dynamic allocations into Ruby GC-managed objects (using `TypedData_Wrap_Struct`), so that Ruby will manage
   their lifetime and call `free` when the GC-managed object is no longer being referenced
+* Using [`rb_protect` and similar APIs](https://silverhammermba.github.io/emberb/c/?#rescue) to run cleanup code on
+  exception cases
 
 Non-exhaustive list of APIs that cause exceptions to be raised:
 
-* `Check_TypedStruct`, `Check_Type`
+* `Check_TypedStruct`, `Check_Type`, `ENFORCE_TYPE`
 * `rb_funcall`
 * `rb_thread_call_without_gvl`, `rb_thread_call_without_gvl2`
-* [Numeric conversion APIs, e.g. `NUM2LONG`, `NUM2INT`, etc.](https://silverhammermba.github.io/emberb/c/?utm_source=pocket_mylist#translation)
+* [Numeric conversion APIs, e.g. `NUM2LONG`, `NUM2INT`, etc.](https://silverhammermba.github.io/emberb/c/?#translation)
 * Our `char_slice_from_ruby_string` helper
 
 ## Usage of private VM headers
@@ -65,6 +72,8 @@ Because these private header files are not included in regular Ruby installation
 
 Functions which make use of these headers are defined in the <private_vm_api_acccess.c> file.
 
+There is currently no way for disabling usage of the private MJIT header for Ruby 2.6+.
+
 **Important Note**: Our medium/long-term plan is to stop relying on all private Ruby headers, and instead request and
 contribute upstream changes so that they become official public VM APIs.
 
@@ -90,7 +99,6 @@ Thus, even though a regular Ruby installation does not include these files, we c
 ## Feature: Getting thread CPU-time clock_ids
 
 * **OS support**: Linux
-* **Ruby support**: 2.6+
 
 To enable CPU-time profiling, we use the `pthread_getcpuclockid(pthread_t thread, clockid_t *clockid)` C function to
 obtain a `clockid_t` that can then be used with the `Process.clock_gettime` method (or directly with the

data/ext/ddtrace_profiling_native_extension/clock_id.h

@@ -1,4 +1,24 @@
 #pragma once
 
-void self_test_clock_id();
+#include <stdbool.h>
+#include <time.h>
+
+// Contains the operating-system specific identifier needed to fetch CPU-time, and a flag to indicate if we failed to fetch it
+typedef struct thread_cpu_time_id {
+  bool valid;
+  clockid_t clock_id;
+} thread_cpu_time_id;
+
+// Contains the current cpu time, and a flag to indicate if we failed to fetch it
+typedef struct thread_cpu_time {
+  bool valid;
+  long result_ns;
+} thread_cpu_time;
+
+void self_test_clock_id(void);
+
+// TODO: Remove this after the OldStack profiler gets removed
 VALUE clock_id_for(VALUE self, VALUE thread);
+
+thread_cpu_time_id thread_cpu_time_id_for(VALUE thread);
+thread_cpu_time thread_cpu_time_for(thread_cpu_time_id time_id);

data/ext/ddtrace_profiling_native_extension/clock_id_from_pthread.c

@@ -9,18 +9,20 @@
 #include <errno.h>
 
 #include <ruby.h>
+#include "helpers.h"
 #include "private_vm_api_access.h"
 #include "clock_id.h"
 
 // Validate that our home-cooked pthread_id_for() matches pthread_self() for the current thread
-void self_test_clock_id() {
+void self_test_clock_id(void) {
   rb_nativethread_id_t expected_pthread_id = pthread_self();
   rb_nativethread_id_t actual_pthread_id = pthread_id_for(rb_thread_current());
 
   if (expected_pthread_id != actual_pthread_id) rb_raise(rb_eRuntimeError, "pthread_id_for() self-test failed");
 }
 
-VALUE clock_id_for(VALUE self, VALUE thread) {
+// TODO: Remove this after the OldStack profiler gets removed
+VALUE clock_id_for(DDTRACE_UNUSED VALUE _self, VALUE thread) {
   rb_nativethread_id_t thread_id = pthread_id_for(thread);
 
   clockid_t clock_id;
@@ -41,4 +43,31 @@ VALUE clock_id_for(VALUE self, VALUE thread) {
   }
 }
 
+thread_cpu_time_id thread_cpu_time_id_for(VALUE thread) {
+  rb_nativethread_id_t thread_id = pthread_id_for(thread);
+  clockid_t clock_id;
+
+  int error = pthread_getcpuclockid(thread_id, &clock_id);
+
+  if (error == 0) {
+    return (thread_cpu_time_id) {.valid = true, .clock_id = clock_id};
+  } else {
+    // TODO: Include the error code in some way in the output?
+    return (thread_cpu_time_id) {.valid = false};
+  }
+}
+
+thread_cpu_time thread_cpu_time_for(thread_cpu_time_id time_id) {
+  thread_cpu_time error = (thread_cpu_time) {.valid = false};
+
+  if (!time_id.valid) { return error; }
+
+  struct timespec current_cpu;
+
+  // TODO: Include the error code in some way in the output?
+  if (clock_gettime(time_id.clock_id, &current_cpu) != 0) return error;
+
+  return (thread_cpu_time) {.valid = true, .result_ns = current_cpu.tv_nsec + (current_cpu.tv_sec * 1000 * 1000 * 1000)};
+}
+
 #endif

data/ext/ddtrace_profiling_native_extension/clock_id_noop.c

@@ -7,8 +7,17 @@
 #include <ruby.h>
 
 #include "clock_id.h"
+#include "helpers.h"
 
-void self_test_clock_id() { } // Nothing to check
-VALUE clock_id_for(VALUE self, VALUE thread) { return Qnil; } // Nothing to return
+void self_test_clock_id(void) { } // Nothing to check
+VALUE clock_id_for(DDTRACE_UNUSED VALUE _self, DDTRACE_UNUSED VALUE _thread) { return Qnil; } // Nothing to return
+
+thread_cpu_time_id thread_cpu_time_id_for(DDTRACE_UNUSED VALUE _thread) {
+  return (thread_cpu_time_id) {.valid = false};
+}
+
+thread_cpu_time thread_cpu_time_for(DDTRACE_UNUSED thread_cpu_time_id _time_id) {
+  return (thread_cpu_time) {.valid = false};
+}
 
 #endif