-
Notifications
You must be signed in to change notification settings - Fork 472
Improve Parent Resolving in Opentelemetry tracing adding support for configure Batch Span Processor (BSP) #2561
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
Open
KalinduGandara
wants to merge
1
commit into
wso2:master
Choose a base branch
from
KalinduGandara:improve_otel
base: master
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.
Open
Changes from all commits
Commits
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
111 changes: 111 additions & 0 deletions
111
...pects/flow/statistics/tracing/opentelemetry/management/ParentSpanWrapperStackManager.java
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,111 @@ | ||
| /* | ||
| * Copyright (c) 2026, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. | ||
| * | ||
| * WSO2 Inc. licenses this file to you under the Apache License, | ||
| * Version 2.0 (the "License"); you may not use this file except | ||
| * in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.synapse.aspects.flow.statistics.tracing.opentelemetry.management; | ||
|
|
||
| import org.apache.synapse.MessageContext; | ||
| import org.apache.synapse.SynapseConstants; | ||
|
|
||
| import java.util.Stack; | ||
|
|
||
| /** | ||
| * Maintains a per-message stack of span wrapper IDs, tracking the chain of currently open spans so that the most | ||
| * recently started span can be resolved as the parent of the next one. | ||
| * <p> | ||
| * The stack is stored as a message context property ({@link SynapseConstants#PARENT_STACK_PROPERTY}) and is therefore | ||
| * carried along the message flow, and cloned when the message context is cloned. | ||
| */ | ||
| public final class ParentSpanWrapperStackManager { | ||
|
|
||
| private ParentSpanWrapperStackManager() {} | ||
|
|
||
| /** | ||
| * Pushes the given span wrapper ID onto the parent stack of the message, creating the stack if it does not | ||
| * exist yet. | ||
| * | ||
| * @param spanWrapperId ID of the span wrapper that has just been started. | ||
| * @param synCtx Message context that owns the stack. | ||
| */ | ||
| public static void push(String spanWrapperId, MessageContext synCtx) { | ||
| if (spanWrapperId == null || synCtx == null) { | ||
| return; | ||
| } | ||
| Stack<String> parentStack = getStack(synCtx); | ||
| if (parentStack == null) { | ||
| parentStack = new Stack<>(); | ||
| synCtx.setProperty(SynapseConstants.PARENT_STACK_PROPERTY, parentStack); | ||
| } | ||
| parentStack.push(spanWrapperId); | ||
| } | ||
|
|
||
| /** | ||
| * Pops the topmost span wrapper ID from the parent stack of the message, if a non-empty stack exists. | ||
| * | ||
| * @param synCtx Message context that owns the stack. | ||
| */ | ||
| public static void pop(MessageContext synCtx) { | ||
| if (synCtx == null) { | ||
| return; | ||
| } | ||
| Stack<String> parentStack = getStack(synCtx); | ||
| if (parentStack != null && !parentStack.isEmpty()) { | ||
| parentStack.pop(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns the span wrapper ID at the top of the parent stack without removing it. | ||
| * | ||
| * @param synCtx Message context that owns the stack. | ||
| * @return The current parent span wrapper ID, or {@code null} if there is no parent. | ||
| */ | ||
| public static String peekParentSpanWrapperId(MessageContext synCtx) { | ||
| if (synCtx == null) { | ||
| return null; | ||
| } | ||
| Stack<String> parentStack = getStack(synCtx); | ||
| if (parentStack != null && !parentStack.isEmpty()) { | ||
| return parentStack.peek(); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * Creates a copy of the given parent stack. Used when a message context is cloned, so that each branch | ||
| * maintains its own independent stack. | ||
| * | ||
| * @param parentStack Parent stack to copy. | ||
| * @return A new stack containing the same span wrapper IDs. | ||
| */ | ||
| public static Stack<String> copyOf(Stack<String> parentStack) { | ||
| Stack<String> clone = new Stack<>(); | ||
| if (parentStack != null){ | ||
| clone.addAll(parentStack); | ||
| } | ||
| return clone; | ||
| } | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
|
|
||
| @SuppressWarnings("unchecked") | ||
| private static Stack<String> getStack(MessageContext synCtx) { | ||
| Object parentStackObj = synCtx.getProperty(SynapseConstants.PARENT_STACK_PROPERTY); | ||
| if (parentStackObj instanceof Stack) { | ||
| return (Stack<String>) parentStackObj; | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
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
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.
Uh oh!
There was an error while loading. Please reload this page.