-
Notifications
You must be signed in to change notification settings - Fork 13
Use custom labels library for trace correlation with OTel eBPF profiler #211
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
6
commits into
main
Choose a base branch
from
elsa/custom-labels-for-trace-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
6 commits
Select commit
Hold shift + click to select a range
b19466b
workaround
dmehala 0ca941e
feat: write process storage
elsakeirouz 9dca183
feat: use custom labels to share trace & span ids
elsakeirouz 83920d2
fix: include customlabels in cmake deps
elsakeirouz 3f45b5d
fix: bazel build with customlabels
elsakeirouz 46dd99b
fix: init storage before telemetry init
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
include(FetchContent) | ||
|
||
FetchContent_Declare(customlabels | ||
GIT_REPOSITORY https://github.com/DataDog/custom-labels.git | ||
GIT_TAG elsa/add-process-storage | ||
) | ||
|
||
FetchContent_MakeAvailable(customlabels) | ||
|
||
add_library(customlabels SHARED | ||
${customlabels_SOURCE_DIR}/src/customlabels.c | ||
) | ||
|
||
if (CMAKE_SYSTEM_NAME STREQUAL "Linux") | ||
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") | ||
set(TLS_DIALECT desc) | ||
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") | ||
set(TLS_DIALECT gnu2) | ||
else() | ||
message(FATAL_ERROR "Only aarch64 and x86-64 are supported (found: ${CMAKE_SYSTEM_PROCESSOR})") | ||
endif() | ||
|
||
include(CheckCompilerFlag) | ||
check_compiler_flag(CXX "-ftls-dialect=${TLS_DIALECT}" TLS_DIALECT_OK) | ||
if (TLS_DIALECT_OK) | ||
target_compile_options(customlabels PRIVATE | ||
-g | ||
-fPIC | ||
-ftls-model=global-dynamic | ||
-mtls-dialect=${TLS_DIALECT} | ||
) | ||
endif() | ||
endif() | ||
|
||
target_include_directories(customlabels | ||
PUBLIC | ||
${customlabels_SOURCE_DIR}/src | ||
) |
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,12 @@ | ||
#pragma once | ||
|
||
namespace datadog { | ||
namespace tracing { | ||
|
||
// Based on the OTel Trace API | ||
// https://opentelemetry.io/docs/specs/otel/trace/api | ||
#define OTEL_TRACE_ID_IDENTIFIER "TraceId" | ||
#define OTEL_SPAN_ID_IDENTIFIER "SpanId" | ||
|
||
} // 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
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.
Reminder:
mtls
instead offtls