Skip to content

Commit 5684000

Browse files
phipagphipag
committed
Remove mockito from powertools-tracing.
1 parent 4bca6e3 commit 5684000

File tree

3 files changed

+41
-128
lines changed

3 files changed

+41
-128
lines changed

‎powertools-tracing/pom.xml‎

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
-->
1515

1616
<project xmlns="http://maven.apache.org/POM/4.0.0"
17-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1919
<modelVersion>4.0.0</modelVersion>
2020

2121
<artifactId>powertools-tracing</artifactId>
@@ -87,8 +87,10 @@
8787
<scope>test</scope>
8888
</dependency>
8989
<dependency>
90-
<groupId>org.mockito</groupId>
91-
<artifactId>mockito-core</artifactId>
90+
<groupId>software.amazon.lambda</groupId>
91+
<artifactId>powertools-common</artifactId>
92+
<version>${project.version}</version>
93+
<type>test-jar</type>
9294
<scope>test</scope>
9395
</dependency>
9496
<dependency>
@@ -121,21 +123,15 @@
121123
<profiles>
122124
<profile>
123125
<id>generate-graalvm-files</id>
124-
<dependencies>
125-
<dependency>
126-
<groupId>org.mockito</groupId>
127-
<artifactId>mockito-subclass</artifactId>
128-
<scope>test</scope>
129-
</dependency>
130-
</dependencies>
131126
<build>
132127
<plugins>
133128
<plugin>
134129
<groupId>org.apache.maven.plugins</groupId>
135130
<artifactId>maven-surefire-plugin</artifactId>
136131
<version>3.5.3</version>
137132
<configuration>
138-
<argLine>-Dmockito.mock.maker=subclass -Dorg.graalvm.nativeimage.imagecode=agent -agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-tracing,experimental-class-define-support
133+
<argLine>-Dorg.graalvm.nativeimage.imagecode=agent
134+
-agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-tracing,experimental-class-define-support
139135
--add-opens java.base/java.util=ALL-UNNAMED
140136
--add-opens java.base/java.lang=ALL-UNNAMED
141137
</argLine>
@@ -146,13 +142,6 @@
146142
</profile>
147143
<profile>
148144
<id>graalvm-native</id>
149-
<dependencies>
150-
<dependency>
151-
<groupId>org.mockito</groupId>
152-
<artifactId>mockito-subclass</artifactId>
153-
<scope>test</scope>
154-
</dependency>
155-
</dependencies>
156145
<build>
157146
<plugins>
158147
<plugin>
@@ -177,30 +166,13 @@
177166
<buildArg>--enable-url-protocols=http</buildArg>
178167
<buildArg>--no-fallback</buildArg>
179168
<buildArg>-Dorg.graalvm.nativeimage.imagecode=agent</buildArg>
180-
<buildArg>-H:ClassInitialization=net.bytebuddy.ClassFileVersion:rerun</buildArg>
181-
<buildArg>-H:ClassInitialization=net.bytebuddy.utility.dispatcher.JavaDispatcher:rerun</buildArg>
182-
<buildArg>-H:ClassInitialization=net.bytebuddy.utility.Invoker$Dispatcher:rerun</buildArg>
183-
<buildArg>-H:ClassInitialization=net.bytebuddy.utility.GraalImageCode:rerun</buildArg>
184169
<buildArg>-H:IncludeResources=version.properties</buildArg>
185170
<buildArg>-H:IncludeResources=unreadable.properties</buildArg>
186171
<buildArg>--initialize-at-build-time=org.slf4j.simple.SimpleLogger</buildArg>
187172
<buildArg>--initialize-at-build-time=org.slf4j.LoggerFactory</buildArg>
188173
<buildArg>--initialize-at-build-time=org.junit.Ignore</buildArg>
189174
<buildArg>--initialize-at-build-time=java.lang.annotation.Annotation</buildArg>
190175
<buildArg>--initialize-at-build-time=org.junit.runners.model.FrameworkField</buildArg>
191-
<buildArg>--initialize-at-build-time=net.bytebuddy.description.type.TypeDescription$AbstractBase</buildArg>
192-
<buildArg>--initialize-at-build-time=net.bytebuddy.implementation.bind.annotation.Argument$BindingMechanic</buildArg>
193-
<buildArg>--initialize-at-build-time=net.bytebuddy.implementation.bind.annotation.Argument$BindingMechanic$1</buildArg>
194-
<buildArg>--initialize-at-build-time=net.bytebuddy.implementation.bind.annotation.Argument$BindingMechanic$2</buildArg>
195-
<buildArg>--initialize-at-build-time=net.bytebuddy.utility.dispatcher.JavaDispatcher$DynamicClassLoader</buildArg>
196-
<buildArg>--initialize-at-build-time=net.bytebuddy.description.method.MethodDescription$InDefinedShape$AbstractBase$ForLoadedExecutable</buildArg>
197-
<buildArg>--initialize-at-build-time=net.bytebuddy.description.type.TypeDescription$AbstractBase</buildArg>
198-
<buildArg>--initialize-at-build-time=net.bytebuddy.description.type.TypeDescription$ForLoadedType</buildArg>
199-
<buildArg>--initialize-at-build-time=net.bytebuddy.description.method.MethodDescription$ForLoadedMethod</buildArg>
200-
<buildArg>--initialize-at-build-time=net.bytebuddy.implementation.bind.annotation.Super$Instantiation$2</buildArg>
201-
<buildArg>
202-
--trace-class-initialization=net.bytebuddy.description.type.TypeDescription$ForLoadedType,net.bytebuddy.description.method.MethodDescription$ForLoadedMethod,net.bytebuddy.description.method.MethodDescription$InDefinedShape$AbstractBase$ForLoadedExecutable
203-
</buildArg>
204176
<buildArg>--verbose</buildArg>
205177
<buildArg>--native-image-info</buildArg>
206178
<buildArg>-H:+UnlockExperimentalVMOptions</buildArg>

