Skip to content

fix(span): fix otel support for spans #104

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 2 commits into from
Feb 6, 2024
Merged

fix(span): fix otel support for spans #104

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
b7e18f4
fix(span): fix otel support for spans
Umaaz Feb 5, 2024
08f9f83
fix(lint): fix lint issue
Umaaz Feb 5, 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
5 changes: 4 additions & 1 deletion agent/src/main/java/com/intergral/deep/agent/tracepoint/handler/Callback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public static void callBack(final List<String> bpIds,
.map(TracePointConfig::getId).collect(Collectors.joining(","));
final Closeable span;
if (!spans.isEmpty()) {
span = span(filename + lineNo, spans);
span = span(filename + "#" + lineNo, spans);
} else {
span = null;
}
Expand All @@ -158,6 +158,9 @@ private static ICallbackResult commonCallback(final List<String> tracepointIds,
final IFactory factory,
final CallbackHook callbackHook) {
if (tracepointIds.isEmpty()) {
if (callbackHook != null) {
callbackHook.close(Callback.PUSH_SERVICE);
}
return null;
}
final long[] lineStart = Utils.currentTimeNanos();
Expand Down
2 changes: 1 addition & 1 deletion agent/src/main/java/com/intergral/deep/agent/types/TracePointConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public class TracePointConfig {
public static final String COLLECT = "collect";

/**
* This type tells Deep to not collect any data and not to send the sanpshot.
* This type tells Deep to not collect any data and not to send the snapshot.
*/
public static final String NO_COLLECT = "no_collect";

Expand Down
18 changes: 7 additions & 11 deletions plugins/otel-plugin/src/main/java/com/intergral/deep/plugin/OtelPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ public ISpan createSpan(final String name) {
}

final Span span = deep.spanBuilder(name).setAttribute("deep", DeepVersion.VERSION).startSpan();
if (span == null) {
return null;
}

return new ISpan() {
@Override
public String name() {
Expand All @@ -104,25 +108,17 @@ public String name() {

@Override
public String traceId() {
if (span != null) {
return span.getSpanContext().getTraceId();
}
return null;
return span.getSpanContext().getTraceId();
}

@Override
public String spanId() {
if (span != null) {
return span.getSpanContext().getSpanId();
}
return null;
return span.getSpanContext().getSpanId();
}

@Override
public void addAttribute(final String key, final String value) {
if (span != null) {
span.setAttribute(key, value);
}
span.setAttribute(key, value);
}

@Override
Expand Down