Skip to content

Commit 665d142

Browse files
committed
post-review changes
1 parent 8e2788d commit 665d142

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

instrumentation/grails-3.0/javaagent/src/test/java/test/GrailsTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,4 @@ public List<Consumer<SpanDataAssert>> errorPageSpanAssertions(
197197
}
198198
return spanAssertions;
199199
}
200-
201-
// using deprecated semconv
202200
}

instrumentation/jaxrs/jaxrs-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/AbstractJaxRsHttpServerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.instrumentation.jaxrs;
77

8-
import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionInfixAssertions;
8+
import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionSuffixAssertions;
99
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
1010
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1111
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -190,7 +190,7 @@ void shouldHandleAsyncResponse(AsyncResponseTestKind testKind) throws Exception
190190
testKind.assertBody(response.contentUtf8());
191191

192192
List<AttributeAssertion> attributeAssertions =
193-
codeFunctionInfixAssertions("test.JaxRsTestResource", "asyncOp");
193+
codeFunctionSuffixAssertions("test.JaxRsTestResource", "asyncOp");
194194

195195
if (testKind == AsyncResponseTestKind.CANCELED) {
196196
attributeAssertions.add(equalTo(AttributeKey.booleanKey("jaxrs.canceled"), true));
@@ -300,7 +300,7 @@ void shouldHandleCompletionStage(CompletionStageTestKind testKind) throws Except
300300
.hasKind(SpanKind.INTERNAL)
301301
.hasParent(trace.getSpan(0))
302302
.hasAttributesSatisfyingExactly(
303-
codeFunctionInfixAssertions(".JaxRsTestResource", "jaxRs21Async"));
303+
codeFunctionSuffixAssertions(".JaxRsTestResource", "jaxRs21Async"));
304304
if (testKind == CompletionStageTestKind.FAILING) {
305305
span.hasStatus(StatusData.error())
306306
.hasException(new IllegalStateException("failure"));
@@ -315,6 +315,6 @@ protected SpanDataAssert assertHandlerSpan(
315315
return span.hasName("JaxRsTestResource." + methodName)
316316
.hasKind(SpanKind.INTERNAL)
317317
.hasAttributesSatisfyingExactly(
318-
codeFunctionInfixAssertions(".JaxRsTestResource", methodName));
318+
codeFunctionSuffixAssertions(".JaxRsTestResource", methodName));
319319
}
320320
}

0 commit comments

Comments
 (0)