Skip to content

Commit cea22d8

Browse files
authored
Rename spark web to align with OTEL (#145)
Signed-off-by: Pavol Loffay <[email protected]>
1 parent 3883f27 commit cea22d8

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

instrumentation/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies{
3131
implementation(project(":instrumentation:servlet:servlet-2.3"))
3232
implementation(project(":instrumentation:servlet:servlet-3.0"))
3333
implementation(project(":instrumentation:servlet:servlet-3.1"))
34-
implementation(project(":instrumentation:spark-web-framework-2.3"))
34+
implementation(project(":instrumentation:spark-2.3"))
3535
implementation(project(":instrumentation:grpc-1.5"))
3636
implementation(project(":instrumentation:okhttp:okhttp-3.0"))
3737
implementation(project(":instrumentation:apache-httpclient-4.0"))

settings.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ include("instrumentation:servlet:servlet-3.0")
2222
findProject(":instrumentation:servlet:servlet-3.0")?.name = "servlet-3.0"
2323
include("instrumentation:servlet:servlet-3.1")
2424
findProject(":instrumentation:servlet:servlet-3.1")?.name = "servlet-3.1"
25-
include("instrumentation:spark-web-framework-2.3")
26-
findProject(":instrumentation:spark-web-framework-2.3")?.name = "spark-web-framework-2.3"
25+
include("instrumentation:spark-2.3")
26+
findProject(":instrumentation:spark-2.3")?.name = "spark-2.3"
2727
include("instrumentation:apache-httpclient-4.0")
2828
findProject(":instrumentation:apache-httpclient-4.0")?.name = "apache-httpclient-4.0"
2929
include("smoke-tests")

testing-common/src/main/java/org/hypertrace/agent/testing/AbstractInstrumenterTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ public abstract class AbstractInstrumenterTest {
5757

5858
INSTRUMENTATION = ByteBuddyAgent.install();
5959

60-
// ((Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME)).setLevel(Level.WARN);
61-
// ((Logger) LoggerFactory.getLogger("io.opentelemetry")).setLevel(Level.DEBUG);
60+
// TODO causes Caused by: java.lang.ClassCastException
61+
// ((Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME)).setLevel(Level.WARN);
62+
// ((Logger) LoggerFactory.getLogger("io.opentelemetry")).setLevel(Level.DEBUG);
6263

6364
TEST_WRITER = new InMemoryExporter();
6465

0 commit comments

Comments
 (0)