10000 Service naming: split by jee deployment by amarziali · Pull Request #8064 · DataDog/dd-trace-java · GitHub
[go: up one dir, main page]
Skip to content

Service naming: split by jee deployment #8064

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

Merged
merged 14 commits into from
Dec 12, 2024
Merged

Service naming: split by jee deployment #8064

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cac1c30
Service naming: split by jee deployment
amarziali Dec 2, 2024
47a72fc
Do not use invokedynamic
amarziali Dec 6, 2024
fe24e62
fix tests
amarziali Dec 6, 2024
e9c2536
collapse enter and local
amarziali Dec 9, 2024
a0b2e0e
Adjust service name for non legacy tracing
amarziali Dec 9, 2024
12df126
Add wildfly ejb test
amarziali Dec 9, 2024
5765d30
limit max java verson to 11 for wildfly 15
amarziali Dec 10, 2024
4b43be2
renaming
amarziali Dec 12, 2024
c2cb1c4
refactor according to the review
amarziali Dec 12, 2024
a40b4dc
remove helper
amarziali Dec 12, 2024
1bdfabf
avoid casting
amarziali Dec 12, 2024
20d93e3
review
amarziali Dec 12, 2024
0559bdb
revert lastindexof
amarziali Dec 12, 2024
933c7fa
enforce checks
amarziali Dec 12, 2024
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
Prev Previous commit
Next Next commit
renaming
  • Loading branch information
@amarziali
amarziali committed Dec 12, 2024
commit 4b43be2a72f3cb6bd2a9b6c71f550dbcc38b88b7
4 changes: 2 additions & 2 deletions ...dules/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package datadog.trace.instrumentation.jbossmodules;

import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
import static datadog.trace.instrumentation.jbossmodules.ModuleNameHelper.STRIPPER;
import static datadog.trace.instrumentation.jbossmodules.ModuleNameHelper.NAME_EXTRACTOR;
import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
Expand Down Expand Up @@ -163,7 +163,7 @@ public static void onExit(
public static class CaptureModuleNameAdvice {
@Advice.OnMethodExit(suppress = Throwable.class)
public static void afterConstruct(@Advice.This final Module module) {
ClassloaderServiceNames.addIfMissing(module.getClassLoader(), STRIPPER);
ClassloaderServiceNames.addIfMissing(module.getClassLoader(), NAME_EXTRACTOR);
}
}
}
2 changes: 1 addition & 1 deletion ...ss-modules/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleNameHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ private ModuleNameHelper() {}

private static final Pattern SUBDEPLOYMENT_MATCH =
Pattern.compile("deployment(?>.+\\.ear)?\\.(.+)\\.[j|w]ar");
public static final Function<ClassLoader, Supplier<String>> STRIPPER =
public static final Function<ClassLoader, Supplier<String>> NAME_EXTRACTOR =
classLoader -> {
final Matcher matcher =
SUBDEPLOYMENT_MATCH.matcher(
Expand Down
0