Skip to content

Return Profiler old interval from setInterval #2354

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

Merged
merged 6 commits into from
Oct 14, 2025
Merged

Return Profiler old interval from setInterval #2354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a25f04
return old interval
jackshirazi Oct 13, 2025
e44bd80
return old interval
jackshirazi Oct 13, 2025
7fe0164
return old interval
jackshirazi Oct 13, 2025
154f015
Merge branch 'open-telemetry:main' into profiler-old-interval
jackshirazi Oct 13, 2025
8f5f9e8
typo
jackshirazi Oct 13, 2025
0bb8ced
add @Nullable
jackshirazi Oct 13, 2025
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: 4 additions & 2 deletions inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpans.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ public static boolean isEnabled() {
*
* @param interval the new profiler interval
*/
public static void setProfilerInterval(Duration interval) {
@Nullable
public static Duration setProfilerInterval(Duration interval) {
InferredSpansProcessor p = instance;
if (p != null) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I prefer this flipped, but not a huge deal.

p.setProfilerInterval(interval);
return p.setProfilerInterval(interval);
}
return null;
}
}
5 changes: 3 additions & 2 deletions ...ed-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ public class InferredSpansProcessor implements SpanProcessor {
}
}

public void setProfilerInterval(Duration interval) {
config.setProfilerInterval(interval);
public Duration setProfilerInterval(Duration interval) {
Duration oldInterval = config.setProfilerInterval(interval);
profiler.reschedule();
return oldInterval;
}

public static InferredSpansProcessorBuilder builder() {
Expand Down
4 changes: 3 additions & 1 deletion ...main/java/io/opentelemetry/contrib/inferredspans/internal/InferredSpansConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,10 @@ public Duration getProfilingInterval() {
return profilerInterval;
}

public void setProfilerInterval(Duration profilerInterval) {
public Duration setProfilerInterval(Duration profilerInterval) {
Duration oldInterval = this.profilerInterval;
this.profilerInterval = profilerInterval;
return oldInterval;
}

public Duration getProfilingDuration() {
Expand Down