From 67aa8979a8d538639d2e68bc56753780db18731d Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Fri, 10 Dec 2021 05:53:21 +0200 Subject: [PATCH] Disable loading favicion.ico for vaadin 14 tests (#4856) --- .../ApplicationServiceInitListener.java | 20 +++++++++++++++++++ ...adin.flow.server.VaadinServiceInitListener | 1 + .../ApplicationServiceInitListener.java | 20 +++++++++++++++++++ ...adin.flow.server.VaadinServiceInitListener | 1 + .../test/vaadin/MainView.java | 0 .../test/vaadin/OtherView.java | 0 6 files changed, 42 insertions(+) create mode 100644 instrumentation/vaadin-14.2/javaagent/src/vaadin142Test/java/test/vaadin/ApplicationServiceInitListener.java create mode 100644 instrumentation/vaadin-14.2/javaagent/src/vaadin142Test/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener create mode 100644 instrumentation/vaadin-14.2/javaagent/src/vaadin14LatestTest/java/test/vaadin/ApplicationServiceInitListener.java create mode 100644 instrumentation/vaadin-14.2/javaagent/src/vaadin14LatestTest/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener rename instrumentation/vaadin-14.2/testing/src/main/{groovy => java}/test/vaadin/MainView.java (100%) rename instrumentation/vaadin-14.2/testing/src/main/{groovy => java}/test/vaadin/OtherView.java (100%) diff --git a/instrumentation/vaadin-14.2/javaagent/src/vaadin142Test/java/test/vaadin/ApplicationServiceInitListener.java b/instrumentation/vaadin-14.2/javaagent/src/vaadin142Test/java/test/vaadin/ApplicationServiceInitListener.java new file mode 100644 index 0000000000..6d29fbf47b --- /dev/null +++ b/instrumentation/vaadin-14.2/javaagent/src/vaadin142Test/java/test/vaadin/ApplicationServiceInitListener.java @@ -0,0 +1,20 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package test.vaadin; + +import com.vaadin.flow.server.ServiceInitEvent; +import com.vaadin.flow.server.VaadinServiceInitListener; + +public class ApplicationServiceInitListener implements VaadinServiceInitListener { + @Override + public void serviceInit(ServiceInitEvent event) { + event.addBootstrapListener( + response -> { + // ensure that there is no need to request favicon.ico + response.getDocument().head().append(""); + }); + } +} diff --git a/instrumentation/vaadin-14.2/javaagent/src/vaadin142Test/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener b/instrumentation/vaadin-14.2/javaagent/src/vaadin142Test/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener new file mode 100644 index 0000000000..202872d3ec --- /dev/null +++ b/instrumentation/vaadin-14.2/javaagent/src/vaadin142Test/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener @@ -0,0 +1 @@ +test.vaadin.ApplicationServiceInitListener \ No newline at end of file diff --git a/instrumentation/vaadin-14.2/javaagent/src/vaadin14LatestTest/java/test/vaadin/ApplicationServiceInitListener.java b/instrumentation/vaadin-14.2/javaagent/src/vaadin14LatestTest/java/test/vaadin/ApplicationServiceInitListener.java new file mode 100644 index 0000000000..6d29fbf47b --- /dev/null +++ b/instrumentation/vaadin-14.2/javaagent/src/vaadin14LatestTest/java/test/vaadin/ApplicationServiceInitListener.java @@ -0,0 +1,20 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package test.vaadin; + +import com.vaadin.flow.server.ServiceInitEvent; +import com.vaadin.flow.server.VaadinServiceInitListener; + +public class ApplicationServiceInitListener implements VaadinServiceInitListener { + @Override + public void serviceInit(ServiceInitEvent event) { + event.addBootstrapListener( + response -> { + // ensure that there is no need to request favicon.ico + response.getDocument().head().append(""); + }); + } +} diff --git a/instrumentation/vaadin-14.2/javaagent/src/vaadin14LatestTest/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener b/instrumentation/vaadin-14.2/javaagent/src/vaadin14LatestTest/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener new file mode 100644 index 0000000000..202872d3ec --- /dev/null +++ b/instrumentation/vaadin-14.2/javaagent/src/vaadin14LatestTest/resources/META-INF/services/com.vaadin.flow.server.VaadinServiceInitListener @@ -0,0 +1 @@ +test.vaadin.ApplicationServiceInitListener \ No newline at end of file diff --git a/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/MainView.java b/instrumentation/vaadin-14.2/testing/src/main/java/test/vaadin/MainView.java similarity index 100% rename from instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/MainView.java rename to instrumentation/vaadin-14.2/testing/src/main/java/test/vaadin/MainView.java diff --git a/instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/OtherView.java b/instrumentation/vaadin-14.2/testing/src/main/java/test/vaadin/OtherView.java similarity index 100% rename from instrumentation/vaadin-14.2/testing/src/main/groovy/test/vaadin/OtherView.java rename to instrumentation/vaadin-14.2/testing/src/main/java/test/vaadin/OtherView.java