Skip to content

Commit 84f29f2

Browse files
committed
reduce diff
1 parent aef9a61 commit 84f29f2

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jdbc.slick
6+
package io.opentelemetry.javaagent.instrumentation.scalaexecutors
77

88
import io.opentelemetry.api.trace.{SpanKind, Tracer}
99
import io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv

instrumentation/jdbc/testing/src/main/java/io/opentelemetry/instrumentation/jdbc/testing/ProxyStatementFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ public static <T> T proxy(
5959
// in the same package as the package private interface
6060
// by default we ignore jdk proxies, having the proxy in a different package ensures it gets
6161
// instrumented
62-
String expectedPackage = TestInterface.class.getPackage().getName();
63-
if (!proxy.getClass().getName().startsWith(expectedPackage)) {
62+
if (!proxy.getClass().getName().startsWith("io.opentelemetry.instrumentation.jdbc.testing")) {
6463
throw new IllegalStateException("proxy is in wrong package");
6564
}
6665

instrumentation/jdbc/testing/src/main/java/io/opentelemetry/instrumentation/jdbc/testing/TestClassLoader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ protected synchronized Class<?> loadClass(String name, boolean resolve)
2323
if (clazz != null) {
2424
return clazz;
2525
}
26-
String instrumentationPackage = TestInterface.class.getPackage().getName();
27-
if (name.startsWith(instrumentationPackage)) {
26+
if (name.startsWith("io.opentelemetry.instrumentation.jdbc.testing")) {
2827
try {
2928
return findClass(name);
3029
} catch (ClassNotFoundException exception) {

0 commit comments

Comments
 (0)