Skip to content

Commit fe263ed

Browse files
lauritlaurit
authored
Fix vaadin14 latest dep test (#7893)
Looks similar to what we had for vaadin 16 recently. Pinning https://www.npmjs.com/package/@types/node to 18.11.9
1 parent 7e187f7 commit fe263ed

File tree

7 files changed

+8198
-40
lines changed

7 files changed

+8198
-40
lines changed

‎instrumentation/vaadin-14.2/javaagent/src/vaadin14LatestTest/java/test/io/opentelemetry/javaagent/instrumentation/vaadin/Vaadin14LatestTest.java‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,58 @@
55

66
package test.io.opentelemetry.javaagent.instrumentation.vaadin;
77

8+
import static net.bytebuddy.matcher.ElementMatchers.named;
9+
810
import io.opentelemetry.javaagent.instrumentation.vaadin.AbstractVaadin14Test;
11+
import java.io.File;
12+
import java.lang.instrument.Instrumentation;
13+
import java.net.URISyntaxException;
14+
import net.bytebuddy.agent.ByteBuddyAgent;
15+
import net.bytebuddy.agent.builder.AgentBuilder;
16+
import net.bytebuddy.asm.Advice;
17+
import org.junit.jupiter.api.BeforeAll;
18+
import org.junit.jupiter.api.extension.ExtendWith;
19+
import org.mockito.junit.jupiter.MockitoExtension;
20+
21+
@ExtendWith(MockitoExtension.class)
22+
public class Vaadin14LatestTest extends AbstractVaadin14Test {
23+
24+
static class UpdatePackageAdvice {
25+
@Advice.OnMethodEnter(skipOn = Advice.OnDefaultValue.class)
26+
public static Object onEnter() {
27+
return null;
28+
}
29+
30+
@SuppressWarnings("UnusedVariable")
31+
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
32+
public static void methodExit(@Advice.Return(readOnly = false) boolean result) {
33+
result = false;
34+
}
35+
}
36+
37+
@BeforeAll
38+
@Override
39+
protected void setup() throws URISyntaxException {
40+
// Prevent vaadin from regenerating package.json & pnpm-lock.yaml
41+
// Vaadin adds a hash to package.json that includes path to node_modules directory, so it won't
42+
// be same on all computers. To avoid vaadin replacing our provided package.json we suppress the
43+
// package.json modification check.
44+
Instrumentation instrumentation = ByteBuddyAgent.install();
45+
new AgentBuilder.Default()
46+
.type(named("com.vaadin.flow.server.frontend.TaskUpdatePackages"))
47+
.transform(
48+
new AgentBuilder.Transformer.ForAdvice()
49+
.advice(
50+
named("updatePackageJsonDependencies"), UpdatePackageAdvice.class.getName()))
51+
.installOn(instrumentation);
52+
53+
super.setup();
54+
}
955

10-
public class Vaadin14LatestTest extends AbstractVaadin14Test {}
56+
@Override
57+
@SuppressWarnings("checkstyle:SystemOut")
58+
protected void prepareVaadinBaseDir(File baseDir) {
59+
copyResource("/pnpm/package.json", baseDir);
60+
copyResource("/pnpm/pnpm-lock.yaml", baseDir);
61+
}
62+
}

‎instrumentation/vaadin-14.2/javaagent/src/vaadin14LatestTest/resources/pnpm/package.json‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
{
2+
"name": "no-name",
3+
"license": "UNLICENSED",
4+
"dependencies": {
5+
"@polymer/iron-icon": "3.0.1",
6+
"@polymer/iron-list": "3.1.0",
7+
"@polymer/polymer": "3.2.0",
8+
"@vaadin/vaadin-accordion": "1.2.0",
9+
"@vaadin/vaadin-app-layout": "2.2.0",
10+
"@vaadin/vaadin-avatar": "1.0.4",
11+
"@vaadin/vaadin-button": "2.4.0",
12+
"@vaadin/vaadin-checkbox": "2.5.1",
13+
"@vaadin/vaadin-combo-box": "5.4.12",
14+
"@vaadin/vaadin-context-menu": "4.6.0",
15+
"@vaadin/vaadin-core-shrinkwrap": "14.9.6",
16+
"@vaadin/vaadin-custom-field": "1.3.1",
17+
"@vaadin/vaadin-date-picker": "4.4.5",
18+
"@vaadin/vaadin-date-time-picker": "1.4.0",
19+
"@vaadin/vaadin-details": "1.2.1",
20+
"@vaadin/vaadin-dialog": "2.6.0",
21+
"@vaadin/vaadin-form-layout": "2.3.0",
22+
"@vaadin/vaadin-grid": "5.9.7",
23+
"@vaadin/vaadin-icons": "4.3.2",
24+
"@vaadin/vaadin-item": "2.3.0",
25+
"@vaadin/vaadin-list-box": "1.4.0",
26+
"@vaadin/vaadin-login": "1.2.0",
27+
"@vaadin/vaadin-lumo-styles": "1.6.1",
28+
"@vaadin/vaadin-material-styles": "1.3.2",
29+
"@vaadin/vaadin-menu-bar": "1.3.0",
30+
"@vaadin/vaadin-messages": "1.0.2",
31+
"@vaadin/vaadin-notification": "1.6.2",
32+
"@vaadin/vaadin-ordered-layout": "1.4.0",
33+
"@vaadin/vaadin-progress-bar": "1.3.0",
34+
"@vaadin/vaadin-radio-button": "1.5.4",
35+
"@vaadin/vaadin-select": "2.4.4",
36+
"@vaadin/vaadin-split-layout": "4.3.1",
37+
"@vaadin/vaadin-tabs": "3.2.0",
38+
"@vaadin/vaadin-text-field": "2.9.2",
39+
"@vaadin/vaadin-time-picker": "2.4.0",
40+
"@vaadin/vaadin-upload": "4.4.3",
41+
"@webcomponents/webcomponentsjs": "^2.2.10",
42+
"construct-style-sheets-polyfill": "3.0.4",
43+
"lit-element": "2.5.1",
44+
"lit-html": "1.4.1"
45+
},
46+
"devDependencies": {
47+
"babel-loader": "8.2.2",
48+
"chokidar": "^3.5.0",
49+
"compression-webpack-plugin": "4.0.1",
50+
"copy-webpack-plugin": "5.1.2",
51+
"css-loader": "5.2.7",
52+
"extra-watch-webpack-plugin": "1.0.3",
53+
"extract-loader": "5.1.0",
54+
"file-loader": "6.1.0",
55+
"html-webpack-plugin": "4.5.2",
56+
"lit-css-loader": "0.0.4",
57+
"loader-utils": "2.0.4",
58+
"raw-loader": "3.1.0",
59+
"ts-loader": "8.0.12",
60+
"typescript": "4.0.3",
61+
"webpack": "4.42.0",
62+
"webpack-babel-multi-target-plugin": "2.5.0",
63+
"webpack-cli": "3.3.11",
64+
"webpack-dev-server": "3.11.0",
65+
"webpack-merge": "4.2.2"
66+
},
67+
"vaadin": {
68+
"dependencies": {
69+
"@polymer/iron-icon": "3.0.1",
70+
"@polymer/iron-list": "3.1.0",
71+
"@polymer/polymer": "3.2.0",
72+
"@vaadin/vaadin-accordion": "1.2.0",
73+
"@vaadin/vaadin-app-layout": "2.2.0",
74+
"@vaadin/vaadin-avatar": "1.0.4",
75+
"@vaadin/vaadin-button": "2.4.0",
76+
"@vaadin/vaadin-checkbox": "2.5.1",
77+
"@vaadin/vaadin-combo-box": "5.4.12",
78+
"@vaadin/vaadin-context-menu": "4.6.0",
79+
"@vaadin/vaadin-core-shrinkwrap": "14.9.6",
80+
"@vaadin/vaadin-custom-field": "1.3.1",
81+
"@vaadin/vaadin-date-picker": "4.4.5",
82+
"@vaadin/vaadin-date-time-picker": "1.4.0",
83+
"@vaadin/vaadin-details": "1.2.1",
84+
"@vaadin/vaadin-dialog": "2.6.0",
85+
"@vaadin/vaadin-form-layout": "2.3.0",
86+
"@vaadin/vaadin-grid": "5.9.7",
87+
"@vaadin/vaadin-icons": "4.3.2",
88+
"@vaadin/vaadin-item": "2.3.0",
89+
"@vaadin/vaadin-list-box": "1.4.0",
90+
"@vaadin/vaadin-login": "1.2.0",
91+
"@vaadin/vaadin-lumo-styles": "1.6.1",
92+
"@vaadin/vaadin-material-styles": "1.3.2",
93+
"@vaadin/vaadin-menu-bar": "1.3.0",
94+
"@vaadin/vaadin-messages": "1.0.2",
95+
"@vaadin/vaadin-notification": "1.6.2",
96+
"@vaadin/vaadin-ordered-layout": "1.4.0",
97+
"@vaadin/vaadin-progress-bar": "1.3.0",
98+
"@vaadin/vaadin-radio-button": "1.5.4",
99+
"@vaadin/vaadin-select": "2.4.4",
100+
"@vaadin/vaadin-split-layout": "4.3.1",
101+
"@vaadin/vaadin-tabs": "3.2.0",
102+
"@vaadin/vaadin-text-field": "2.9.2",
103+
"@vaadin/vaadin-time-picker": "2.4.0",
104+
"@vaadin/vaadin-upload": "4.4.3",
105+
"@webcomponents/webcomponentsjs": "^2.2.10",
106+
"construct-style-sheets-polyfill": "3.0.4",
107+
"lit-element": "2.5.1",
108+
"lit-html": "1.4.1"
109+
},
110+
"devDependencies": {
111+
"babel-loader": "8.2.2",
112+
"chokidar": "^3.5.0",
113+
"compression-webpack-plugin": "4.0.1",
114+
"copy-webpack-plugin": "5.1.2",
115+
"css-loader": "5.2.7",
116+
"extra-watch-webpack-plugin": "1.0.3",
117+
"extract-loader": "5.1.0",
118+
"file-loader": "6.1.0",
119+
"html-webpack-plugin": "4.5.2",
120+
"lit-css-loader": "0.0.4",
121+
"loader-utils": "2.0.4",
122+
"raw-loader": "3.1.0",
123+
"ts-loader": "8.0.12",
124+
"typescript": "4.0.3",
125+
"webpack": "4.42.0",
126+
"webpack-babel-multi-target-plugin": "2.5.0",
127+
"webpack-cli": "3.3.11",
128+
"webpack-dev-server": "3.11.0",
129+
"webpack-merge": "4.2.2"
130+
}
131+
}
132+
}

0 commit comments

Comments
 (0)