Skip to content
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

Jump to bottom

Avoid BlockHound NoSuchTypeException when context propagation dependency is unavailable #3337

Merged
merged 2 commits into from
Feb 3, 2023
Merged

Avoid BlockHound NoSuchTypeException when context propagation dependency is unavailable #3337

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdad83c
Avoid BlockHound NoSuchTypeException exception when context propagati…
pderop Jan 27, 2023
394be6f
Reduced impact of the PR.
pderop Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 16 additions & 3 deletions reactor-core/src/main/java/reactor/core/publisher/ContextPropagation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 VMware Inc. or its affiliates, All Rights Reserved.
* Copyright (c) 2022-2023 VMware Inc. or its affiliates, All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -53,9 +53,9 @@ final class ContextPropagation {
Function<Context, Context> contextCaptureFunction;
boolean contextPropagation;
try {
// The following line will throw a LinkageError (NoClassDefFoundError) in case context propagation is not available
ContextRegistry globalRegistry = ContextRegistry.getInstance();
contextCaptureFunction = target -> ContextSnapshot.captureAllUsing(PREDICATE_TRUE, globalRegistry)
.updateContext(target);
contextCaptureFunction = new ContextCaptureNoPredicate(globalRegistry);
contextPropagation = true;
}
catch (LinkageError t) {
Expand Down Expand Up @@ -280,4 +280,17 @@ public Context addToContext(Context originalContext) {
}
}
}

static final class ContextCaptureNoPredicate implements Function<Context, Context> {
final ContextRegistry globalRegistry;

ContextCaptureNoPredicate(ContextRegistry globalRegistry) {
this.globalRegistry = globalRegistry;
}
@Override
public Context apply(Context context) {
return ContextSnapshot.captureAllUsing(PREDICATE_TRUE, globalRegistry)
.updateContext(context);
}
}
}