-
Notifications
You must be signed in to change notification settings - Fork 13
Correlate traces to profiles with the OTel ebpf profiler #197
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.
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
Draft
elsakeirouz
wants to merge
7
commits into
main
Choose a base branch
from
elsa/trace-to-profile-corr
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
0473326
workaround
dmehala 9bfc79b
feat: expose process storage for trace to profile correlation
elsakeirouz 8e58d3d
feat: add data in tls for trace to profile correlation
elsakeirouz 3437a87
feat: add option to enable correlation
elsakeirouz 79473fc
feat: add tests for trace-to-profile correlation
elsakeirouz d4a8ef3
fix: init storage before telemetry init
elsakeirouz 290c749
feat: add some documentation
elsakeirouz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
#pragma once | ||
|
||
#include <datadog/trace_id.h> | ||
|
||
#include <array> | ||
#include <cstdint> | ||
|
||
// Global struct used to exposed thread-specific information. | ||
// https://github.com/elastic/apm/blob/149cd3e39a77a58002344270ed2ad35357bdd02d/specs/agents/universal-profiling-integration.md#thread-local-storage-layout | ||
|
||
namespace datadog { | ||
namespace tracing { | ||
struct __attribute__((packed)) TLSStorage { | ||
uint16_t layout_minor_version; | ||
uint8_t valid; | ||
uint8_t trace_present; | ||
uint8_t trace_flags; | ||
uint64_t trace_id_low; | ||
uint64_t trace_id_high; | ||
uint64_t span_id; | ||
uint64_t transaction_id; | ||
}; | ||
|
||
} // namespace tracing | ||
} // namespace datadog |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,7 @@ | |
#include <datadog/span_config.h> | ||
#include <datadog/string_view.h> | ||
#include <datadog/trace_segment.h> | ||
#include <datadog/tracer.h> | ||
|
||
#include <cassert> | ||
#include <string> | ||
|
@@ -40,6 +41,16 @@ Span::~Span() { | |
data_->duration = now - data_->start; | ||
} | ||
|
||
#ifdef __linux__ | ||
// When a span is finished, we must update the span_id to its parent's. | ||
if (elastic_apm_profiling_correlation_process_storage_v1 != nullptr && | ||
parent_id().has_value()) { | ||
elastic_apm_profiling_correlation_tls_v1->valid = 0; | ||
elastic_apm_profiling_correlation_tls_v1->span_id = parent_id().value(); | ||
elastic_apm_profiling_correlation_tls_v1->valid = 1; | ||
Comment on lines
+48
to
+50
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For future reference, if anyone's curious, I was reviewing this with @elsakeirouz and we noticed we're missing some synchronization here, per the spec:
|
||
} | ||
#endif | ||
|
||
trace_segment_->span_finished(); | ||
} | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This part could be conditioned to an expected $TLS_DIALECT set above