Skip to content

Fix race condition with creating lightstep-reporting-thread #152

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix race condition with creating lightstep-reporting-thread #152

Show file tree
Hide file tree
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
44 changes: 27 additions & 17 deletions common/src/main/java/com/lightstep/tracer/shared/AbstractTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,30 +243,40 @@ private void doStopReporting() {
*/
private void maybeStartReporting() {
// We set both reporting/metrics thread in a single step.
if (reportingThread != null) {
return;
boolean buildFirstSpan = false;
synchronized (this) {
if (reportingThread != null) {
return;
}

reportingThread = new Thread(reportingLoop, LightStepConstants.Internal.REPORTING_THREAD_NAME);
reportingThread.setDaemon(true);
reportingThread.start();

if (metaEventLoggingEnabled && !firstReportHasRun) {
firstReportHasRun = true;
buildFirstSpan = true;
}

if (!disableMetricsReporting && safeMetrics != null) {
// Can be null, if running on jdk1.7
metricsThread = safeMetrics.createMetricsThread(componentName, auth.getAccessToken(),
serviceVersion, metricsUrl, LightStepConstants.Metrics.DEFAULT_INTERVAL_SECS);
if (metricsThread != null) {
metricsThread.setDaemon(true);
metricsThread.start();
}

}
}
if (metaEventLoggingEnabled && !firstReportHasRun) {

if (buildFirstSpan) {
buildSpan(LightStepConstants.MetaEvents.TracerCreateOperation)
.ignoreActiveSpan()
.withTag(LightStepConstants.MetaEvents.MetaEventKey, true)
.withTag(LightStepConstants.MetaEvents.TracerGuidKey, reporter.getReporterId())
.start()
.finish();
firstReportHasRun = true;
}
reportingThread = new Thread(reportingLoop, LightStepConstants.Internal.REPORTING_THREAD_NAME);
reportingThread.setDaemon(true);
reportingThread.start();

if (!disableMetricsReporting && safeMetrics != null) {
// Can be null, if running on jdk1.7
metricsThread = safeMetrics.createMetricsThread(componentName, auth.getAccessToken(),
serviceVersion, metricsUrl, LightStepConstants.Metrics.DEFAULT_INTERVAL_SECS);
if (metricsThread != null) {
metricsThread.setDaemon(true);
metricsThread.start();
}
}
}

Expand Down
4 changes: 1 addition & 3 deletions common/src/main/java/com/lightstep/tracer/shared/ClockState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,7 @@ long offsetMicros() {
* in the current offset.
*/
boolean isReady() {
synchronized (mutex) {
return samples.size() > 3;
}
return activeSampleCount() > 3;
}

int activeSampleCount() {
Expand Down