Skip to content

Commit c9fa365

Browse files
authored
Migrate dd-trace-core groovy files to java part 4 (#11146)
# What Does This Do we migrate 3 tests: - CoreSpanBuilderTest - CoreTracerTest - DDSpanContextPropagationTagsTest # Motivation this is part of the effort to migrate groovy tests to Java/JUnit part1: #11053 part2: #11062 part3: #11085 # Additional Notes fix some still existing groovy tests regarding ServieNameCollector singleton. see [commit](fcfc49d) # Contributor Checklist - Format the title according to [the contribution guidelines](https://github.com/DataDog/dd-trace-java/blob/master/CONTRIBUTING.md#title-format) - Assign the `type:` and (`comp:` or `inst:`) labels in addition to [any other useful labels](https://github.com/DataDog/dd-trace-java/blob/master/CONTRIBUTING.md#labels) - Avoid using `close`, `fix`, or [any linking keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) when referencing an issue Use `solves` instead, and assign the PR [milestone](https://github.com/DataDog/dd-trace-java/milestones) to the issue - Update the [CODEOWNERS](https://github.com/DataDog/dd-trace-java/blob/master/.github/CODEOWNERS) file on source file addition, migration, or deletion - Update [public documentation](https://docs.datadoghq.com/tracing/trace_collection/library_config/java/) with any new configuration flags or behaviors Jira ticket: [PROJ-IDENT] ***Note:*** **Once your PR is ready to merge, add it to the merge queue by commenting `/merge`.** `/merge -c` cancels the queue request. `/merge -f --reason "reason"` skips all merge queue checks; please use this judiciously, as some checks do not run at the PR-level. For more information, see [this doc](https://datadoghq.atlassian.net/wiki/spaces/DEVX/pages/3121612126/MergeQueue). <!-- # Opening vs Drafting a PR: When opening a pull request, please open it as a draft to not auto assign reviewers before you feel the pull request is in a reviewable state. # Linking a JIRA ticket: Please link your JIRA ticket by adding its identifier between brackets (ex [PROJ-IDENT]) in the PR description, not the title. This requirement only applies to Datadog employees. --> Co-authored-by: jean-philippe.bempel <jean-philippe.bempel@datadoghq.com>
1 parent 4a446d1 commit c9fa365

9 files changed

Lines changed: 1431 additions & 1311 deletions

File tree

dd-trace-core/src/test/groovy/datadog/trace/core/CoreSpanBuilderTest.groovy

Lines changed: 0 additions & 507 deletions
This file was deleted.

dd-trace-core/src/test/groovy/datadog/trace/core/CoreTracerTest.groovy

Lines changed: 0 additions & 670 deletions
This file was deleted.

dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextPropagationTagsTest.groovy

Lines changed: 0 additions & 134 deletions
This file was deleted.

dd-trace-core/src/test/groovy/datadog/trace/core/taginterceptor/TagInterceptorTest.groovy

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,7 @@ class TagInterceptorTest extends DDCoreSpecification {
696696
}
697697

698698
void "when interceptServiceName extraServiceProvider is called"() {
699+
def origServiceNameCollector = ServiceNameCollector.INSTANCE
699700
setup:
700701
final extraServiceProvider = Mock(ServiceNameCollector)
701702
ServiceNameCollector.INSTANCE = extraServiceProvider
@@ -708,9 +709,13 @@ class TagInterceptorTest extends DDCoreSpecification {
708709

709710
then:
710711
1 * extraServiceProvider.addService("some-service")
712+
713+
cleanup:
714+
ServiceNameCollector.INSTANCE = origServiceNameCollector
711715
}
712716

713717
void "when interceptServletContext extraServiceProvider is called"() {
718+
def origServiceNameCollector = ServiceNameCollector.INSTANCE
714719
setup:
715720
final extraServiceProvider = Mock(ServiceNameCollector)
716721
ServiceNameCollector.INSTANCE = extraServiceProvider
@@ -724,6 +729,9 @@ class TagInterceptorTest extends DDCoreSpecification {
724729
then:
725730
1 * extraServiceProvider.addService(expected)
726731

732+
cleanup:
733+
ServiceNameCollector.INSTANCE = origServiceNameCollector
734+
727735
where:
728736
value | expected
729737
"/" | "root-servlet"
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package datadog.trace.core;
2+
3+
import datadog.trace.api.sampling.PrioritySampling;
4+
import datadog.trace.api.sampling.SamplingMechanism;
5+
import datadog.trace.common.sampling.PrioritySampler;
6+
import datadog.trace.common.sampling.Sampler;
7+
8+
public class ControllableSampler implements Sampler, PrioritySampler {
9+
protected int nextSamplingPriority = PrioritySampling.SAMPLER_KEEP;
10+
11+
@Override
12+
public <T extends CoreSpan<T>> void setSamplingPriority(T span) {
13+
span.setSamplingPriority(nextSamplingPriority, SamplingMechanism.DEFAULT);
14+
}
15+
16+
@Override
17+
public <T extends CoreSpan<T>> boolean sample(T span) {
18+
return true;
19+
}
20+
}

0 commit comments

Comments
 (0)