Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PROF-9163] Fix missing profiling code hotspots when using ddtrace+otel #3466

Merged
merged 2 commits into from
Feb 21, 2024
Merged

[PROF-9163] Fix missing profiling code hotspots when using ddtrace+otel #3466

merged 2 commits into from
Feb 21, 2024

Commits on Feb 20, 2024

  1. Fix "datadog/profiling/collectors/info.rb:62: warning: instance varia… 

    …ble @profiler_info not initialized"
    @ivoanjo
    ivoanjo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    cbee551 View commit details
    Browse the repository at this point in the history

  2. [PROF-9163] Fix missing profiling code hotspots when using ddtrace+otel 

    **What does this PR do?**

This PR fixes the profiler not sending code hotspots data when
ddtrace is being used with OpenTelemetry (e.g. [when following these
instructions](https://docs.datadoghq.com/tracing/trace_collection/custom_instrumentation/otel_instrumentation/ruby/)).

Note that in particular this only works in apps that use

```ruby
require 'datadog/opentelemetry'
```

**Motivation:**

Since in this mode, otel data goes through ddtrace, code hotspots
should be correctly supported. The only reason this didn't work is
that otel spans were handled slightly differently, and the
profiler was not correctly accounting for this.

**Additional Notes:**

N/A

**How to test the change?**

I've updated the `Rakefile` to run the profiler test suite with and
without opentelemetry, and added test coverage for this.

To test it manually, you can add `gem 'opentelemetry-sdk'` to your
Gemfile, and the specs will run.

Here's also a trivial app you can use for testing:

```ruby
require 'opentelemetry/sdk'
require 'datadog/opentelemetry'

OpenTelemetry::SDK.configure
MyAppTracer = OpenTelemetry.tracer_provider.tracer('otel-testing')
MyAppTracer.in_span("do_work") do |span|
  sleep 2
end
```
    @ivoanjo
    ivoanjo committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    7843f7c View commit details
    Browse the repository at this point in the history