Skip to content

Commit

Permalink
attempt to fix flake
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <adrian@tetrate.io>
  • Loading branch information
Adrian Cole committed Feb 13, 2024
1 parent a9d9c42 commit 923259c
Showing 1 changed file with 13 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2013-2023 The OpenZipkin Authors
* Copyright 2013-2024 The OpenZipkin Authors
*
* Licensed 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
Expand All @@ -14,13 +14,19 @@
package brave.propagation;

import brave.Tracing;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import static brave.test.util.ClassLoaders.assertRunIsUnloadable;
import static org.junit.jupiter.api.Assertions.assertThrows;

class ThreadLocalSpanClassLoaderTest {

@BeforeEach void ensureNothingCurrent(){
Tracing current = Tracing.current();
if (current != null) current.close();
}

@Test void noop_unloadable() {
assertRunIsUnloadable(CurrentTracerUnassigned.class, getClass().getClassLoader());
}
Expand All @@ -32,13 +38,13 @@ static class CurrentTracerUnassigned implements Runnable {
}

@Test void currentTracer_basicUsage_unloadable() {
assertRunIsUnloadable(ExplicitTracerBasicUsage.class, getClass().getClassLoader());
assertRunIsUnloadable(CurrentTracerBasicUsage.class, getClass().getClassLoader());
}

static class ExplicitTracerBasicUsage implements Runnable {
static class CurrentTracerBasicUsage implements Runnable {
@Override public void run() {
try (Tracing tracing = Tracing.newBuilder().build()) {
ThreadLocalSpan tlSpan = ThreadLocalSpan.create(tracing.tracer());
ThreadLocalSpan tlSpan = ThreadLocalSpan.CURRENT_TRACER;

tlSpan.next();
tlSpan.remove().finish();
Expand All @@ -47,13 +53,13 @@ static class ExplicitTracerBasicUsage implements Runnable {
}

@Test void explicitTracer_basicUsage_unloadable() {
assertRunIsUnloadable(CurrentTracerBasicUsage.class, getClass().getClassLoader());
assertRunIsUnloadable(ExplicitTracerBasicUsage.class, getClass().getClassLoader());
}

static class CurrentTracerBasicUsage implements Runnable {
static class ExplicitTracerBasicUsage implements Runnable {
@Override public void run() {
try (Tracing tracing = Tracing.newBuilder().build()) {
ThreadLocalSpan tlSpan = ThreadLocalSpan.CURRENT_TRACER;
ThreadLocalSpan tlSpan = ThreadLocalSpan.create(tracing.tracer());

tlSpan.next();
tlSpan.remove().finish();
Expand Down

0 comments on commit 923259c

Please sign in to comment.