‎powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/TracingUtilsTest.java‎

Lines changed: 15 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,15 @@
1616

1717
import static org.assertj.core.api.Assertions.assertThat;
1818
import static org.assertj.core.api.Assertions.entry;
19-
import static org.mockito.Mockito.mock;
20-
import static org.mockito.Mockito.verify;
2119
import static software.amazon.lambda.powertools.tracing.TracingUtils.withEntitySubsegment;
2220

23-
import com.amazonaws.services.lambda.runtime.Context;
24-
import com.amazonaws.xray.AWSXRay;
25-
import com.amazonaws.xray.entities.Entity;
2621
import org.junit.jupiter.api.AfterEach;
2722
import org.junit.jupiter.api.BeforeEach;
2823
import org.junit.jupiter.api.Test;
2924

25+
import com.amazonaws.xray.AWSXRay;
26+
import com.amazonaws.xray.entities.Entity;
27+
3028
class TracingUtilsTest {
3129
@BeforeEach
3230
void setUp() {
@@ -55,8 +53,7 @@ void shouldSetAnnotationOnCurrentSubSegment() {
5553
.contains(
5654
entry("stringKey", "val"),
5755
entry("numberKey", 10),
58-
entry("booleanKey", false)
59-
);
56+
entry("booleanKey", false));
6057
}
6158

6259
@Test
@@ -76,10 +73,8 @@ void shouldSetMetadataOnCurrentSubSegment() {
7673
assertThat(AWSXRay.getTraceEntity().getMetadata())
7774
.hasSize(1)
7875
.containsKey("service_undefined")
79-
.satisfies(map ->
80-
assertThat(map.get("service_undefined"))
81-
.containsEntry("key", "val")
82-
);
76+
.satisfies(map -> assertThat(map.get("service_undefined"))
77+
.containsEntry("key", "val"));
8378
}
8479

8580
@Test
@@ -92,21 +87,14 @@ void shouldNotSetMetaDataIfNoCurrentSubSegment() {
9287

9388
@Test
9489
void shouldInvokeCodeBlockWrappedWithinSubsegment() {
95-
Context test = mock(Context.class);
96-
97-
TracingUtils.withSubsegment("testSubSegment", subsegment ->
98-
{
90+
TracingUtils.withSubsegment("testSubSegment", subsegment -> {
9991
subsegment.putAnnotation("key", "val");
10092
subsegment.putMetadata("key", "val");
101-
test.getFunctionName();
10293
});
10394

104-
verify(test).getFunctionName();
105-
10695
assertThat(AWSXRay.getTraceEntity().getSubsegments())
10796
.hasSize(1)
108-
.allSatisfy(subsegment ->
109-
{
97+
.allSatisfy(subsegment -> {
11098
assertThat(subsegment.getName())
11199
.isEqualTo("## testSubSegment");
112100

@@ -142,21 +130,14 @@ void shouldAddAnnotationIfValidCharactersInKey() {
142130

143131
@Test
144132
void shouldInvokeCodeBlockWrappedWithinNamespacedSubsegment() {
145-
Context test = mock(Context.class);
146-
147-
TracingUtils.withSubsegment("testNamespace", "testSubSegment", subsegment ->
148-
{
133+
TracingUtils.withSubsegment("testNamespace", "testSubSegment", subsegment -> {
149134
subsegment.putAnnotation("key", "val");
150135
subsegment.putMetadata("key", "val");
151-
test.getFunctionName();
152136
});
153137

154-
verify(test).getFunctionName();
155-
156138
assertThat(AWSXRay.getTraceEntity().getSubsegments())
157139
.hasSize(1)
158-
.allSatisfy(subsegment ->
159-
{
140+
.allSatisfy(subsegment -> {
160141
assertThat(subsegment.getName())
161142
.isEqualTo("## testSubSegment");
162143

@@ -174,25 +155,18 @@ void shouldInvokeCodeBlockWrappedWithinNamespacedSubsegment() {
174155

175156
@Test
176157
void shouldInvokeCodeBlockWrappedWithinEntitySubsegment() throws InterruptedException {
177-
Context test = mock(Context.class);
178-
179158
Entity traceEntity = AWSXRay.getTraceEntity();
180159

181-
Thread thread = new Thread(() -> withEntitySubsegment("testSubSegment", traceEntity, subsegment ->
182-
{
160+
Thread thread = new Thread(() -> withEntitySubsegment("testSubSegment", traceEntity, subsegment -> {
183161
subsegment.putAnnotation("key", "val");
184-
test.getFunctionName();
185162
}));
186163

187164
thread.start();
188165
thread.join();
189166

190-
verify(test).getFunctionName();
191-
192167
assertThat(AWSXRay.getTraceEntity().getSubsegments())
193168
.hasSize(1)
194-
.allSatisfy(subsegment ->
195-
{
169+
.allSatisfy(subsegment -> {
196170
assertThat(subsegment.getName())
197171
.isEqualTo("## testSubSegment");
198172

@@ -207,26 +181,19 @@ void shouldInvokeCodeBlockWrappedWithinEntitySubsegment() throws InterruptedExce
207181

208182
@Test
209183
void shouldInvokeCodeBlockWrappedWithinNamespacedEntitySubsegment() throws InterruptedException {
210-
Context test = mock(Context.class);
211-
212184
Entity traceEntity = AWSXRay.getTraceEntity();
213185

214-
Thread thread =
215-
new Thread(() -> withEntitySubsegment("testNamespace", "testSubSegment", traceEntity, subsegment ->
216-
{
186+
Thread thread = new Thread(
187+
() -> withEntitySubsegment("testNamespace", "testSubSegment", traceEntity, subsegment -> {
217188
subsegment.putAnnotation("key", "val");
218-
test.getFunctionName();
219189
}));
220190

221191
thread.start();
222192
thread.join();
223193

224-
verify(test).getFunctionName();
225-
226194
assertThat(AWSXRay.getTraceEntity().getSubsegments())
227195
.hasSize(1)
228-
.allSatisfy(subsegment ->
229-
{
196+
.allSatisfy(subsegment -> {
230197
assertThat(subsegment.getName())
231198
.isEqualTo("## testSubSegment");
232199

0 commit comments

Comments
 (0)