SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 3.1.x

Browse Source
This commit is contained in:
Marcin Grzejszczak
2021-05-25 13:18:21 +02:00
parent 2dd82624e5 30b17f7576
commit b591e0f474
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/internal/SleuthContextListener.java
View File

@@ -40,7 +40,7 @@ import org.springframework.context.event.SmartApplicationListener;
*/
public class SleuthContextListener implements SmartApplicationListener {
static final Map<BeanFactory, SleuthContextListener> CACHE = new ConcurrentHashMap<>();
static final Map<Integer, SleuthContextListener> CACHE = new ConcurrentHashMap<>();
private static final Log log = LogFactory.getLog(SleuthContextListener.class);
@@ -69,7 +69,7 @@ public class SleuthContextListener implements SmartApplicationListener {
if (bf instanceof ConfigurableApplicationContext) {
bf = ((ConfigurableApplicationContext) bf).getBeanFactory();
}
return CACHE.getOrDefault(bf, new SleuthContextListener());
return CACHE.getOrDefault(bf.hashCode(), new SleuthContextListener());
}
@Override
@@ -90,10 +90,10 @@ public class SleuthContextListener implements SmartApplicationListener {
if (context instanceof ConfigurableApplicationContext) {
beanFactory = ((ConfigurableApplicationContext) context).getBeanFactory();
}
SleuthContextListener listener = CACHE.getOrDefault(beanFactory, this);
SleuthContextListener listener = CACHE.getOrDefault(beanFactory.hashCode(), this);
listener.refreshed.compareAndSet(false, event instanceof ContextRefreshedEvent);
listener.closed.compareAndSet(false, event instanceof ContextClosedEvent);
CACHE.put(beanFactory, listener);
CACHE.put(beanFactory.hashCode(), listener);
}
}

2
tests/common/src/main/java/org/springframework/cloud/sleuth/internal/SleuthContextListenerAccessor.java
View File

@@ -27,7 +27,7 @@ public final class SleuthContextListenerAccessor {
}
public static void set(BeanFactory beanFactory, boolean refreshed) {
SleuthContextListener.CACHE.put(beanFactory,
SleuthContextListener.CACHE.put(beanFactory.hashCode(),
new SleuthContextListener(new AtomicBoolean(refreshed), new AtomicBoolean(false)));
}