From 2d63c86eb186c5639a9c542eabfc247d34b4ed45 Mon Sep 17 00:00:00 2001 From: Anna Nosek Date: Fri, 22 Oct 2021 07:56:38 +0200 Subject: [PATCH] Add tests for Restlet Servlet extension (#4428) * test servlet * delete unused web.xml --- .../restlet-1.0/javaagent/build.gradle.kts | 3 + .../restlet/v1_0/RestletServerTest.groovy | 6 - .../restlet/v1_0/ServletServerTest.groovy | 14 ++ .../restlet/v1_0/RestletServerTest.groovy | 2 +- .../restlet-1.0/testing/build.gradle.kts | 6 + .../v1_0/AbstractServletServerTest.groovy | 110 ++++++++++++ .../restlet/v1_0/RestletAppTestBase.groovy | 129 +++++++++++++++ .../spring/AbstractSpringServerTest.groovy | 156 ------------------ .../resources/servlet-ext-app/WEB-INF/web.xml | 27 +++ .../main/resources/springBeanRouterConf.xml | 16 +- .../src/main/resources/springRouterConf.xml | 16 +- 11 files changed, 306 insertions(+), 179 deletions(-) create mode 100644 instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/ServletServerTest.groovy create mode 100644 instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/AbstractServletServerTest.groovy create mode 100644 instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/RestletAppTestBase.groovy create mode 100644 instrumentation/restlet/restlet-1.0/testing/src/main/resources/servlet-ext-app/WEB-INF/web.xml diff --git a/instrumentation/restlet/restlet-1.0/javaagent/build.gradle.kts b/instrumentation/restlet/restlet-1.0/javaagent/build.gradle.kts index 67c28aca77f0..220d274d8a2b 100644 --- a/instrumentation/restlet/restlet-1.0/javaagent/build.gradle.kts +++ b/instrumentation/restlet/restlet-1.0/javaagent/build.gradle.kts @@ -25,6 +25,9 @@ dependencies { implementation(project(":instrumentation:restlet:restlet-1.0:library")) testImplementation(project(":instrumentation:restlet:restlet-1.0:testing")) + testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent")) + testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) + testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent")) latestDepTestLibrary("org.restlet:org.restlet:1.1.+") latestDepTestLibrary("com.noelios.restlet:com.noelios.restlet:1.1.+") diff --git a/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/RestletServerTest.groovy b/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/RestletServerTest.groovy index 5a811b6ccdc9..580196a0ba92 100644 --- a/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/RestletServerTest.groovy +++ b/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/RestletServerTest.groovy @@ -7,13 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.restlet.v1_0 import io.opentelemetry.instrumentation.restlet.v1_0.AbstractRestletServerTest import io.opentelemetry.instrumentation.test.AgentTestTrait -import org.restlet.Restlet class RestletServerTest extends AbstractRestletServerTest implements AgentTestTrait { - @Override - Restlet wrapRestlet(Restlet restlet, String path){ - return restlet - } - } diff --git a/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/ServletServerTest.groovy b/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/ServletServerTest.groovy new file mode 100644 index 000000000000..d00f94b8bd57 --- /dev/null +++ b/instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/ServletServerTest.groovy @@ -0,0 +1,14 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.javaagent.instrumentation.restlet.v1_0 + + +import io.opentelemetry.instrumentation.restlet.v1_0.AbstractServletServerTest +import io.opentelemetry.instrumentation.test.AgentTestTrait + +class ServletServerTest extends AbstractServletServerTest implements AgentTestTrait { + +} diff --git a/instrumentation/restlet/restlet-1.0/library/src/test/groovy/io/opententelemetry/instrumentation/restlet/v1_0/RestletServerTest.groovy b/instrumentation/restlet/restlet-1.0/library/src/test/groovy/io/opententelemetry/instrumentation/restlet/v1_0/RestletServerTest.groovy index 695f3bfb7770..c783e6b87d7b 100644 --- a/instrumentation/restlet/restlet-1.0/library/src/test/groovy/io/opententelemetry/instrumentation/restlet/v1_0/RestletServerTest.groovy +++ b/instrumentation/restlet/restlet-1.0/library/src/test/groovy/io/opententelemetry/instrumentation/restlet/v1_0/RestletServerTest.groovy @@ -14,7 +14,7 @@ import org.restlet.Restlet class RestletServerTest extends AbstractRestletServerTest implements LibraryTestTrait { @Override - Restlet wrapRestlet(Restlet restlet, String path){ + Restlet wrapRestlet(Restlet restlet, String path) { RestletTracing tracing = RestletTracing.newBuilder(openTelemetry) .captureHttpHeaders(capturedHttpHeadersForTesting()) .build() diff --git a/instrumentation/restlet/restlet-1.0/testing/build.gradle.kts b/instrumentation/restlet/restlet-1.0/testing/build.gradle.kts index e7c420068b96..4d1166a60678 100644 --- a/instrumentation/restlet/restlet-1.0/testing/build.gradle.kts +++ b/instrumentation/restlet/restlet-1.0/testing/build.gradle.kts @@ -13,10 +13,16 @@ dependencies { implementation("org.restlet:org.restlet:1.1.5") implementation("com.noelios.restlet:com.noelios.restlet:1.1.5") + implementation("com.noelios.restlet:com.noelios.restlet.ext.servlet:1.1.5") implementation("org.restlet:org.restlet.ext.spring:1.1.5") implementation("org.springframework:spring:2.5.6") implementation("org.codehaus.groovy:groovy-all") implementation("io.opentelemetry:opentelemetry-api") implementation("org.spockframework:spock-core") + + val jettyVersion = "8.1.8.v20121106" + api("org.eclipse.jetty:jetty-annotations:$jettyVersion") + implementation("org.eclipse.jetty:jetty-server:$jettyVersion") + implementation("org.eclipse.jetty:jetty-servlet:$jettyVersion") } diff --git a/instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/AbstractServletServerTest.groovy b/instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/AbstractServletServerTest.groovy new file mode 100644 index 000000000000..c49a9e9b42f1 --- /dev/null +++ b/instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/AbstractServletServerTest.groovy @@ -0,0 +1,110 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.instrumentation.restlet.v1_0 + +import io.opentelemetry.api.common.AttributeKey +import io.opentelemetry.instrumentation.test.base.HttpServerTest +import io.opentelemetry.semconv.trace.attributes.SemanticAttributes +import org.eclipse.jetty.server.Server +import org.eclipse.jetty.util.resource.Resource +import org.eclipse.jetty.webapp.WebAppContext +import org.restlet.Application +import org.restlet.Restlet +import org.restlet.Router + +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.CAPTURE_HEADERS +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.ERROR +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.EXCEPTION +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.INDEXED_CHILD +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS + +abstract class AbstractServletServerTest extends HttpServerTest { + + @Override + Server startServer(int port) { + + def webAppContext = new WebAppContext() + webAppContext.setContextPath(getContextPath()) + + webAppContext.setBaseResource(Resource.newSystemResource("servlet-ext-app")) + + def jettyServer = new Server(port) + jettyServer.connectors.each { + it.setHost('localhost') + } + + jettyServer.setHandler(webAppContext) + jettyServer.start() + + return jettyServer + } + + @Override + List> extraAttributes() { + [ + SemanticAttributes.NET_TRANSPORT, + SemanticAttributes.HTTP_SERVER_NAME + ] + } + + @Override + void stopServer(Server server) { + server.stop() + server.destroy() + } + + @Override + boolean testException() { + false + } + + @Override + boolean testPathParam() { + true + } + + @Override + boolean testConcurrency() { + true + } + + @Override + String expectedServerSpanName(ServerEndpoint endpoint) { + switch (endpoint) { + case PATH_PARAM: + return getContextPath() + "/path/{id}/param" + case NOT_FOUND: + return getContextPath() + "/*" + default: + return endpoint.resolvePath(address).path + } + } + + + static class TestApp extends Application { + + @Override + Restlet createRoot() { + def router = new Router(getContext()) + + router.attach(SUCCESS.path, RestletAppTestBase.SuccessResource) + router.attach(REDIRECT.path, RestletAppTestBase.RedirectResource) + router.attach(ERROR.path, RestletAppTestBase.ErrorResource) + router.attach(EXCEPTION.path, RestletAppTestBase.ExceptionResource) + router.attach("/path/{id}/param", RestletAppTestBase.PathParamResource) + router.attach(QUERY_PARAM.path, RestletAppTestBase.QueryParamResource) + router.attach(CAPTURE_HEADERS.path, RestletAppTestBase.CaptureHeadersResource) + router.attach(INDEXED_CHILD.path, RestletAppTestBase.IndexedChildResource) + + return router + } + + } +} diff --git a/instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/RestletAppTestBase.groovy b/instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/RestletAppTestBase.groovy new file mode 100644 index 000000000000..1bcdbbb3e68a --- /dev/null +++ b/instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/RestletAppTestBase.groovy @@ -0,0 +1,129 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.instrumentation.restlet.v1_0 + +import org.restlet.Context +import org.restlet.data.Form +import org.restlet.data.MediaType +import org.restlet.data.Reference +import org.restlet.data.Request +import org.restlet.data.Response +import org.restlet.data.Status +import org.restlet.resource.Representation +import org.restlet.resource.Resource +import org.restlet.resource.StringRepresentation +import org.restlet.resource.Variant + +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.CAPTURE_HEADERS +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.ERROR +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.EXCEPTION +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.INDEXED_CHILD +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import static io.opentelemetry.instrumentation.test.base.HttpServerTest.controller + +class RestletAppTestBase { + + static abstract class BaseResource extends Resource { + + @Override + void init(Context context, Request request, Response response) { + super.init(context, request, response) + getVariants().add(new Variant(MediaType.TEXT_PLAIN)) + } + } + + static class SuccessResource extends BaseResource { + + @Override + Representation represent(Variant variant) { + controller(SUCCESS) { + return new StringRepresentation(SUCCESS.body) + } + } + } + + static class ErrorResource extends BaseResource { + + @Override + Representation represent(Variant variant) { + controller(ERROR) { + getResponse().setStatus(Status.valueOf(ERROR.getStatus()), ERROR.getBody()) + return new StringRepresentation(ERROR.body) + } + } + } + + static class ExceptionResource extends BaseResource { + + @Override + Representation represent(Variant variant) { + controller(EXCEPTION) { + throw new Exception(EXCEPTION.body) + } + } + } + + static class QueryParamResource extends BaseResource { + + @Override + Representation represent(Variant variant) { + controller(QUERY_PARAM) { + return new StringRepresentation(QUERY_PARAM.getBody()) + } + } + } + + static class PathParamResource extends BaseResource { + + @Override + Representation represent(Variant variant) { + controller(PATH_PARAM) { + return new StringRepresentation(PATH_PARAM.getBody()) + } + } + } + + static class RedirectResource extends BaseResource { + + @Override + Representation represent(Variant variant) { + controller(REDIRECT) { + response.setLocationRef(new Reference(REDIRECT.getBody())) + response.setStatus(Status.valueOf(REDIRECT.status)) + return new StringRepresentation(REDIRECT.getBody()) + } + } + } + + static class CaptureHeadersResource extends BaseResource { + + @Override + Representation represent(Variant variant) { + controller(CAPTURE_HEADERS) { + Form requestHeaders = request.getAttributes().get("org.restlet.http.headers") + Form responseHeaders = response.getAttributes().computeIfAbsent("org.restlet.http.headers", { new Form() }) + responseHeaders.add("X-Test-Response", requestHeaders.getValues("X-Test-Request")) + return new StringRepresentation(CAPTURE_HEADERS.getBody()) + } + } + } + + + static class IndexedChildResource extends BaseResource { + + @Override + Representation represent(Variant variant) { + controller(INDEXED_CHILD) { + INDEXED_CHILD.collectSpanAttributes { request.getOriginalRef().getQueryAsForm().getFirst(it).getValue() } + return new StringRepresentation(INDEXED_CHILD.getBody()) + } + } + } + +} diff --git a/instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/spring/AbstractSpringServerTest.groovy b/instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/spring/AbstractSpringServerTest.groovy index 38d5ae096523..a31f8d94931f 100644 --- a/instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/spring/AbstractSpringServerTest.groovy +++ b/instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/spring/AbstractSpringServerTest.groovy @@ -7,30 +7,10 @@ package io.opentelemetry.instrumentation.restlet.v1_0.spring import io.opentelemetry.instrumentation.restlet.v1_0.AbstractRestletServerTest import org.restlet.Component -import org.restlet.Context import org.restlet.Router import org.restlet.Server -import org.restlet.data.Form -import org.restlet.data.MediaType -import org.restlet.data.Reference -import org.restlet.data.Request -import org.restlet.data.Response -import org.restlet.data.Status -import org.restlet.resource.Representation -import org.restlet.resource.Resource -import org.restlet.resource.StringRepresentation -import org.restlet.resource.Variant import org.springframework.context.support.ClassPathXmlApplicationContext -import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.CAPTURE_HEADERS -import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.ERROR -import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.EXCEPTION -import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.INDEXED_CHILD -import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM -import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM -import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT -import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS - abstract class AbstractSpringServerTest extends AbstractRestletServerTest { Router router @@ -51,140 +31,4 @@ abstract class AbstractSpringServerTest extends AbstractRestletServerTest { host.attach(router) } - static class SuccessResource extends Resource { - - @Override - void init(Context context, Request request, Response response) { - super.init(context, request, response) - getVariants().add(new Variant(MediaType.TEXT_PLAIN)) - } - - @Override - Representation represent(Variant variant) { - controller(SUCCESS) { - return new StringRepresentation(SUCCESS.body) - } - } - } - - static class ErrorResource extends Resource { - - @Override - void init(Context context, Request request, Response response) { - super.init(context, request, response) - getVariants().add(new Variant(MediaType.TEXT_PLAIN)) - } - - @Override - Representation represent(Variant variant) { - controller(ERROR) { - getResponse().setStatus(Status.valueOf(ERROR.getStatus()), ERROR.getBody()) - return new StringRepresentation(ERROR.body) - } - } - } - - static class ExceptionResource extends Resource { - - @Override - void init(Context context, Request request, Response response) { - super.init(context, request, response) - getVariants().add(new Variant(MediaType.TEXT_PLAIN)) - } - - @Override - Representation represent(Variant variant) { - controller(ERROR) { - throw new Exception(EXCEPTION.body) - } - } - } - - static class QueryParamResource extends Resource { - - @Override - void init(Context context, Request request, Response response) { - super.init(context, request, response) - getVariants().add(new Variant(MediaType.TEXT_PLAIN)) - } - - @Override - Representation represent(Variant variant) { - controller(QUERY_PARAM) { - return new StringRepresentation(QUERY_PARAM.getBody()) - } - } - } - - static class PathParamResource extends Resource { - - @Override - void init(Context context, Request request, Response response) { - super.init(context, request, response) - getVariants().add(new Variant(MediaType.TEXT_PLAIN)) - } - - @Override - Representation represent(Variant variant) { - controller(PATH_PARAM) { - return new StringRepresentation(PATH_PARAM.getBody()) - } - } - } - - static class RedirectResource extends Resource { - - @Override - void init(Context context, Request request, Response response) { - super.init(context, request, response) - getVariants().add(new Variant(MediaType.TEXT_PLAIN)) - } - - @Override - Representation represent(Variant variant) { - controller(REDIRECT) { - response.setLocationRef(new Reference(REDIRECT.getBody())) - response.setStatus(Status.REDIRECTION_FOUND) - return new StringRepresentation(REDIRECT.getBody()) - } - } - } - - static class CaptureHeadersResource extends Resource { - @Override - void init(Context context, Request request, Response response) { - super.init(context, request, response) - getVariants().add(new Variant(MediaType.TEXT_PLAIN)) - } - - @Override - Representation represent(Variant variant) { - controller(CAPTURE_HEADERS) { - Form requestHeaders = request.getAttributes().get("org.restlet.http.headers") - Form responseHeaders = response.getAttributes().computeIfAbsent("org.restlet.http.headers", { new Form() }) - responseHeaders.add("X-Test-Response", requestHeaders.getValues("X-Test-Request")) - - return new StringRepresentation(CAPTURE_HEADERS.getBody()) - } - } - } - - static class IndexedChildResource extends Resource { - - @Override - void init(Context context, Request request, Response response) { - super.init(context, request, response) - getVariants().add(new Variant(MediaType.TEXT_PLAIN)) - } - - @Override - Representation represent(Variant variant) { - controller(INDEXED_CHILD) { - INDEXED_CHILD.collectSpanAttributes { request.getOriginalRef().getQueryAsForm().getFirst(it).getValue() } - return new StringRepresentation(INDEXED_CHILD.getBody()) - } - } - } - - } diff --git a/instrumentation/restlet/restlet-1.0/testing/src/main/resources/servlet-ext-app/WEB-INF/web.xml b/instrumentation/restlet/restlet-1.0/testing/src/main/resources/servlet-ext-app/WEB-INF/web.xml new file mode 100644 index 000000000000..e0c24070292e --- /dev/null +++ b/instrumentation/restlet/restlet-1.0/testing/src/main/resources/servlet-ext-app/WEB-INF/web.xml @@ -0,0 +1,27 @@ + + + + Restlet test + + + RestletServlet + com.noelios.restlet.ext.servlet.ServerServlet + + org.restlet.application + io.opentelemetry.instrumentation.restlet.v1_0.AbstractServletServerTest$TestApp + + + + + + RestletServlet + /* + + + \ No newline at end of file diff --git a/instrumentation/restlet/restlet-1.0/testing/src/main/resources/springBeanRouterConf.xml b/instrumentation/restlet/restlet-1.0/testing/src/main/resources/springBeanRouterConf.xml index 5831bdae1ca7..579c386f166b 100644 --- a/instrumentation/restlet/restlet-1.0/testing/src/main/resources/springBeanRouterConf.xml +++ b/instrumentation/restlet/restlet-1.0/testing/src/main/resources/springBeanRouterConf.xml @@ -10,20 +10,20 @@ + class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$SuccessResource"/> + class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$ErrorResource"/> + class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$ExceptionResource"/> + class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$QueryParamResource"/> + class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$PathParamResource"/> + class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$RedirectResource"/> + class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$CaptureHeadersResource"/> + class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$IndexedChildResource"/> \ No newline at end of file diff --git a/instrumentation/restlet/restlet-1.0/testing/src/main/resources/springRouterConf.xml b/instrumentation/restlet/restlet-1.0/testing/src/main/resources/springRouterConf.xml index 42c08f94617a..6807703cb0dd 100644 --- a/instrumentation/restlet/restlet-1.0/testing/src/main/resources/springRouterConf.xml +++ b/instrumentation/restlet/restlet-1.0/testing/src/main/resources/springRouterConf.xml @@ -12,21 +12,21 @@ + value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$SuccessResource"/> + value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$ErrorResource"/> + value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$ExceptionResource"/> + value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$QueryParamResource"/> + value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$PathParamResource"/> + value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$RedirectResource"/> + value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$CaptureHeadersResource"/> + value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$IndexedChildResource"/>