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

added context-free endSubsegment method to AWSXRay class #229

Merged
merged 2 commits into from
Nov 13, 2020
Merged

added context-free endSubsegment method to AWSXRay class #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2078f1
added context-free endSubsegment to AWSXRay class
Nov 3, 2020
76395db
Merge branch 'master' into end-sub-ctxless
willarmiros Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/AWSXRay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public static Segment beginSegment(String name, TraceID traceId, String parentId
}

/**
* @deprecated Use {@code AWSXray.getGlobalRecorder().beginNoOpSegment() }.
* @deprecated Use {@code AWSXRay.getGlobalRecorder().beginNoOpSegment() }.
*/
@Deprecated
public static Segment beginDummySegment() {
Expand All @@ -124,6 +124,10 @@ public static void endSubsegment() {
globalRecorder.endSubsegment();
}

public static void endSubsegment(@Nullable Subsegment subsegment) {
globalRecorder.endSubsegment(subsegment);
}

@Nullable
public String currentEntityId() {
return globalRecorder.currentEntityId();
Expand Down
5 changes: 3 additions & 2 deletions aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/AWSXRayRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,12 +562,13 @@ public void endSegment() {
}

/**
* Ends the provided subsegment. This method doesn't touch context storage.
* Ends the provided subsegment. This method doesn't touch context storage and should be used when ending custom subsegments
* in asynchronous methods or other threads.
*
* @param subsegment
* the subsegment to close.
*/
public void endSubsegment(Subsegment subsegment) {
public void endSubsegment(@Nullable Subsegment subsegment) {
if (subsegment == null) {
logger.debug("No input subsegment to end. No-op.");
return;
Expand Down