Rename restlet-1.0 to restlet-1.1 (#6814)

instrumentation/restlet/restlet-1.0/javaagent/build.gradle.kts → instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts

@@ -6,7 +6,6 @@ muzzle {
   pass {
     group.set("org.restlet")
     module.set("org.restlet")
-    // TODO: rename this module to restlet-1.1
     versions.set("[1.1.0, 1.2-M1)")
     extraDependency("com.noelios.restlet:com.noelios.restlet")
     assertInverse.set(true)
@@ -20,14 +19,14 @@ repositories {
 }
 
 dependencies {
-  api(project(":instrumentation:restlet:restlet-1.0:library"))
   bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
 
+  implementation(project(":instrumentation:restlet:restlet-1.1:library"))
+
   library("org.restlet:org.restlet:1.1.5")
   library("com.noelios.restlet:com.noelios.restlet:1.1.5")
 
-  implementation(project(":instrumentation:restlet:restlet-1.0:library"))
-  testImplementation(project(":instrumentation:restlet:restlet-1.0:testing"))
+  testImplementation(project(":instrumentation:restlet:restlet-1.1: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"))

instrumentation/restlet/restlet-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/RestletInstrumentationModule.java → instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/RestletInstrumentationModule.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.restlet.v1_0;
+package io.opentelemetry.javaagent.instrumentation.restlet.v1_1;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
@@ -15,7 +15,7 @@ import java.util.List;
 public class RestletInstrumentationModule extends InstrumentationModule {
 
   public RestletInstrumentationModule() {
-    super("restlet", "restlet-1.0");
+    super("restlet", "restlet-1.1");
   }
 
   @Override

instrumentation/restlet/restlet-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/RestletSingletons.java → instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/RestletSingletons.java

@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.restlet.v1_0;
+package io.opentelemetry.javaagent.instrumentation.restlet.v1_1;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteGetter;
-import io.opentelemetry.instrumentation.restlet.v1_0.RestletTelemetry;
+import io.opentelemetry.instrumentation.restlet.v1_1.RestletTelemetry;
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
 import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;
 import org.restlet.data.Request;

instrumentation/restlet/restlet-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/RouteInstrumentation.java → instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/RouteInstrumentation.java

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.restlet.v1_0;
+package io.opentelemetry.javaagent.instrumentation.restlet.v1_1;
 
 import static io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteSource.CONTROLLER;
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
-import static io.opentelemetry.javaagent.instrumentation.restlet.v1_0.RestletSingletons.serverSpanName;
+import static io.opentelemetry.javaagent.instrumentation.restlet.v1_1.RestletSingletons.serverSpanName;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;

instrumentation/restlet/restlet-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/ServerInstrumentation.java → instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/ServerInstrumentation.java

@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.restlet.v1_0;
+package io.opentelemetry.javaagent.instrumentation.restlet.v1_1;
 
 import static io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteSource.CONTROLLER;
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
-import static io.opentelemetry.javaagent.instrumentation.restlet.v1_0.RestletSingletons.instrumenter;
-import static io.opentelemetry.javaagent.instrumentation.restlet.v1_0.RestletSingletons.serverSpanName;
+import static io.opentelemetry.javaagent.instrumentation.restlet.v1_1.RestletSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.restlet.v1_1.RestletSingletons.serverSpanName;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;

instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/RestletServerTest.groovy → instrumentation/restlet/restlet-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/RestletServerTest.groovy

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.restlet.v1_0
+package io.opentelemetry.javaagent.instrumentation.restlet.v1_1
 
-import io.opentelemetry.instrumentation.restlet.v1_0.AbstractRestletServerTest
+import io.opentelemetry.instrumentation.restlet.v1_1.AbstractRestletServerTest
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 
 class RestletServerTest extends AbstractRestletServerTest implements AgentTestTrait {

instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/ServletServerTest.groovy → instrumentation/restlet/restlet-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/ServletServerTest.groovy

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.restlet.v1_0
+package io.opentelemetry.javaagent.instrumentation.restlet.v1_1
 
 
-import io.opentelemetry.instrumentation.restlet.v1_0.AbstractServletServerTest
+import io.opentelemetry.instrumentation.restlet.v1_1.AbstractServletServerTest
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 
 class ServletServerTest extends AbstractServletServerTest implements AgentTestTrait {

instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/spring/SpringBeanRouterTest.groovy → instrumentation/restlet/restlet-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/spring/SpringBeanRouterTest.groovy

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.restlet.v1_0.spring
+package io.opentelemetry.javaagent.instrumentation.restlet.v1_1.spring
 
-import io.opentelemetry.instrumentation.restlet.v1_0.spring.AbstractSpringServerTest
+import io.opentelemetry.instrumentation.restlet.v1_1.spring.AbstractSpringServerTest
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 
 class SpringBeanRouterTest extends AbstractSpringServerTest implements AgentTestTrait {

instrumentation/restlet/restlet-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/spring/SpringRouterTest.groovy → instrumentation/restlet/restlet-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/spring/SpringRouterTest.groovy

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.restlet.v1_0.spring
+package io.opentelemetry.javaagent.instrumentation.restlet.v1_1.spring
 
-import io.opentelemetry.instrumentation.restlet.v1_0.spring.AbstractSpringServerTest
+import io.opentelemetry.instrumentation.restlet.v1_1.spring.AbstractSpringServerTest
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 
 class SpringRouterTest extends AbstractSpringServerTest implements AgentTestTrait {

instrumentation/restlet/restlet-1.0/library/build.gradle.kts → instrumentation/restlet/restlet-1.1/library/build.gradle.kts

@@ -13,5 +13,5 @@ dependencies {
   library("org.restlet:org.restlet:1.1.5")
   library("com.noelios.restlet:com.noelios.restlet:1.1.5")
 
-  testImplementation(project(":instrumentation:restlet:restlet-1.0:testing"))
+  testImplementation(project(":instrumentation:restlet:restlet-1.1:testing"))
 }

instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletHeadersGetter.java → instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletHeadersGetter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.restlet.v1_0;
+package io.opentelemetry.instrumentation.restlet.v1_1;
 
 import io.opentelemetry.context.propagation.TextMapGetter;
 import java.util.Locale;

instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletHttpAttributesGetter.java → instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletHttpAttributesGetter.java

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.restlet.v1_0;
+package io.opentelemetry.instrumentation.restlet.v1_1;
 
-import static io.opentelemetry.instrumentation.restlet.v1_0.RestletHeadersGetter.getHeaders;
+import static io.opentelemetry.instrumentation.restlet.v1_1.RestletHeadersGetter.getHeaders;
 
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerAttributesGetter;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;

instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletNetAttributesGetter.java → instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletNetAttributesGetter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.restlet.v1_0;
+package io.opentelemetry.instrumentation.restlet.v1_1;
 
 import com.noelios.restlet.http.HttpCall;
 import com.noelios.restlet.http.HttpRequest;

instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletTelemetry.java → instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetry.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.restlet.v1_0;
+package io.opentelemetry.instrumentation.restlet.v1_1;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;

instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletTelemetryBuilder.java → instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.restlet.v1_0;
+package io.opentelemetry.instrumentation.restlet.v1_1;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.OpenTelemetry;
@@ -23,7 +23,7 @@ import org.restlet.data.Response;
 /** A builder of {@link RestletTelemetry}. */
 public final class RestletTelemetryBuilder {
 
-  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.restlet-1.0";
+  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.restlet-1.1";
 
   private final OpenTelemetry openTelemetry;
   private final List<AttributesExtractor<Request, Response>> additionalExtractors =

instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/TracingFilter.java → instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/TracingFilter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.restlet.v1_0;
+package io.opentelemetry.instrumentation.restlet.v1_1;
 
 import static io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteSource.CONTROLLER;
 

instrumentation/restlet/restlet-1.0/library/src/test/groovy/io/opententelemetry/instrumentation/restlet/v1_0/RestletServerTest.groovy → instrumentation/restlet/restlet-1.1/library/src/test/groovy/io/opententelemetry/instrumentation/restlet/v1_1/RestletServerTest.groovy

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opententelemetry.instrumentation.restlet.v1_0
+package io.opententelemetry.instrumentation.restlet.v1_1
 
 import com.noelios.restlet.StatusFilter
-import io.opentelemetry.instrumentation.restlet.v1_0.AbstractRestletServerTest
-import io.opentelemetry.instrumentation.restlet.v1_0.RestletTelemetry
+import io.opentelemetry.instrumentation.restlet.v1_1.AbstractRestletServerTest
+import io.opentelemetry.instrumentation.restlet.v1_1.RestletTelemetry
 import io.opentelemetry.instrumentation.test.LibraryTestTrait
 import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest
 import org.restlet.Restlet

instrumentation/restlet/restlet-1.0/library/src/test/groovy/io/opententelemetry/instrumentation/restlet/v1_0/spring/AbstractSpringServerLibraryTest.groovy → instrumentation/restlet/restlet-1.1/library/src/test/groovy/io/opententelemetry/instrumentation/restlet/v1_1/spring/AbstractSpringServerLibraryTest.groovy

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opententelemetry.instrumentation.restlet.v1_0.spring
+package io.opententelemetry.instrumentation.restlet.v1_1.spring
 
 import com.noelios.restlet.StatusFilter
-import io.opentelemetry.instrumentation.restlet.v1_0.RestletTelemetry
-import io.opentelemetry.instrumentation.restlet.v1_0.spring.AbstractSpringServerTest
+import io.opentelemetry.instrumentation.restlet.v1_1.RestletTelemetry
+import io.opentelemetry.instrumentation.restlet.v1_1.spring.AbstractSpringServerTest
 import io.opentelemetry.instrumentation.test.LibraryTestTrait
 import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest
 import org.restlet.Restlet

instrumentation/restlet/restlet-1.0/library/src/test/groovy/io/opententelemetry/instrumentation/restlet/v1_0/spring/SpringBeanRouterTest.groovy → instrumentation/restlet/restlet-1.1/library/src/test/groovy/io/opententelemetry/instrumentation/restlet/v1_1/spring/SpringBeanRouterTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opententelemetry.instrumentation.restlet.v1_0.spring
+package io.opententelemetry.instrumentation.restlet.v1_1.spring
 
 class SpringBeanRouterTest extends AbstractSpringServerLibraryTest {
   @Override

instrumentation/restlet/restlet-1.0/library/src/test/groovy/io/opententelemetry/instrumentation/restlet/v1_0/spring/SpringRouterTest.groovy → instrumentation/restlet/restlet-1.1/library/src/test/groovy/io/opententelemetry/instrumentation/restlet/v1_1/spring/SpringRouterTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opententelemetry.instrumentation.restlet.v1_0.spring
+package io.opententelemetry.instrumentation.restlet.v1_1.spring
 
 class SpringRouterTest extends AbstractSpringServerLibraryTest {
 

instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/AbstractRestletServerTest.groovy → instrumentation/restlet/restlet-1.1/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_1/AbstractRestletServerTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.restlet.v1_0
+package io.opentelemetry.instrumentation.restlet.v1_1
 
 
 import io.opentelemetry.instrumentation.test.base.HttpServerTest

instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/AbstractServletServerTest.groovy → instrumentation/restlet/restlet-1.1/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_1/AbstractServletServerTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.restlet.v1_0
+package io.opentelemetry.instrumentation.restlet.v1_1
 
 
 import io.opentelemetry.instrumentation.test.base.HttpServerTest

instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/RestletAppTestBase.groovy → instrumentation/restlet/restlet-1.1/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_1/RestletAppTestBase.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.restlet.v1_0
+package io.opentelemetry.instrumentation.restlet.v1_1
 
 import org.restlet.Context
 import org.restlet.data.Form

instrumentation/restlet/restlet-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_0/spring/AbstractSpringServerTest.groovy → instrumentation/restlet/restlet-1.1/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_1/spring/AbstractSpringServerTest.groovy

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.restlet.v1_0.spring
+package io.opentelemetry.instrumentation.restlet.v1_1.spring
 
-import io.opentelemetry.instrumentation.restlet.v1_0.AbstractRestletServerTest
+import io.opentelemetry.instrumentation.restlet.v1_1.AbstractRestletServerTest
 import org.restlet.Component
 import org.restlet.Router
 import org.restlet.Server

instrumentation/restlet/restlet-1.0/testing/src/main/resources/servlet-ext-app/WEB-INF/web.xml → instrumentation/restlet/restlet-1.1/testing/src/main/resources/servlet-ext-app/WEB-INF/web.xml

@@ -14,7 +14,7 @@
     <servlet-class>com.noelios.restlet.ext.servlet.ServerServlet</servlet-class>
     <init-param>
       <param-name>org.restlet.application</param-name>
-      <param-value>io.opentelemetry.instrumentation.restlet.v1_0.AbstractServletServerTest$TestApp
+      <param-value>io.opentelemetry.instrumentation.restlet.v1_1.AbstractServletServerTest$TestApp
       </param-value>
     </init-param>
   </servlet>

instrumentation/restlet/restlet-1.0/testing/src/main/resources/springBeanRouterConf.xml → instrumentation/restlet/restlet-1.1/testing/src/main/resources/springBeanRouterConf.xml

@@ -10,20 +10,20 @@
   <bean name="testRouter" class="org.restlet.ext.spring.SpringBeanRouter"/>
 
   <bean name="/success" scope="prototype" id="successResource"
-    class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$SuccessResource"/>
+    class="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$SuccessResource"/>
   <bean name="/error-status" scope="prototype" id="errorResource"
-    class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$ErrorResource"/>
+    class="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$ErrorResource"/>
   <bean name="/exception" scope="prototype" id="exceptionResource"
-    class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$ExceptionResource"/>
+    class="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$ExceptionResource"/>
   <bean name="/query" scope="prototype" id="queryParamResource"
-    class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$QueryParamResource"/>
+    class="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$QueryParamResource"/>
   <bean name="/path/{id}/param" scope="prototype" id="pathParamResource"
-    class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$PathParamResource"/>
+    class="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$PathParamResource"/>
   <bean name="/redirect" scope="prototype" id="redirectResource"
-    class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$RedirectResource"/>
+    class="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$RedirectResource"/>
   <bean name="/captureHeaders" scope="prototype" id="captureHeadersResource"
-    class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$CaptureHeadersResource"/>
+    class="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$CaptureHeadersResource"/>
   <bean name="/child" scope="prototype" id="indexedChildResource"
-    class="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$IndexedChildResource"/>
+    class="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$IndexedChildResource"/>
 
 </beans>

instrumentation/restlet/restlet-1.0/testing/src/main/resources/springRouterConf.xml → instrumentation/restlet/restlet-1.1/testing/src/main/resources/springRouterConf.xml

@@ -12,21 +12,21 @@
     <property name="attachments">
       <map>
         <entry key="/success"
-          value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$SuccessResource"/>
+          value="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$SuccessResource"/>
         <entry key="/error-status"
-          value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$ErrorResource"/>
+          value="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$ErrorResource"/>
         <entry key="/exception"
-          value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$ExceptionResource"/>
+          value="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$ExceptionResource"/>
         <entry key="/query"
-          value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$QueryParamResource"/>
+          value="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$QueryParamResource"/>
         <entry key="/path/{id}/param"
-          value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$PathParamResource"/>
+          value="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$PathParamResource"/>
         <entry key="/redirect"
-          value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$RedirectResource"/>
+          value="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$RedirectResource"/>
         <entry key="/captureHeaders"
-          value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$CaptureHeadersResource"/>
+          value="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$CaptureHeadersResource"/>
         <entry key="/child"
-          value="io.opentelemetry.instrumentation.restlet.v1_0.RestletAppTestBase$IndexedChildResource"/>
+          value="io.opentelemetry.instrumentation.restlet.v1_1.RestletAppTestBase$IndexedChildResource"/>
       </map>
     </property>
   </bean>

settings.gradle.kts

@@ -396,9 +396,9 @@ include(":instrumentation:redisson:redisson-3.17:javaagent")
 include(":instrumentation:redisson:redisson-common:javaagent")
 include(":instrumentation:redisson:redisson-common:testing")
 include(":instrumentation:resources:library")
-include(":instrumentation:restlet:restlet-1.0:javaagent")
-include(":instrumentation:restlet:restlet-1.0:library")
-include(":instrumentation:restlet:restlet-1.0:testing")
+include(":instrumentation:restlet:restlet-1.1:javaagent")
+include(":instrumentation:restlet:restlet-1.1:library")
+include(":instrumentation:restlet:restlet-1.1:testing")
 include(":instrumentation:restlet:restlet-2.0:javaagent")
 include(":instrumentation:restlet:restlet-2.0:library")
 include(":instrumentation:restlet:restlet-2.0:testing")

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/util/TelemetryDataUtil.java

@@ -78,7 +78,10 @@ public final class TelemetryDataUtil {
     for (List<SpanData> trace : completeTraces) {
       for (SpanData span : trace) {
         if (!span.getInstrumentationScopeInfo().getName().equals("test")) {
-          assertThat(span.getInstrumentationScopeInfo().getVersion()).isNotNull();
+          assertThat(span.getInstrumentationScopeInfo().getVersion())
+              .as(
+                  "Instrumentation version was empty; make sure that the instrumentation name matches the gradle module name")
+              .isNotNull();
         }
       }
     }