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

[1.2.x] Fix concurrent issue in observability #42962

Merged
merged 5 commits into from
Jun 26, 2024
Merged

[1.2.x] Fix concurrent issue in observability #42962

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83447fc
Fix concurrent issue in observability
NipunaMadhushan Jun 20, 2024
dee14f7
Address review suggestions
NipunaMadhushan Jun 24, 2024
8d28332
Address review suggestions
NipunaMadhushan Jun 24, 2024
d7e9965
Fix compilation error
NipunaMadhushan Jun 26, 2024
12c26d3
Fix compilation error
NipunaMadhushan Jun 26, 2024
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
12 changes: 9 additions & 3 deletions ...bserve/src/main/java/org/ballerinalang/observe/nativeimpl/OpenTracerBallerinaWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class OpenTracerBallerinaWrapper {
private static OpenTracerBallerinaWrapper instance = new OpenTracerBallerinaWrapper();
private TracersStore tracerStore;
private final boolean enabled;
private Map<Long, ObserverContext> observerContextList = new HashMap<>();
private ConcurrentMap<Long, ObserverContext> observerContextList = new ConcurrentHashMap<>();
private AtomicLong spanId = new AtomicLong();
private static final int SYSTEM_TRACE_INDICATOR = -1;

Expand Down Expand Up @@ -126,7 +126,10 @@ public boolean finishSpan(Strand strand, long spanId) {
if (!enabled) {
return false;
}
ObserverContext observerContext = observerContextList.get(spanId);
ObserverContext observerContext = null;
if (observerContextList.containsKey(spanId)) {
observerContext = observerContextList.get(spanId);
}
NipunaMadhushan marked this conversation as resolved.
Show resolved Hide resolved
if (observerContext != null) {
if (observerContext.isSystemSpan()) {
ObserveUtils.setObserverContextToCurrentFrame(strand, observerContext.getParent());
Expand All @@ -153,7 +156,10 @@ public boolean addTag(String tagKey, String tagValue, long spanId, Strand strand
if (!enabled) {
return false;
}
ObserverContext observerContext = observerContextList.get(spanId);
ObserverContext observerContext = null;
if (observerContextList.containsKey(spanId)) {
observerContext = observerContextList.get(spanId);
}
NipunaMadhushan marked this conversation as resolved.
Show resolved Hide resolved
if (spanId == -1) {
Optional<ObserverContext> observer = ObserveUtils.getObserverContextOfCurrentFrame(strand);
if (observer.isPresent()) {
Expand Down
Loading