Skip to content

Lazy load GlobalOpenTelemetry #120

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

Closed
gastaldi wants to merge 1 commit into from
Closed

Lazy load GlobalOpenTelemetry #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 18 additions & 8 deletions src/main/core-impl/java/com/mysql/cj/otel/OpenTelemetryHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ public class OpenTelemetryHandler implements TelemetryHandler {
otelApiAvaliable = false;
}
}
private OpenTelemetry openTelemetry = null;
private Tracer tracer = null;
private OpenTelemetry openTelemetry;
private Tracer tracer;
private WeakHashMap<TelemetrySpan, Span> spans = new WeakHashMap<>();
private List<Span> linkTargets = new ArrayList<>();

Expand All @@ -63,14 +63,11 @@ public OpenTelemetryHandler() {
if (!isOpenTelemetryApiAvailable()) {
throw ExceptionFactory.createException(Messages.getString("Connection.OtelApiNotFound"));
}

this.openTelemetry = GlobalOpenTelemetry.get();
this.tracer = this.openTelemetry.getTracer(Constants.CJ_NAME, Constants.CJ_VERSION);
}

@Override
public TelemetrySpan startSpan(TelemetrySpanName spanName, Object... args) {
SpanBuilder spanBuilder = this.tracer.spanBuilder(spanName.getName(args)).setSpanKind(SpanKind.CLIENT);
SpanBuilder spanBuilder = getTracer().spanBuilder(spanName.getName(args)).setSpanKind(SpanKind.CLIENT);
this.linkTargets.stream().map(Span::getSpanContext).forEach(spanBuilder::addLink);
Span otelSpan = spanBuilder.startSpan();
TelemetrySpan span = new OpenTelemetrySpan(otelSpan);
Expand All @@ -96,7 +93,20 @@ public void removeLinkTarget(TelemetrySpan span) {

@Override
public void propagateContext(BiConsumer<String, String> traceparentConsumer) {
this.openTelemetry.getPropagators().getTextMapPropagator().inject(Context.current(), traceparentConsumer, BiConsumer::accept);
getOpenTelemetry().getPropagators().getTextMapPropagator().inject(Context.current(), traceparentConsumer, BiConsumer::accept);
}

private OpenTelemetry getOpenTelemetry() {
if (this.openTelemetry == null) {
this.openTelemetry = GlobalOpenTelemetry.get();
}
return this.openTelemetry;
}

}
private Tracer getTracer() {
if (tracer == null) {
this.tracer = getOpenTelemetry().getTracer(Constants.CJ_NAME, Constants.CJ_VERSION);
}
return this.tracer;
}
}