-
Notifications
You must be signed in to change notification settings - Fork 440
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
Add resource and instrumentation library support for OStreamSpanExporter #906
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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 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 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 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 |
---|---|---|
|
@@ -99,6 +99,7 @@ class SpanDataLink | |
class SpanData final : public Recordable | ||
{ | ||
public: | ||
SpanData() : resource_{nullptr}, instrumentation_library_{nullptr} {} | ||
/** | ||
* Get the trace id for this span | ||
* @return the trace id for this span | ||
|
@@ -152,7 +153,37 @@ class SpanData final : public Recordable | |
* @returns the attributes associated with the resource configured for TracerProvider | ||
*/ | ||
|
||
const opentelemetry::sdk::resource::Resource &GetResource() const noexcept { return *resource_; } | ||
const opentelemetry::sdk::resource::Resource &GetResource() const noexcept | ||
{ | ||
if (resource_ == nullptr) | ||
{ | ||
// this shouldn't happen as TraceProvider provides default resources | ||
static opentelemetry::sdk::resource::Resource resource = | ||
opentelemetry::sdk::resource::Resource::GetEmpty(); | ||
return resource; | ||
} | ||
return *resource_; | ||
} | ||
|
||
/** | ||
* Get the attributes associated with the resource | ||
* @returns the attributes associated with the resource configured for TracerProvider | ||
*/ | ||
|
||
const opentelemetry::sdk::trace::InstrumentationLibrary &GetInstrumentationLibrary() | ||
const noexcept | ||
{ | ||
if (instrumentation_library_ == nullptr) | ||
{ | ||
// this shouldn't happen as Tracer ensures there is valid default instrumentation library. | ||
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. Ditto. |
||
static std::unique_ptr<opentelemetry::sdk::instrumentationlibrary::InstrumentationLibrary> | ||
instrumentation_library = | ||
opentelemetry::sdk::instrumentationlibrary::InstrumentationLibrary::Create( | ||
"unknown_service"); | ||
return *instrumentation_library; | ||
} | ||
return *instrumentation_library_; | ||
} | ||
|
||
/** | ||
* Get the start time for this span | ||
|
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.
Add assert here?
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.
Yes, that's one of the options. I just felt it's better to avoid asserting application if we can handle it gracefully. That also let us create unit-tests for ostream exporter ( which uses span-data) without depending on TracerProvider to pass the resources.