fix merge

Author: zeitlinger

smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java

@@ -34,6 +34,7 @@
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import io.opentelemetry.semconv.HttpAttributes;
+import io.opentelemetry.semconv.UrlAttributes;
 import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import io.opentelemetry.spring.smoketest.OtelSpringStarterSmokeTestApplication;
@@ -214,7 +215,7 @@ void propertyConversion() {
   }
 
   @Test
-  void shouldSendTelemetry() throws InterruptedException {
+  void shouldSendTelemetry() {
     testRestTemplate.getForObject(OtelSpringStarterSmokeTestController.PING, String.class);
 
     // Span
@@ -226,9 +227,7 @@ void shouldSendTelemetry() throws InterruptedException {
                         clientSpan
                             .hasKind(SpanKind.CLIENT)
                             .hasAttributesSatisfying(
-                                a ->
-                                    assertThat(a.get(HttpAttributes.URL_FULL))
-                                        .endsWith("/ping")),
+                                a -> assertThat(a.get(UrlAttributes.URL_FULL)).endsWith("/ping")),
                     serverSpan ->
                         serverSpan
                             .hasKind(SpanKind.SERVER)
@@ -255,7 +254,7 @@ void shouldSendTelemetry() throws InterruptedException {
   }
 
   @Test
-  void restTemplateClient() throws InterruptedException {
+  void restTemplateClient() {
     testRestTemplate.getForObject(OtelSpringStarterSmokeTestController.REST_TEMPLATE, String.class);
 
     TracesAssert.assertThat(expectSpans(4))
@@ -267,7 +266,7 @@ void restTemplateClient() throws InterruptedException {
                             .hasKind(SpanKind.CLIENT)
                             .hasAttributesSatisfying(
                                 a ->
-                                    assertThat(a.get(SemanticAttributes.URL_FULL))
+                                    assertThat(a.get(UrlAttributes.URL_FULL))
                                         .endsWith("/rest-template")),
                     serverSpan ->
                         serverSpan
@@ -277,9 +276,7 @@ void restTemplateClient() throws InterruptedException {
                         nestedClientSpan
                             .hasKind(SpanKind.CLIENT)
                             .hasAttributesSatisfying(
-                                a ->
-                                    assertThat(a.get(SemanticAttributes.URL_FULL))
-                                        .endsWith("/ping")),
+                                a -> assertThat(a.get(UrlAttributes.URL_FULL)).endsWith("/ping")),
                     nestedServerSpan ->
                         nestedServerSpan
                             .hasKind(SpanKind.SERVER)