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

[🍒 7403] Fix unresolved field error when instrumenting Kafka 3.7 with Quarkus native #7421

Merged
merged 1 commit into from
Aug 13, 2024
Merged

[🍒 7403] Fix unresolved field error when instrumenting Kafka 3.7 with Quarkus native #7421

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
23 changes: 14 additions & 9 deletions ...tooling/src/main/java/datadog/trace/agent/tooling/context/FieldBackedContextInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import datadog.trace.agent.tooling.bytebuddy.memoize.MemoizedMatchers;
import datadog.trace.api.InstrumenterConfig;
import datadog.trace.api.Pair;
import datadog.trace.bootstrap.ContextStore;
import datadog.trace.bootstrap.FieldBackedContextAccessor;
import datadog.trace.bootstrap.FieldBackedContextStores;
Expand Down Expand Up @@ -70,7 +71,7 @@ public final class FieldBackedContextInjector implements AsmVisitorWrapper {
Type.getType(FieldBackedContextAccessor.class);

/** Keeps track of injection requests for the class being transformed by the current thread. */
static final ThreadLocal<BitSet> INJECTED_STORE_IDS = new ThreadLocal<>();
static final ThreadLocal<Pair<String, BitSet>> INJECTED_STORE_IDS = new ThreadLocal<>();

final boolean serialVersionUIDFieldInjection =
InstrumenterConfig.get().isSerialVersionUIDFieldInjection();
Expand Down Expand Up @@ -129,7 +130,7 @@ public void visit(

// keep track of all injection requests for the class currently being transformed
// because we need to switch between them in the generated getter/putter methods
int storeId = injectContextStore(keyClassName, contextClassName);
int storeId = injectContextStore(name, keyClassName, contextClassName);
storeFieldName = CONTEXT_STORE_ACCESS_PREFIX + storeId;

if (interfaces == null) {
Expand Down Expand Up @@ -484,26 +485,30 @@ private void invokeSuperPut(final MethodVisitor mv, final String superName) {
}

/** Requests injection of a context store for a key and context. */
static int injectContextStore(final String keyClassName, final String contextClassName) {
static int injectContextStore(
final String target, final String keyClassName, final String contextClassName) {
int storeId = getContextStoreId(keyClassName, contextClassName);

BitSet injectedStoreIds = INJECTED_STORE_IDS.get();
if (null == injectedStoreIds) {
injectedStoreIds = new BitSet();
// collect a new set of store ids every time we see a new target
Pair<String, BitSet> injectedStoreIds = INJECTED_STORE_IDS.get();
if (null == injectedStoreIds || !target.equals(injectedStoreIds.getLeft())) {
injectedStoreIds = Pair.of(target, new BitSet());
INJECTED_STORE_IDS.set(injectedStoreIds);
}
injectedStoreIds.set(storeId);
injectedStoreIds.getRight().set(storeId);

return storeId;
}

/** Returns all context store injection requests for the class being transformed. */
static BitSet getInjectedContextStores() {
BitSet injectedStoreIds = INJECTED_STORE_IDS.get();
Pair<String, BitSet> injectedStoreIds = INJECTED_STORE_IDS.get();
if (null != injectedStoreIds) {
INJECTED_STORE_IDS.remove();
return injectedStoreIds.getRight();
} else {
return null;
}
return injectedStoreIds;
}

private static final class SerialVersionUIDInjector
Expand Down
Loading