Skip to content

Migrate dd-trace-core groovy files to java part 7 #11374

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

Open
jpbempel wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Migrate dd-trace-core groovy files to java part 7 #11374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2f76ad
Migrate dd-trace-core groovy files to java part 7
jpbempel May 13, 2026
083b60c
address Codex comment
jpbempel May 15, 2026
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
2 changes: 1 addition & 1 deletion dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ServiceDiscovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void writeTracerMetadata(Config config) {
}
}

private static String generateFileName() {
static String generateFileName() {
String suffix = RandomUtils.randomUUID().toString().substring(0, 8);
return "datadog-tracer-info-" + suffix;
}
Expand Down
5 changes: 2 additions & 3 deletions dd-trace-core/src/main/java/datadog/trace/core/taginterceptor/TagInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,7 @@ private boolean interceptSpanType(DDSpanContext span, Object value) {
return true;
}

private boolean interceptServiceName(
RuleFlags.Feature feature, DDSpanContext span, Object value) {
boolean interceptServiceName(RuleFlags.Feature feature, DDSpanContext span, Object value) {
if (ruleFlags.isEnabled(feature)) {
String serviceName = String.valueOf(value);
span.setServiceName(serviceName);
Expand Down Expand Up @@ -336,7 +335,7 @@ private boolean interceptSamplingPriority(DDSpanContext span, Object value) {
return false;
}

private boolean interceptServletContext(DDSpanContext span, Object value) {
boolean interceptServletContext(DDSpanContext span, Object value) {
// even though this tag is sometimes used to set the service name
// (which has the side effect of marking the span as eligible for metrics
// in the trace agent) we also want to store it in the tags no matter what,
Expand Down
2 changes: 1 addition & 1 deletion dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public static Pattern globToRegexPattern(String globPattern) {
return Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
}

private static String globToRegex(String globPattern) {
static String globToRegex(String globPattern) {
StringBuilder sb = new StringBuilder(64);
sb.append('^');
for (int i = 0; i < globPattern.length(); i++) {
Expand Down
295 changes: 0 additions & 295 deletions dd-trace-core/src/test/groovy/datadog/trace/core/baggage/BaggagePropagatorTest.groovy
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions ...race-core/src/test/groovy/datadog/trace/core/servicediscovery/ServiceDiscoveryTest.groovy
View file
Open in desktop

This file was deleted.

Loading