Skip to content

Commit 8aeffa5

Browse files
laurittrask
andauthored
Rename package.json to avoid dependabot alert (#8219)
This `package.json` contains outdated dependences, it is only used in a test. --------- Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
1 parent 856d521 commit 8aeffa5

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

instrumentation/vaadin-14.2/javaagent/src/vaadin16Test/java/io/opentelemetry/javaagent/instrumentation/vaadin/Vaadin16Test.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,19 @@
1313
import io.opentelemetry.sdk.testing.assertj.TracesAssert;
1414
import io.opentelemetry.sdk.trace.data.SpanData;
1515
import java.io.File;
16+
import java.nio.file.Path;
17+
import java.nio.file.Paths;
1618
import java.util.List;
1719

1820
public class Vaadin16Test extends AbstractVaadinTest {
1921

2022
@Override
2123
protected void prepareVaadinBaseDir(File baseDir) {
22-
copyResource("/pnpm/package.json", baseDir);
23-
copyResource("/pnpm/pnpm-lock.yaml", baseDir);
24+
Path basePath = Paths.get(baseDir.toURI());
25+
// underscore "_" prefix is used to hide these files from dependabot
26+
// (they are only used for tests ok for them to have outdated dependencies)
27+
copyClasspathResource("/pnpm/_package.json", basePath.resolve("package.json"));
28+
copyClasspathResource("/pnpm/_pnpm-lock.yaml", basePath.resolve("pnpm-lock.yaml"));
2429
}
2530

2631
@Override
File renamed without changes.
File renamed without changes.

instrumentation/vaadin-14.2/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/AbstractVaadinTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.net.URISyntaxException;
2424
import java.nio.file.Files;
2525
import java.nio.file.Path;
26-
import java.nio.file.Paths;
2726
import java.time.Duration;
2827
import java.util.HashMap;
2928
import java.util.List;
@@ -95,10 +94,7 @@ void cleanup() {
9594

9695
protected void prepareVaadinBaseDir(File baseDir) {}
9796

98-
protected static void copyResource(String resource, File destinationDirectory) {
99-
int lastSlash = resource.lastIndexOf('/');
100-
String fileName = lastSlash == -1 ? resource : resource.substring(lastSlash + 1);
101-
Path destination = Paths.get(destinationDirectory.toURI()).resolve(fileName);
97+
protected static void copyClasspathResource(String resource, Path destination) {
10298
if (!Files.exists(destination)) {
10399
try (InputStream inputStream = AbstractVaadinTest.class.getResourceAsStream(resource)) {
104100
Files.copy(inputStream, destination);

0 commit comments

Comments
 (0)