From 825e0f548dad87b60615a1b3230c94a61075fe20 Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Fri, 2 Jan 2026 16:31:07 -0500 Subject: [PATCH 1/8] refactor modules to align with upstream layout --- agent-lambda/build.gradle.kts | 1 + agent/build.gradle.kts | 1 + bootstrap/build.gradle.kts | 4 ++++ build.gradle.kts | 7 ------- ...inds.instrumentation-conventions.gradle.kts | 13 ++++++++++++- .../solarwinds.java-conventions.gradle.kts | 1 + custom/build.gradle.kts | 4 ++++ custom/lambda/build.gradle.kts | 4 ++++ custom/shared/build.gradle.kts | 4 ++++ instrumentation/build.gradle.kts | 5 +++++ .../{ => javaagent}/build.gradle.kts | 0 .../v4_0/HibernateInstrumentationModule.java | 0 .../hibernate/v4_0/InstrumenterSingleton.java | 0 .../hibernate/v4_0/LoaderInstrumentation.java | 0 .../instrumentation/hibernate/v4_0/Dev.java | 0 .../v4_0/LoaderInstrumentationTest.java | 0 .../{ => javaagent}/build.gradle.kts | 0 .../hibernate/v6_0/DrsaInstrumentation.java | 0 .../v6_0/HibernateInstrumentationModule.java | 0 .../hibernate/v6_0/InstrumenterSingleton.java | 0 .../instrumentation/hibernate/v6_0/Dev.java | 0 .../v6_0/DrsaInstrumentationTest.java | 0 .../jdbc/{ => javaagent}/build.gradle.kts | 18 +++++++++++++----- .../JdbcConnectionInstrumentation.java | 0 .../JdbcInstrumentationModule.java | 0 .../JdbcPreparedStatementInstrumentation.java | 0 .../JdbcStatementInstrumentation.java | 0 .../JdbcConnectionInstrumentationTest.java | 0 .../JdbcInstrumentationTest.java | 5 ++++- ...bcPreparedStatementInstrumentationTest.java | 0 .../JdbcStatementInstrumentationTest.java | 0 .../{ => javaagent}/build.gradle.kts | 0 .../v3_1/HandlerAdapterInstrumentation.java | 0 .../SpringWebMvcInstrumentationModule.java | 0 .../v3_1/WebMvcHandlerNameExtractor.java | 0 .../{ => javaagent}/build.gradle.kts | 0 .../v6_0/HandlerAdapterInstrumentation.java | 0 .../SpringWebMvcInstrumentationModule.java | 0 .../v6_0/WebMvcHandlerNameExtractor.java | 0 settings.gradle.kts | 11 +++++------ testing/agent-for-testing/build.gradle.kts | 1 + 41 files changed, 59 insertions(+), 20 deletions(-) rename instrumentation/hibernate/hibernate-4.0/{ => javaagent}/build.gradle.kts (100%) rename instrumentation/hibernate/hibernate-4.0/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java (100%) rename instrumentation/hibernate/hibernate-4.0/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/InstrumenterSingleton.java (100%) rename instrumentation/hibernate/hibernate-4.0/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/LoaderInstrumentation.java (100%) rename instrumentation/hibernate/hibernate-4.0/{ => javaagent}/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/Dev.java (100%) rename instrumentation/hibernate/hibernate-4.0/{ => javaagent}/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/LoaderInstrumentationTest.java (100%) rename instrumentation/hibernate/hibernate-6.0/{ => javaagent}/build.gradle.kts (100%) rename instrumentation/hibernate/hibernate-6.0/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/DrsaInstrumentation.java (100%) rename instrumentation/hibernate/hibernate-6.0/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java (100%) rename instrumentation/hibernate/hibernate-6.0/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/InstrumenterSingleton.java (100%) rename instrumentation/hibernate/hibernate-6.0/{ => javaagent}/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/Dev.java (100%) rename instrumentation/hibernate/hibernate-6.0/{ => javaagent}/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/DrsaInstrumentationTest.java (100%) rename instrumentation/jdbc/{ => javaagent}/build.gradle.kts (72%) rename instrumentation/jdbc/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcConnectionInstrumentation.java (100%) rename instrumentation/jdbc/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcInstrumentationModule.java (100%) rename instrumentation/jdbc/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcPreparedStatementInstrumentation.java (100%) rename instrumentation/jdbc/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcStatementInstrumentation.java (100%) rename instrumentation/jdbc/{ => javaagent}/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcConnectionInstrumentationTest.java (100%) rename instrumentation/jdbc/{ => javaagent}/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcInstrumentationTest.java (95%) rename instrumentation/jdbc/{ => javaagent}/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcPreparedStatementInstrumentationTest.java (100%) rename instrumentation/jdbc/{ => javaagent}/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcStatementInstrumentationTest.java (100%) rename instrumentation/spring-webmvc/spring-webmvc-3.1/{ => javaagent}/build.gradle.kts (100%) rename instrumentation/spring-webmvc/spring-webmvc-3.1/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/HandlerAdapterInstrumentation.java (100%) rename instrumentation/spring-webmvc/spring-webmvc-3.1/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/SpringWebMvcInstrumentationModule.java (100%) rename instrumentation/spring-webmvc/spring-webmvc-3.1/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/WebMvcHandlerNameExtractor.java (100%) rename instrumentation/spring-webmvc/spring-webmvc-6/{ => javaagent}/build.gradle.kts (100%) rename instrumentation/spring-webmvc/spring-webmvc-6/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/HandlerAdapterInstrumentation.java (100%) rename instrumentation/spring-webmvc/spring-webmvc-6/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/SpringWebMvcInstrumentationModule.java (100%) rename instrumentation/spring-webmvc/spring-webmvc-6/{ => javaagent}/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/WebMvcHandlerNameExtractor.java (100%) diff --git a/agent-lambda/build.gradle.kts b/agent-lambda/build.gradle.kts index 06befb23..c0355666 100644 --- a/agent-lambda/build.gradle.kts +++ b/agent-lambda/build.gradle.kts @@ -17,6 +17,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id("signing") + id("solarwinds.java-conventions") id("solarwinds.shadow-conventions") } diff --git a/agent/build.gradle.kts b/agent/build.gradle.kts index 650d77c9..db47bd67 100644 --- a/agent/build.gradle.kts +++ b/agent/build.gradle.kts @@ -18,6 +18,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id("signing") + id("solarwinds.java-conventions") id("solarwinds.shadow-conventions") } diff --git a/bootstrap/build.gradle.kts b/bootstrap/build.gradle.kts index cbfd512c..62d720c7 100644 --- a/bootstrap/build.gradle.kts +++ b/bootstrap/build.gradle.kts @@ -1,3 +1,7 @@ +plugins { + id("solarwinds.java-conventions") +} + dependencies { compileOnly("com.solarwinds.joboe:config") compileOnly("com.solarwinds.joboe:logging") diff --git a/build.gradle.kts b/build.gradle.kts index b3bdc8e4..c6d44856 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,13 +23,6 @@ extra["swoAgentVersion"] = swoAgentVersion group = "com.solarwinds" version = if (System.getenv("SNAPSHOT_BUILD").toBoolean()) "$swoAgentVersion-SNAPSHOT" else swoAgentVersion -subprojects { - if (this.name != "dependencyManagement") { - apply(plugin = "solarwinds.spotless-conventions") - apply(plugin = "solarwinds.java-conventions") - } -} - allprojects { plugins.withId("java"){ val cleanListedDependencies by tasks.registering { diff --git a/buildSrc/src/main/kotlin/solarwinds.instrumentation-conventions.gradle.kts b/buildSrc/src/main/kotlin/solarwinds.instrumentation-conventions.gradle.kts index b35a2991..926fffe7 100644 --- a/buildSrc/src/main/kotlin/solarwinds.instrumentation-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/solarwinds.instrumentation-conventions.gradle.kts @@ -23,6 +23,10 @@ plugins { id("io.opentelemetry.instrumentation.muzzle-check") } +if (projectDir.name == "javaagent") { + base.archivesName.set(projectDir.parentFile.name) +} + evaluationDependsOn(":testing:agent-for-testing") dependencies { compileOnly("io.opentelemetry:opentelemetry-sdk") @@ -94,7 +98,7 @@ tasks.withType().configureEach { } tasks.register("generateInstrumentationVersionFile") { - val name = "com.solarwinds.${project.name}" + val name = "com.solarwinds.${computeInstrumentationName()}" val version = rootProject.version.toString() inputs.property("instrumentation.name", name) @@ -114,6 +118,13 @@ sourceSets { } } +fun computeInstrumentationName(): String { + return when (projectDir.name) { + "javaagent" -> projectDir.parentFile.name + else -> project.name + } +} + class JavaagentProvider( @InputFile @PathSensitive(PathSensitivity.RELATIVE) diff --git a/buildSrc/src/main/kotlin/solarwinds.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/solarwinds.java-conventions.gradle.kts index 635733e6..1756c474 100644 --- a/buildSrc/src/main/kotlin/solarwinds.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/solarwinds.java-conventions.gradle.kts @@ -18,6 +18,7 @@ import com.solarwinds.instrumentation.gradle.SolarwindsJavaExtension plugins { java checkstyle + id("solarwinds.spotless-conventions") } repositories { diff --git a/custom/build.gradle.kts b/custom/build.gradle.kts index 7ddfb668..ae07afc5 100644 --- a/custom/build.gradle.kts +++ b/custom/build.gradle.kts @@ -14,6 +14,10 @@ * limitations under the License. */ +plugins { + id("solarwinds.java-conventions") +} + dependencies { compileOnly(project(":bootstrap")) compileOnly(project(":custom:shared")) diff --git a/custom/lambda/build.gradle.kts b/custom/lambda/build.gradle.kts index c08e58f4..1962a275 100644 --- a/custom/lambda/build.gradle.kts +++ b/custom/lambda/build.gradle.kts @@ -14,6 +14,10 @@ * limitations under the License. */ +plugins { + id("solarwinds.java-conventions") +} + dependencies { compileOnly(project(":custom:shared")) compileOnly("com.google.code.gson:gson") diff --git a/custom/shared/build.gradle.kts b/custom/shared/build.gradle.kts index 7169d2cc..e2c4002f 100644 --- a/custom/shared/build.gradle.kts +++ b/custom/shared/build.gradle.kts @@ -17,6 +17,10 @@ import java.time.format.DateTimeFormatter * limitations under the License. */ +plugins { + id("solarwinds.java-conventions") +} + dependencies { compileOnly(project(":bootstrap")) compileOnly("org.projectlombok:lombok") diff --git a/instrumentation/build.gradle.kts b/instrumentation/build.gradle.kts index 4bb55330..9b126b69 100644 --- a/instrumentation/build.gradle.kts +++ b/instrumentation/build.gradle.kts @@ -13,6 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +plugins { + id("solarwinds.java-conventions") +} + val instrumentationProject = project subprojects { afterEvaluate { diff --git a/instrumentation/hibernate/hibernate-4.0/build.gradle.kts b/instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/hibernate/hibernate-4.0/build.gradle.kts rename to instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts diff --git a/instrumentation/hibernate/hibernate-4.0/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java similarity index 100% rename from instrumentation/hibernate/hibernate-4.0/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java rename to instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java diff --git a/instrumentation/hibernate/hibernate-4.0/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/InstrumenterSingleton.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/InstrumenterSingleton.java similarity index 100% rename from instrumentation/hibernate/hibernate-4.0/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/InstrumenterSingleton.java rename to instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/InstrumenterSingleton.java diff --git a/instrumentation/hibernate/hibernate-4.0/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/LoaderInstrumentation.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/LoaderInstrumentation.java similarity index 100% rename from instrumentation/hibernate/hibernate-4.0/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/LoaderInstrumentation.java rename to instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/LoaderInstrumentation.java diff --git a/instrumentation/hibernate/hibernate-4.0/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/Dev.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/Dev.java similarity index 100% rename from instrumentation/hibernate/hibernate-4.0/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/Dev.java rename to instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/Dev.java diff --git a/instrumentation/hibernate/hibernate-4.0/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/LoaderInstrumentationTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/LoaderInstrumentationTest.java similarity index 100% rename from instrumentation/hibernate/hibernate-4.0/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/LoaderInstrumentationTest.java rename to instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/LoaderInstrumentationTest.java diff --git a/instrumentation/hibernate/hibernate-6.0/build.gradle.kts b/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/hibernate/hibernate-6.0/build.gradle.kts rename to instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts diff --git a/instrumentation/hibernate/hibernate-6.0/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/DrsaInstrumentation.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/DrsaInstrumentation.java similarity index 100% rename from instrumentation/hibernate/hibernate-6.0/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/DrsaInstrumentation.java rename to instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/DrsaInstrumentation.java diff --git a/instrumentation/hibernate/hibernate-6.0/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java similarity index 100% rename from instrumentation/hibernate/hibernate-6.0/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java rename to instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java diff --git a/instrumentation/hibernate/hibernate-6.0/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/InstrumenterSingleton.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/InstrumenterSingleton.java similarity index 100% rename from instrumentation/hibernate/hibernate-6.0/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/InstrumenterSingleton.java rename to instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/InstrumenterSingleton.java diff --git a/instrumentation/hibernate/hibernate-6.0/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/Dev.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/Dev.java similarity index 100% rename from instrumentation/hibernate/hibernate-6.0/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/Dev.java rename to instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/Dev.java diff --git a/instrumentation/hibernate/hibernate-6.0/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/DrsaInstrumentationTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/DrsaInstrumentationTest.java similarity index 100% rename from instrumentation/hibernate/hibernate-6.0/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/DrsaInstrumentationTest.java rename to instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/DrsaInstrumentationTest.java diff --git a/instrumentation/jdbc/build.gradle.kts b/instrumentation/jdbc/javaagent/build.gradle.kts similarity index 72% rename from instrumentation/jdbc/build.gradle.kts rename to instrumentation/jdbc/javaagent/build.gradle.kts index 22ec35b0..b84caafd 100644 --- a/instrumentation/jdbc/build.gradle.kts +++ b/instrumentation/jdbc/javaagent/build.gradle.kts @@ -30,17 +30,25 @@ dependencies { compileOnly("io.opentelemetry.semconv:opentelemetry-semconv") compileOnly("com.github.ben-manes.caffeine:caffeine") - testImplementation(project(":instrumentation:jdbc")) + testImplementation(project(":instrumentation:jdbc:javaagent")) testImplementation(project(":instrumentation:instrumentation-shared")) - testImplementation(platform("org.testcontainers:testcontainers-bom:1.20.4")) + testImplementation(platform("org.testcontainers:testcontainers-bom:2.0.3")) - testImplementation("org.testcontainers:mysql") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("com.mysql:mysql-connector-j:9.2.0") + testImplementation("org.testcontainers:testcontainers-mysql") + testImplementation("org.testcontainers:testcontainers-junit-jupiter") + testImplementation("com.mysql:mysql-connector-j:9.5.0") } tasks.withType().configureEach { dependsOn(":instrumentation:instrumentation-shared:byteBuddyJava") + with(options) { + val args = mutableListOf() + args.addAll(options.compilerArgs) + + // remove -Werror added by solarwinds.java-conventions because of deprecation that's a false positive in this case + args.remove("-Werror") + compilerArgs = args + } } swoJava { diff --git a/instrumentation/jdbc/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcConnectionInstrumentation.java b/instrumentation/jdbc/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcConnectionInstrumentation.java similarity index 100% rename from instrumentation/jdbc/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcConnectionInstrumentation.java rename to instrumentation/jdbc/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcConnectionInstrumentation.java diff --git a/instrumentation/jdbc/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcInstrumentationModule.java b/instrumentation/jdbc/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcInstrumentationModule.java similarity index 100% rename from instrumentation/jdbc/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcInstrumentationModule.java rename to instrumentation/jdbc/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcInstrumentationModule.java diff --git a/instrumentation/jdbc/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcPreparedStatementInstrumentation.java b/instrumentation/jdbc/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcPreparedStatementInstrumentation.java similarity index 100% rename from instrumentation/jdbc/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcPreparedStatementInstrumentation.java rename to instrumentation/jdbc/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcPreparedStatementInstrumentation.java diff --git a/instrumentation/jdbc/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcStatementInstrumentation.java b/instrumentation/jdbc/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcStatementInstrumentation.java similarity index 100% rename from instrumentation/jdbc/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcStatementInstrumentation.java rename to instrumentation/jdbc/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcStatementInstrumentation.java diff --git a/instrumentation/jdbc/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcConnectionInstrumentationTest.java b/instrumentation/jdbc/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcConnectionInstrumentationTest.java similarity index 100% rename from instrumentation/jdbc/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcConnectionInstrumentationTest.java rename to instrumentation/jdbc/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcConnectionInstrumentationTest.java diff --git a/instrumentation/jdbc/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcInstrumentationTest.java b/instrumentation/jdbc/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcInstrumentationTest.java similarity index 95% rename from instrumentation/jdbc/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcInstrumentationTest.java rename to instrumentation/jdbc/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcInstrumentationTest.java index 8b3e7f4d..5bea6a36 100644 --- a/instrumentation/jdbc/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcInstrumentationTest.java +++ b/instrumentation/jdbc/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcInstrumentationTest.java @@ -35,8 +35,10 @@ import org.testcontainers.containers.MySQLContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.utility.DockerImageName; @Testcontainers +@SuppressWarnings("all") @ExtendWith(MockitoExtension.class) class JdbcInstrumentationTest { @@ -44,7 +46,8 @@ class JdbcInstrumentationTest { private static final AgentInstrumentationExtension testing = AgentInstrumentationExtension.create(); - @Container public MySQLContainer mysql = new MySQLContainer<>("mysql:9.2.0"); + @Container + public MySQLContainer mysql = new MySQLContainer<>(DockerImageName.parse("mysql:9.2.0")); private Connection connection; diff --git a/instrumentation/jdbc/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcPreparedStatementInstrumentationTest.java b/instrumentation/jdbc/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcPreparedStatementInstrumentationTest.java similarity index 100% rename from instrumentation/jdbc/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcPreparedStatementInstrumentationTest.java rename to instrumentation/jdbc/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcPreparedStatementInstrumentationTest.java diff --git a/instrumentation/jdbc/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcStatementInstrumentationTest.java b/instrumentation/jdbc/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcStatementInstrumentationTest.java similarity index 100% rename from instrumentation/jdbc/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcStatementInstrumentationTest.java rename to instrumentation/jdbc/javaagent/src/test/java/com/solarwinds/opentelemetry/instrumentation/JdbcStatementInstrumentationTest.java diff --git a/instrumentation/spring-webmvc/spring-webmvc-3.1/build.gradle.kts b/instrumentation/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/spring-webmvc/spring-webmvc-3.1/build.gradle.kts rename to instrumentation/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts diff --git a/instrumentation/spring-webmvc/spring-webmvc-3.1/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/HandlerAdapterInstrumentation.java b/instrumentation/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/HandlerAdapterInstrumentation.java similarity index 100% rename from instrumentation/spring-webmvc/spring-webmvc-3.1/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/HandlerAdapterInstrumentation.java rename to instrumentation/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/HandlerAdapterInstrumentation.java diff --git a/instrumentation/spring-webmvc/spring-webmvc-3.1/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/SpringWebMvcInstrumentationModule.java b/instrumentation/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/SpringWebMvcInstrumentationModule.java similarity index 100% rename from instrumentation/spring-webmvc/spring-webmvc-3.1/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/SpringWebMvcInstrumentationModule.java rename to instrumentation/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/SpringWebMvcInstrumentationModule.java diff --git a/instrumentation/spring-webmvc/spring-webmvc-3.1/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/WebMvcHandlerNameExtractor.java b/instrumentation/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/WebMvcHandlerNameExtractor.java similarity index 100% rename from instrumentation/spring-webmvc/spring-webmvc-3.1/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/WebMvcHandlerNameExtractor.java rename to instrumentation/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v3_1/WebMvcHandlerNameExtractor.java diff --git a/instrumentation/spring-webmvc/spring-webmvc-6/build.gradle.kts b/instrumentation/spring-webmvc/spring-webmvc-6/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/spring-webmvc/spring-webmvc-6/build.gradle.kts rename to instrumentation/spring-webmvc/spring-webmvc-6/javaagent/build.gradle.kts diff --git a/instrumentation/spring-webmvc/spring-webmvc-6/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/HandlerAdapterInstrumentation.java b/instrumentation/spring-webmvc/spring-webmvc-6/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/HandlerAdapterInstrumentation.java similarity index 100% rename from instrumentation/spring-webmvc/spring-webmvc-6/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/HandlerAdapterInstrumentation.java rename to instrumentation/spring-webmvc/spring-webmvc-6/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/HandlerAdapterInstrumentation.java diff --git a/instrumentation/spring-webmvc/spring-webmvc-6/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/SpringWebMvcInstrumentationModule.java b/instrumentation/spring-webmvc/spring-webmvc-6/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/SpringWebMvcInstrumentationModule.java similarity index 100% rename from instrumentation/spring-webmvc/spring-webmvc-6/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/SpringWebMvcInstrumentationModule.java rename to instrumentation/spring-webmvc/spring-webmvc-6/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/SpringWebMvcInstrumentationModule.java diff --git a/instrumentation/spring-webmvc/spring-webmvc-6/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/WebMvcHandlerNameExtractor.java b/instrumentation/spring-webmvc/spring-webmvc-6/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/WebMvcHandlerNameExtractor.java similarity index 100% rename from instrumentation/spring-webmvc/spring-webmvc-6/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/WebMvcHandlerNameExtractor.java rename to instrumentation/spring-webmvc/spring-webmvc-6/javaagent/src/main/java/com/solarwinds/opentelemetry/instrumentation/webmvc/v6_0/WebMvcHandlerNameExtractor.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 61583ca3..615d0689 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -34,13 +34,12 @@ include("custom:lambda") include("custom:shared") include("agent-lambda") include("instrumentation") -include("instrumentation:jdbc") -include("instrumentation:spring-webmvc:spring-webmvc-3.1") -include("instrumentation:spring-webmvc:spring-webmvc-6") -include("instrumentation:spring-webmvc") +include("instrumentation:jdbc:javaagent") +include("instrumentation:spring-webmvc:spring-webmvc-3.1:javaagent") +include("instrumentation:spring-webmvc:spring-webmvc-6:javaagent") include("instrumentation:hibernate:hibernate-shared") -include("instrumentation:hibernate:hibernate-6.0") -include("instrumentation:hibernate:hibernate-4.0") +include("instrumentation:hibernate:hibernate-6.0:javaagent") +include("instrumentation:hibernate:hibernate-4.0:javaagent") include("instrumentation:instrumentation-shared") include("testing") include("testing:agent-for-testing") diff --git a/testing/agent-for-testing/build.gradle.kts b/testing/agent-for-testing/build.gradle.kts index 2e4e5f03..0221dda1 100644 --- a/testing/agent-for-testing/build.gradle.kts +++ b/testing/agent-for-testing/build.gradle.kts @@ -18,6 +18,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import java.io.File plugins { + id("solarwinds.java-conventions") id("solarwinds.shadow-conventions") } From 7791b6f53c1abf0b428c681233c0e51e522c9934 Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Wed, 7 Jan 2026 09:56:15 -0500 Subject: [PATCH 2/8] refactor lambda and shared modules into libs --- agent-lambda/build.gradle.kts | 4 ++-- agent/build.gradle.kts | 2 +- custom/build.gradle.kts | 4 ++-- {custom => libs}/lambda/build.gradle.kts | 4 ++-- .../opentelemetry/extensions/AwsLambdaSettingsFetcher.java | 0 .../DefaultAutoConfigurationCustomizerProvider.java | 0 .../opentelemetry/extensions/FileSettingsReader.java | 0 .../opentelemetry/extensions/LambdaAgentListener.java | 0 .../opentelemetry/extensions/LambdaConfigurationLoader.java | 0 .../opentelemetry/extensions/PropertiesSupplier.java | 0 .../opentelemetry/extensions/TraceProviderCustomizer.java | 0 .../extensions/AwsLambdaSettingsFetcherTest.java | 0 .../DefaultAutoConfigurationCustomizerProviderTest.java | 0 .../opentelemetry/extensions/FileSettingsReaderTest.java | 0 .../opentelemetry/extensions/JsonSettingWrapperTest.java | 0 .../opentelemetry/extensions/LambdaAgentListenerTest.java | 0 .../extensions/LambdaConfigurationLoaderTest.java | 0 .../opentelemetry/extensions/TraceProviderCustomizerTest.java | 0 .../lambda/src/test/resources/solarwinds-apm-settings.json | 0 {custom => libs}/shared/build.gradle.kts | 0 .../opentelemetry/extensions/ApmResourceProvider.java | 0 .../com/solarwinds/opentelemetry/extensions/Constants.java | 0 .../opentelemetry/extensions/DefaultNamingScheme.java | 0 .../opentelemetry/extensions/DelegatingMetricExporter.java | 0 .../extensions/InboundMeasurementMetricsGenerator.java | 0 .../opentelemetry/extensions/LoggingConfigProvider.java | 0 .../solarwinds/opentelemetry/extensions/MeterProvider.java | 0 .../opentelemetry/extensions/MetricExporterCustomizer.java | 0 .../com/solarwinds/opentelemetry/extensions/NamingScheme.java | 0 .../opentelemetry/extensions/ResourceCustomizer.java | 0 .../opentelemetry/extensions/ResponseHeaderCustomizer.java | 0 .../opentelemetry/extensions/SamplingConfigProvider.java | 0 .../com/solarwinds/opentelemetry/extensions/SamplingUtil.java | 0 .../com/solarwinds/opentelemetry/extensions/SharedNames.java | 0 .../extensions/SolarwindsBootstrapPackagesProvider.java | 0 .../opentelemetry/extensions/SolarwindsContextPropagator.java | 0 .../extensions/SolarwindsContextPropagatorProvider.java | 0 .../extensions/SolarwindsIgnoredTypesConfigurer.java | 0 .../opentelemetry/extensions/SolarwindsSampler.java | 0 .../opentelemetry/extensions/SpanAttributeNamingScheme.java | 0 .../opentelemetry/extensions/SpanStacktraceFilter.java | 0 .../extensions/TraceDecisionMetricCollector.java | 0 .../solarwinds/opentelemetry/extensions/TraceStateKey.java | 0 .../opentelemetry/extensions/TraceStateSamplingResult.java | 0 .../opentelemetry/extensions/TransactionNameManager.java | 0 .../opentelemetry/extensions/TransactionNamingScheme.java | 0 .../opentelemetry/extensions/TriggerTraceContextKey.java | 0 .../opentelemetry/extensions/config/JsonSetting.java | 0 .../opentelemetry/extensions/config/JsonSettingWrapper.java | 0 .../opentelemetry/extensions/config/ProxyHelper.java | 0 .../extensions/config/parser/json/LogFileStringParser.java | 0 .../extensions/config/parser/json/LogSettingParser.java | 0 .../config/parser/json/ModeStringToBooleanParser.java | 0 .../extensions/config/parser/json/RangeValidationParser.java | 0 .../config/parser/json/ResourceExtensionsMatcher.java | 0 .../extensions/config/parser/json/SqlTagDatabasesParser.java | 0 .../extensions/config/parser/json/StacktraceFilterParser.java | 0 .../extensions/config/parser/json/StringPatternMatcher.java | 0 .../extensions/config/parser/json/TracingModeParser.java | 0 .../config/parser/json/TransactionNamingSchemesParser.java | 0 .../config/parser/json/TransactionSettingsConfigParser.java | 0 .../config/parser/json/UrlSampleRateConfigParser.java | 0 .../config/parser/yaml/DeclarativeConfigParser.java | 0 .../extensions/config/parser/yaml/LogSettingParser.java | 0 .../extensions/config/parser/yaml/SqlTagDatabasesParser.java | 0 .../extensions/config/parser/yaml/StacktraceFilterParser.java | 0 .../extensions/config/parser/yaml/TracingModeParser.java | 0 .../config/parser/yaml/TransactionNamingSchemesParser.java | 0 .../config/parser/yaml/TransactionSettingsConfigParser.java | 0 .../config/parser/yaml/UrlSampleRateConfigParser.java | 0 .../config/provider/ContextPropagatorComponentProvider.java | 0 .../provider/InboundMeasurementMetricsComponentProvider.java | 0 .../config/provider/MetricExporterComponentProvider.java | 0 .../extensions/config/provider/SamplerComponentProvider.java | 0 .../config/provider/SharedConfigCustomizerProvider.java | 0 .../shared/src/main/resources/solarwinds-apm-config.json | 0 .../opentelemetry/extensions/ApmResourceProviderTest.java | 0 .../opentelemetry/extensions/DefaultNamingSchemeTest.java | 0 .../extensions/DelegatingMetricExporterTest.java | 0 .../extensions/InboundMeasurementMetricsGeneratorTest.java | 0 .../opentelemetry/extensions/LogFileStringParserTest.java | 0 .../opentelemetry/extensions/LogSettingParserTest.java | 0 .../opentelemetry/extensions/MeterProviderTest.java | 0 .../extensions/MetricExporterCustomizerTest.java | 0 .../extensions/ModeStringToBooleanParserTest.java | 0 .../solarwinds/opentelemetry/extensions/NamingSchemeTest.java | 0 .../opentelemetry/extensions/ResourceCustomizerTest.java | 0 .../extensions/ResponseHeaderCustomizerTest.java | 0 .../solarwinds/opentelemetry/extensions/SamplingUtilTest.java | 0 .../extensions/SolarwindsContextPropagatorTest.java | 0 .../opentelemetry/extensions/SolarwindsSamplerTest.java | 0 .../extensions/SpanAttributeNamingSchemeTest.java | 0 .../opentelemetry/extensions/SpanStacktraceFilterTest.java | 0 .../opentelemetry/extensions/SqlTagDatabasesParserTest.java | 0 .../opentelemetry/extensions/StacktraceFilterParserTest.java | 0 .../extensions/TraceDecisionMetricCollectorTest.java | 0 .../extensions/TransactionNamingSchemesParserTest.java | 0 .../opentelemetry/extensions/config/ProxyHelperTest.java | 0 .../config/parser/yaml/DeclarativeConfigParserTest.java | 0 .../extensions/config/parser/yaml/LogSettingParserTest.java | 0 .../config/parser/yaml/SqlTagDatabasesParserTest.java | 0 .../config/parser/yaml/StacktraceFilterParserTest.java | 0 .../extensions/config/parser/yaml/TracingModeParserTest.java | 0 .../parser/yaml/TransactionNamingSchemesParserTest.java | 0 .../parser/yaml/TransactionSettingsConfigParserTest.java | 0 .../config/parser/yaml/UrlSampleRateConfigParserTest.java | 0 .../provider/ContextPropagatorComponentProviderTest.java | 0 .../InboundMeasurementMetricsComponentProviderTest.java | 0 .../config/provider/MetricExporterComponentProviderTest.java | 0 .../config/provider/SamplerComponentProviderTest.java | 0 .../config/provider/SharedConfigCustomizerProviderTest.java | 0 .../opentelemetry/extensions/stubs/TextMapGetterStub.java | 0 .../test/resources/sdk-config-bad-transaction-settings-0.yaml | 0 .../test/resources/sdk-config-bad-transaction-settings-1.yaml | 0 {custom => libs}/shared/src/test/resources/sdk-config.yaml | 0 settings.gradle.kts | 4 ++-- testing/agent-for-testing/build.gradle.kts | 2 +- testing/agent-test-extension/build.gradle.kts | 2 +- 118 files changed, 11 insertions(+), 11 deletions(-) rename {custom => libs}/lambda/build.gradle.kts (94%) rename {custom => libs}/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/AwsLambdaSettingsFetcher.java (100%) rename {custom => libs}/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/DefaultAutoConfigurationCustomizerProvider.java (100%) rename {custom => libs}/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/FileSettingsReader.java (100%) rename {custom => libs}/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaAgentListener.java (100%) rename {custom => libs}/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoader.java (100%) rename {custom => libs}/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/PropertiesSupplier.java (100%) rename {custom => libs}/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/TraceProviderCustomizer.java (100%) rename {custom => libs}/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/AwsLambdaSettingsFetcherTest.java (100%) rename {custom => libs}/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/DefaultAutoConfigurationCustomizerProviderTest.java (100%) rename {custom => libs}/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/FileSettingsReaderTest.java (100%) rename {custom => libs}/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/JsonSettingWrapperTest.java (100%) rename {custom => libs}/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/LambdaAgentListenerTest.java (100%) rename {custom => libs}/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoaderTest.java (100%) rename {custom => libs}/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/TraceProviderCustomizerTest.java (100%) rename {custom => libs}/lambda/src/test/resources/solarwinds-apm-settings.json (100%) rename {custom => libs}/shared/build.gradle.kts (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ApmResourceProvider.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/Constants.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/DefaultNamingScheme.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/DelegatingMetricExporter.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/InboundMeasurementMetricsGenerator.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/LoggingConfigProvider.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/MeterProvider.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/MetricExporterCustomizer.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/NamingScheme.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ResourceCustomizer.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ResponseHeaderCustomizer.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SamplingConfigProvider.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SamplingUtil.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SharedNames.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsBootstrapPackagesProvider.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagator.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagatorProvider.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsIgnoredTypesConfigurer.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsSampler.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanAttributeNamingScheme.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilter.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceDecisionMetricCollector.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceStateKey.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceStateSamplingResult.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TransactionNameManager.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TransactionNamingScheme.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TriggerTraceContextKey.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/JsonSetting.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/JsonSettingWrapper.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/ProxyHelper.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/LogFileStringParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/LogSettingParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/ModeStringToBooleanParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/RangeValidationParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/ResourceExtensionsMatcher.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/SqlTagDatabasesParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/StacktraceFilterParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/StringPatternMatcher.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TracingModeParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TransactionNamingSchemesParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TransactionSettingsConfigParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/UrlSampleRateConfigParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/DeclarativeConfigParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParser.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/ContextPropagatorComponentProvider.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/InboundMeasurementMetricsComponentProvider.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProvider.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SamplerComponentProvider.java (100%) rename {custom => libs}/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProvider.java (100%) rename {custom => libs}/shared/src/main/resources/solarwinds-apm-config.json (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ApmResourceProviderTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/DefaultNamingSchemeTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/DelegatingMetricExporterTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/InboundMeasurementMetricsGeneratorTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/LogFileStringParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/LogSettingParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/MeterProviderTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/MetricExporterCustomizerTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ModeStringToBooleanParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/NamingSchemeTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ResourceCustomizerTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ResponseHeaderCustomizerTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SamplingUtilTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagatorTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SolarwindsSamplerTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SpanAttributeNamingSchemeTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilterTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SqlTagDatabasesParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/StacktraceFilterParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/TraceDecisionMetricCollectorTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/TransactionNamingSchemesParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/ProxyHelperTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/DeclarativeConfigParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParserTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/ContextPropagatorComponentProviderTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/InboundMeasurementMetricsComponentProviderTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProviderTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SamplerComponentProviderTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProviderTest.java (100%) rename {custom => libs}/shared/src/test/java/com/solarwinds/opentelemetry/extensions/stubs/TextMapGetterStub.java (100%) rename {custom => libs}/shared/src/test/resources/sdk-config-bad-transaction-settings-0.yaml (100%) rename {custom => libs}/shared/src/test/resources/sdk-config-bad-transaction-settings-1.yaml (100%) rename {custom => libs}/shared/src/test/resources/sdk-config.yaml (100%) diff --git a/agent-lambda/build.gradle.kts b/agent-lambda/build.gradle.kts index c0355666..10864f56 100644 --- a/agent-lambda/build.gradle.kts +++ b/agent-lambda/build.gradle.kts @@ -42,8 +42,8 @@ val upstreamAgent: Configuration by configurations.creating { } dependencies { - javaagentLibs(project(":custom:lambda")) - javaagentLibs(project(":custom:shared")) + javaagentLibs(project(":libs:lambda")) + javaagentLibs(project(":libs:shared")) javaagentLibs(project(":instrumentation")) bootstrapLibs(project(":bootstrap")) diff --git a/agent/build.gradle.kts b/agent/build.gradle.kts index db47bd67..5c047e94 100644 --- a/agent/build.gradle.kts +++ b/agent/build.gradle.kts @@ -43,7 +43,7 @@ val upstreamAgent: Configuration by configurations.creating { dependencies { javaagentLibs(project(":custom")) - javaagentLibs(project(":custom:shared")) + javaagentLibs(project(":libs:shared")) javaagentLibs(project(":instrumentation")) bootstrapLibs(project(":bootstrap")) diff --git a/custom/build.gradle.kts b/custom/build.gradle.kts index ae07afc5..3866a49e 100644 --- a/custom/build.gradle.kts +++ b/custom/build.gradle.kts @@ -20,7 +20,7 @@ plugins { dependencies { compileOnly(project(":bootstrap")) - compileOnly(project(":custom:shared")) + compileOnly(project(":libs:shared")) compileOnly("com.solarwinds.joboe:core") compileOnly("org.projectlombok:lombok") @@ -43,7 +43,7 @@ dependencies { compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator") compileOnly("io.opentelemetry:opentelemetry-exporter-otlp") - testImplementation(project(":custom:shared")) + testImplementation(project(":libs:shared")) testImplementation("org.json:json") testImplementation("com.solarwinds.joboe:core") diff --git a/custom/lambda/build.gradle.kts b/libs/lambda/build.gradle.kts similarity index 94% rename from custom/lambda/build.gradle.kts rename to libs/lambda/build.gradle.kts index 1962a275..e600a102 100644 --- a/custom/lambda/build.gradle.kts +++ b/libs/lambda/build.gradle.kts @@ -19,7 +19,7 @@ plugins { } dependencies { - compileOnly(project(":custom:shared")) + compileOnly(project(":libs:shared")) compileOnly("com.google.code.gson:gson") compileOnly("org.projectlombok:lombok") @@ -40,7 +40,7 @@ dependencies { compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api") compileOnly(project(":bootstrap")) - testImplementation(project(":custom:shared")) + testImplementation(project(":libs:shared")) } swoJava { diff --git a/custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/AwsLambdaSettingsFetcher.java b/libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/AwsLambdaSettingsFetcher.java similarity index 100% rename from custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/AwsLambdaSettingsFetcher.java rename to libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/AwsLambdaSettingsFetcher.java diff --git a/custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/DefaultAutoConfigurationCustomizerProvider.java b/libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/DefaultAutoConfigurationCustomizerProvider.java similarity index 100% rename from custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/DefaultAutoConfigurationCustomizerProvider.java rename to libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/DefaultAutoConfigurationCustomizerProvider.java diff --git a/custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/FileSettingsReader.java b/libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/FileSettingsReader.java similarity index 100% rename from custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/FileSettingsReader.java rename to libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/FileSettingsReader.java diff --git a/custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaAgentListener.java b/libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaAgentListener.java similarity index 100% rename from custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaAgentListener.java rename to libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaAgentListener.java diff --git a/custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoader.java b/libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoader.java similarity index 100% rename from custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoader.java rename to libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoader.java diff --git a/custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/PropertiesSupplier.java b/libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/PropertiesSupplier.java similarity index 100% rename from custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/PropertiesSupplier.java rename to libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/PropertiesSupplier.java diff --git a/custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/TraceProviderCustomizer.java b/libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/TraceProviderCustomizer.java similarity index 100% rename from custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/TraceProviderCustomizer.java rename to libs/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/TraceProviderCustomizer.java diff --git a/custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/AwsLambdaSettingsFetcherTest.java b/libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/AwsLambdaSettingsFetcherTest.java similarity index 100% rename from custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/AwsLambdaSettingsFetcherTest.java rename to libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/AwsLambdaSettingsFetcherTest.java diff --git a/custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/DefaultAutoConfigurationCustomizerProviderTest.java b/libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/DefaultAutoConfigurationCustomizerProviderTest.java similarity index 100% rename from custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/DefaultAutoConfigurationCustomizerProviderTest.java rename to libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/DefaultAutoConfigurationCustomizerProviderTest.java diff --git a/custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/FileSettingsReaderTest.java b/libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/FileSettingsReaderTest.java similarity index 100% rename from custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/FileSettingsReaderTest.java rename to libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/FileSettingsReaderTest.java diff --git a/custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/JsonSettingWrapperTest.java b/libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/JsonSettingWrapperTest.java similarity index 100% rename from custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/JsonSettingWrapperTest.java rename to libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/JsonSettingWrapperTest.java diff --git a/custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/LambdaAgentListenerTest.java b/libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/LambdaAgentListenerTest.java similarity index 100% rename from custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/LambdaAgentListenerTest.java rename to libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/LambdaAgentListenerTest.java diff --git a/custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoaderTest.java b/libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoaderTest.java similarity index 100% rename from custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoaderTest.java rename to libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/LambdaConfigurationLoaderTest.java diff --git a/custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/TraceProviderCustomizerTest.java b/libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/TraceProviderCustomizerTest.java similarity index 100% rename from custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/TraceProviderCustomizerTest.java rename to libs/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/TraceProviderCustomizerTest.java diff --git a/custom/lambda/src/test/resources/solarwinds-apm-settings.json b/libs/lambda/src/test/resources/solarwinds-apm-settings.json similarity index 100% rename from custom/lambda/src/test/resources/solarwinds-apm-settings.json rename to libs/lambda/src/test/resources/solarwinds-apm-settings.json diff --git a/custom/shared/build.gradle.kts b/libs/shared/build.gradle.kts similarity index 100% rename from custom/shared/build.gradle.kts rename to libs/shared/build.gradle.kts diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ApmResourceProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ApmResourceProvider.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ApmResourceProvider.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ApmResourceProvider.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/Constants.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/Constants.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/Constants.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/Constants.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/DefaultNamingScheme.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/DefaultNamingScheme.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/DefaultNamingScheme.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/DefaultNamingScheme.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/DelegatingMetricExporter.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/DelegatingMetricExporter.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/DelegatingMetricExporter.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/DelegatingMetricExporter.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/InboundMeasurementMetricsGenerator.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/InboundMeasurementMetricsGenerator.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/InboundMeasurementMetricsGenerator.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/InboundMeasurementMetricsGenerator.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/LoggingConfigProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/LoggingConfigProvider.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/LoggingConfigProvider.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/LoggingConfigProvider.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/MeterProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/MeterProvider.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/MeterProvider.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/MeterProvider.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/MetricExporterCustomizer.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/MetricExporterCustomizer.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/MetricExporterCustomizer.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/MetricExporterCustomizer.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/NamingScheme.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/NamingScheme.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/NamingScheme.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/NamingScheme.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ResourceCustomizer.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ResourceCustomizer.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ResourceCustomizer.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ResourceCustomizer.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ResponseHeaderCustomizer.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ResponseHeaderCustomizer.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ResponseHeaderCustomizer.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/ResponseHeaderCustomizer.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SamplingConfigProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SamplingConfigProvider.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SamplingConfigProvider.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SamplingConfigProvider.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SamplingUtil.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SamplingUtil.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SamplingUtil.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SamplingUtil.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SharedNames.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SharedNames.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SharedNames.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SharedNames.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsBootstrapPackagesProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsBootstrapPackagesProvider.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsBootstrapPackagesProvider.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsBootstrapPackagesProvider.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagator.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagator.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagator.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagator.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagatorProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagatorProvider.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagatorProvider.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagatorProvider.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsIgnoredTypesConfigurer.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsIgnoredTypesConfigurer.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsIgnoredTypesConfigurer.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsIgnoredTypesConfigurer.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsSampler.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsSampler.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsSampler.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsSampler.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanAttributeNamingScheme.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanAttributeNamingScheme.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanAttributeNamingScheme.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanAttributeNamingScheme.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilter.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilter.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilter.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilter.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceDecisionMetricCollector.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceDecisionMetricCollector.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceDecisionMetricCollector.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceDecisionMetricCollector.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceStateKey.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceStateKey.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceStateKey.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceStateKey.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceStateSamplingResult.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceStateSamplingResult.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceStateSamplingResult.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TraceStateSamplingResult.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TransactionNameManager.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TransactionNameManager.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TransactionNameManager.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TransactionNameManager.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TransactionNamingScheme.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TransactionNamingScheme.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TransactionNamingScheme.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TransactionNamingScheme.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TriggerTraceContextKey.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TriggerTraceContextKey.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TriggerTraceContextKey.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/TriggerTraceContextKey.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/JsonSetting.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/JsonSetting.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/JsonSetting.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/JsonSetting.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/JsonSettingWrapper.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/JsonSettingWrapper.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/JsonSettingWrapper.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/JsonSettingWrapper.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/ProxyHelper.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/ProxyHelper.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/ProxyHelper.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/ProxyHelper.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/LogFileStringParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/LogFileStringParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/LogFileStringParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/LogFileStringParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/LogSettingParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/LogSettingParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/LogSettingParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/LogSettingParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/ModeStringToBooleanParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/ModeStringToBooleanParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/ModeStringToBooleanParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/ModeStringToBooleanParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/RangeValidationParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/RangeValidationParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/RangeValidationParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/RangeValidationParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/ResourceExtensionsMatcher.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/ResourceExtensionsMatcher.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/ResourceExtensionsMatcher.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/ResourceExtensionsMatcher.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/SqlTagDatabasesParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/SqlTagDatabasesParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/SqlTagDatabasesParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/SqlTagDatabasesParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/StacktraceFilterParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/StacktraceFilterParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/StacktraceFilterParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/StacktraceFilterParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/StringPatternMatcher.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/StringPatternMatcher.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/StringPatternMatcher.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/StringPatternMatcher.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TracingModeParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TracingModeParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TracingModeParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TracingModeParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TransactionNamingSchemesParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TransactionNamingSchemesParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TransactionNamingSchemesParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TransactionNamingSchemesParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TransactionSettingsConfigParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TransactionSettingsConfigParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TransactionSettingsConfigParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/TransactionSettingsConfigParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/UrlSampleRateConfigParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/UrlSampleRateConfigParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/UrlSampleRateConfigParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/json/UrlSampleRateConfigParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/DeclarativeConfigParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/DeclarativeConfigParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/DeclarativeConfigParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/DeclarativeConfigParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParser.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParser.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParser.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParser.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/ContextPropagatorComponentProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/ContextPropagatorComponentProvider.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/ContextPropagatorComponentProvider.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/ContextPropagatorComponentProvider.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/InboundMeasurementMetricsComponentProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/InboundMeasurementMetricsComponentProvider.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/InboundMeasurementMetricsComponentProvider.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/InboundMeasurementMetricsComponentProvider.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProvider.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProvider.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProvider.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SamplerComponentProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SamplerComponentProvider.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SamplerComponentProvider.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SamplerComponentProvider.java diff --git a/custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProvider.java similarity index 100% rename from custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProvider.java rename to libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProvider.java diff --git a/custom/shared/src/main/resources/solarwinds-apm-config.json b/libs/shared/src/main/resources/solarwinds-apm-config.json similarity index 100% rename from custom/shared/src/main/resources/solarwinds-apm-config.json rename to libs/shared/src/main/resources/solarwinds-apm-config.json diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ApmResourceProviderTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ApmResourceProviderTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ApmResourceProviderTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ApmResourceProviderTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/DefaultNamingSchemeTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/DefaultNamingSchemeTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/DefaultNamingSchemeTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/DefaultNamingSchemeTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/DelegatingMetricExporterTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/DelegatingMetricExporterTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/DelegatingMetricExporterTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/DelegatingMetricExporterTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/InboundMeasurementMetricsGeneratorTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/InboundMeasurementMetricsGeneratorTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/InboundMeasurementMetricsGeneratorTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/InboundMeasurementMetricsGeneratorTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/LogFileStringParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/LogFileStringParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/LogFileStringParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/LogFileStringParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/LogSettingParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/LogSettingParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/LogSettingParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/LogSettingParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/MeterProviderTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/MeterProviderTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/MeterProviderTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/MeterProviderTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/MetricExporterCustomizerTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/MetricExporterCustomizerTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/MetricExporterCustomizerTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/MetricExporterCustomizerTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ModeStringToBooleanParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ModeStringToBooleanParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ModeStringToBooleanParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ModeStringToBooleanParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/NamingSchemeTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/NamingSchemeTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/NamingSchemeTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/NamingSchemeTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ResourceCustomizerTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ResourceCustomizerTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ResourceCustomizerTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ResourceCustomizerTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ResponseHeaderCustomizerTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ResponseHeaderCustomizerTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ResponseHeaderCustomizerTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/ResponseHeaderCustomizerTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SamplingUtilTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SamplingUtilTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SamplingUtilTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SamplingUtilTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagatorTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagatorTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagatorTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SolarwindsContextPropagatorTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SolarwindsSamplerTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SolarwindsSamplerTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SolarwindsSamplerTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SolarwindsSamplerTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SpanAttributeNamingSchemeTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SpanAttributeNamingSchemeTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SpanAttributeNamingSchemeTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SpanAttributeNamingSchemeTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilterTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilterTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilterTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SpanStacktraceFilterTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SqlTagDatabasesParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SqlTagDatabasesParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SqlTagDatabasesParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/SqlTagDatabasesParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/StacktraceFilterParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/StacktraceFilterParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/StacktraceFilterParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/StacktraceFilterParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/TraceDecisionMetricCollectorTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/TraceDecisionMetricCollectorTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/TraceDecisionMetricCollectorTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/TraceDecisionMetricCollectorTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/TransactionNamingSchemesParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/TransactionNamingSchemesParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/TransactionNamingSchemesParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/TransactionNamingSchemesParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/ProxyHelperTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/ProxyHelperTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/ProxyHelperTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/ProxyHelperTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/DeclarativeConfigParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/DeclarativeConfigParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/DeclarativeConfigParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/DeclarativeConfigParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParserTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParserTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParserTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/ContextPropagatorComponentProviderTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/ContextPropagatorComponentProviderTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/ContextPropagatorComponentProviderTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/ContextPropagatorComponentProviderTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/InboundMeasurementMetricsComponentProviderTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/InboundMeasurementMetricsComponentProviderTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/InboundMeasurementMetricsComponentProviderTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/InboundMeasurementMetricsComponentProviderTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProviderTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProviderTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProviderTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProviderTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SamplerComponentProviderTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SamplerComponentProviderTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SamplerComponentProviderTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SamplerComponentProviderTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProviderTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProviderTest.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProviderTest.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProviderTest.java diff --git a/custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/stubs/TextMapGetterStub.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/stubs/TextMapGetterStub.java similarity index 100% rename from custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/stubs/TextMapGetterStub.java rename to libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/stubs/TextMapGetterStub.java diff --git a/custom/shared/src/test/resources/sdk-config-bad-transaction-settings-0.yaml b/libs/shared/src/test/resources/sdk-config-bad-transaction-settings-0.yaml similarity index 100% rename from custom/shared/src/test/resources/sdk-config-bad-transaction-settings-0.yaml rename to libs/shared/src/test/resources/sdk-config-bad-transaction-settings-0.yaml diff --git a/custom/shared/src/test/resources/sdk-config-bad-transaction-settings-1.yaml b/libs/shared/src/test/resources/sdk-config-bad-transaction-settings-1.yaml similarity index 100% rename from custom/shared/src/test/resources/sdk-config-bad-transaction-settings-1.yaml rename to libs/shared/src/test/resources/sdk-config-bad-transaction-settings-1.yaml diff --git a/custom/shared/src/test/resources/sdk-config.yaml b/libs/shared/src/test/resources/sdk-config.yaml similarity index 100% rename from custom/shared/src/test/resources/sdk-config.yaml rename to libs/shared/src/test/resources/sdk-config.yaml diff --git a/settings.gradle.kts b/settings.gradle.kts index 615d0689..bc9eb0b2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,8 +30,8 @@ include("agent") include("solarwinds-otel-sdk") include("bootstrap") include("custom") -include("custom:lambda") -include("custom:shared") +include("libs:lambda") +include("libs:shared") include("agent-lambda") include("instrumentation") include("instrumentation:jdbc:javaagent") diff --git a/testing/agent-for-testing/build.gradle.kts b/testing/agent-for-testing/build.gradle.kts index 0221dda1..b556578e 100644 --- a/testing/agent-for-testing/build.gradle.kts +++ b/testing/agent-for-testing/build.gradle.kts @@ -40,7 +40,7 @@ val upstreamAgent: Configuration by configurations.creating { dependencies { javaagentLibs(project(":custom")) - javaagentLibs(project(":custom:shared")) + javaagentLibs(project(":libs:shared")) javaagentLibs(project(":testing:agent-test-extension")) javaagentLibs(project(":instrumentation:instrumentation-shared")) javaagentLibs(project(":instrumentation:hibernate:hibernate-shared")) diff --git a/testing/agent-test-extension/build.gradle.kts b/testing/agent-test-extension/build.gradle.kts index 47fb654b..bafd9665 100644 --- a/testing/agent-test-extension/build.gradle.kts +++ b/testing/agent-test-extension/build.gradle.kts @@ -3,6 +3,6 @@ plugins { } dependencies { - compileOnly(project(":custom:shared")) + compileOnly(project(":libs:shared")) compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure") } From 8e6abea6047c36b4e276428eca5207c9e0fe44d3 Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Wed, 7 Jan 2026 11:13:52 -0500 Subject: [PATCH 3/8] remove some test container loggers --- smoke-tests/src/test/java/com/solarwinds/LambdaTest.java | 1 - smoke-tests/src/test/java/com/solarwinds/SmokeTest.java | 1 - smoke-tests/src/test/java/com/solarwinds/SmokeTestV2.java | 1 - .../src/test/java/com/solarwinds/containers/K6Container.java | 2 -- .../com/solarwinds/containers/SpringBootWebMvcContainer.java | 1 - 5 files changed, 6 deletions(-) diff --git a/smoke-tests/src/test/java/com/solarwinds/LambdaTest.java b/smoke-tests/src/test/java/com/solarwinds/LambdaTest.java index 41c90dc9..9aa31ad1 100644 --- a/smoke-tests/src/test/java/com/solarwinds/LambdaTest.java +++ b/smoke-tests/src/test/java/com/solarwinds/LambdaTest.java @@ -87,7 +87,6 @@ static void runAppOnce(Agent agent) throws Exception { GenericContainer k6 = new K6Container(NETWORK, agent, namingConventions).build(); k6.start(); - k6.followOutput(new Slf4jLogConsumer(LoggerFactory.getLogger("k6"))); petClinic.execInContainer("kill", "1"); webMvc.execInContainer("kill", "1"); diff --git a/smoke-tests/src/test/java/com/solarwinds/SmokeTest.java b/smoke-tests/src/test/java/com/solarwinds/SmokeTest.java index fa91c335..0d3be8c0 100644 --- a/smoke-tests/src/test/java/com/solarwinds/SmokeTest.java +++ b/smoke-tests/src/test/java/com/solarwinds/SmokeTest.java @@ -105,7 +105,6 @@ static void runAppOnce(Agent agent) throws Exception { GenericContainer k6 = new K6Container(NETWORK, agent, namingConventions).build(); k6.start(); - k6.followOutput(new Slf4jLogConsumer(LoggerFactory.getLogger("k6")), OutputFrame.OutputType.STDOUT); petClinic.execInContainer("kill", "1"); webMvc.execInContainer("kill", "1"); diff --git a/smoke-tests/src/test/java/com/solarwinds/SmokeTestV2.java b/smoke-tests/src/test/java/com/solarwinds/SmokeTestV2.java index 0f9eae5c..5ce9109e 100644 --- a/smoke-tests/src/test/java/com/solarwinds/SmokeTestV2.java +++ b/smoke-tests/src/test/java/com/solarwinds/SmokeTestV2.java @@ -99,7 +99,6 @@ static void runAppOnce(Agent agent) throws Exception { GenericContainer k6 = new K6Container(NETWORK, agent, namingConventions).build(); k6.start(); - k6.followOutput(new Slf4jLogConsumer(LoggerFactory.getLogger("k6")), OutputFrame.OutputType.STDOUT); petClinic.execInContainer("kill", "1"); webMvc.execInContainer("kill", "1"); diff --git a/smoke-tests/src/test/java/com/solarwinds/containers/K6Container.java b/smoke-tests/src/test/java/com/solarwinds/containers/K6Container.java index c7ae4e51..7840ada8 100644 --- a/smoke-tests/src/test/java/com/solarwinds/containers/K6Container.java +++ b/smoke-tests/src/test/java/com/solarwinds/containers/K6Container.java @@ -31,7 +31,6 @@ import java.time.Duration; public class K6Container { - private static final Logger logger = LoggerFactory.getLogger(K6Container.class); private final Network network; private final Agent agent; private final NamingConventions namingConventions; @@ -48,7 +47,6 @@ public GenericContainer build() { return new GenericContainer<>(DockerImageName.parse("grafana/k6")) .withNetwork(network) .withNetworkAliases("k6") - .withLogConsumer(new Slf4jLogConsumer(logger)) .withCopyFileToContainer(MountableFile.forHostPath("./k6"), "/app") .withFileSystemBind(namingConventions.localResults(), namingConventions.containerResults()) .withCreateContainerCmdModifier(cmd -> cmd.withUser("root")) diff --git a/smoke-tests/src/test/java/com/solarwinds/containers/SpringBootWebMvcContainer.java b/smoke-tests/src/test/java/com/solarwinds/containers/SpringBootWebMvcContainer.java index 3b865038..3e785921 100644 --- a/smoke-tests/src/test/java/com/solarwinds/containers/SpringBootWebMvcContainer.java +++ b/smoke-tests/src/test/java/com/solarwinds/containers/SpringBootWebMvcContainer.java @@ -55,7 +55,6 @@ public GenericContainer build() { return new GenericContainer<>(DockerImageName.parse("smt:webmvc")) .withNetwork(network) .withNetworkAliases("webmvc") - .withLogConsumer(new Slf4jLogConsumer(logger)) .withExposedPorts(SERVER_PORT) .waitingFor(Wait.forHttp("/actuator/health").withReadTimeout(Duration.ofMinutes(5)).forPort(SERVER_PORT)) .withFileSystemBind("./solarwinds-apm-settings.json", "/tmp/solarwinds-apm-settings.json") From 75cff1349dff10ded462c3135707df4130beb170 Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Wed, 7 Jan 2026 11:24:34 -0500 Subject: [PATCH 4/8] fix ci files --- .circleci/config.yml | 6 +++--- .github/copilot-instructions.md | 5 +++-- .github/workflows/push.yml | 2 +- .github/workflows/release.yml | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e1610525..57659499 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -398,7 +398,7 @@ jobs: upload_file_to_release "$release_id" "checksum.txt" upload_file_to_release "$release_id" "agent/build/libs/solarwinds-apm-agent.jar" - upload_file_to_release "$release_id" "custom/shared/src/main/resources/solarwinds-apm-config.json" + upload_file_to_release "$release_id" "libs/shared/src/main/resources/solarwinds-apm-config.json" source /ci-scripts/bin/helpers.sh send_to_slack "A new release is ready \`$VERSION\`" @@ -426,7 +426,7 @@ jobs: s3://ssp-stage-global-agent-binaries/apm/java/$AGENTVERSION/solarwinds-apm-agent-lambda.jar \ --acl public-read - aws s3 cp custom/shared/src/main/resources/solarwinds-apm-config.json \ + aws s3 cp libs/shared/src/main/resources/solarwinds-apm-config.json \ s3://ssp-stage-global-agent-binaries/apm/java/$AGENTVERSION/solarwinds-apm-config.json \ --acl public-read - run: @@ -480,7 +480,7 @@ jobs: s3://ssp-prod-global-agent-binaries/apm/java/$AGENTVERSION/solarwinds-apm-agent.jar \ --acl public-read - aws s3 cp custom/shared/src/main/resources/solarwinds-apm-config.json \ + aws s3 cp libs/shared/src/main/resources/solarwinds-apm-config.json \ s3://ssp-prod-global-agent-binaries/apm/java/$AGENTVERSION/solarwinds-apm-config.json \ --acl public-read - run: diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 7f902dd9..b9ccaad3 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -28,8 +28,9 @@ This is a **multi-module Gradle project** with the following architecture: - **agent-lambda/** - Lambda-specific agent (exports via OTLP) - **bootstrap/** - Bootstrap classes loaded early in JVM lifecycle - **custom/** - Custom SolarWinds extensions and configurations - - `custom/shared/` - Shared code between agent and agent-lambda - - `custom/lambda/` - Lambda-specific extensions +- **libs/** - Custom SolarWinds libraries + - `libs/shared/` - Shared code between agent and agent-lambda + - `libs/lambda/` - Lambda-specific extensions - **instrumentation/** - Custom instrumentation modules - `jdbc/` - JDBC instrumentation - `spring-webmvc/` - Spring WebMVC instrumentation diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 534dfa73..270c72f1 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -66,7 +66,7 @@ jobs: s3://$STAGE_BUCKET/apm/java/$AGENT_VERSION/solarwinds-apm-agent-lambda.jar \ --acl public-read - aws s3 cp custom/shared/src/main/resources/solarwinds-apm-config.json \ + aws s3 cp libs/shared/src/main/resources/solarwinds-apm-config.json \ s3://$STAGE_BUCKET/apm/java/$AGENT_VERSION/solarwinds-apm-config.json \ --acl public-read env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb39bea0..0ca56095 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -98,7 +98,7 @@ jobs: /tmp/version.txt \ /tmp/checksum.txt \ agent/build/libs/solarwinds-apm-agent.jar \ - custom/shared/src/main/resources/solarwinds-apm-config.json + libs/shared/src/main/resources/solarwinds-apm-config.json s3-prod-upload: # this job uploads the jar and default config json to prod s3 if: inputs.run_s3_upload @@ -141,7 +141,7 @@ jobs: s3://$PROD_BUCKET/apm/java/$AGENT_VERSION/solarwinds-apm-agent.jar \ --acl public-read - aws s3 cp custom/shared/src/main/resources/solarwinds-apm-config.json \ + aws s3 cp libs/shared/src/main/resources/solarwinds-apm-config.json \ s3://$PROD_BUCKET/apm/java/$AGENT_VERSION/solarwinds-apm-config.json \ --acl public-read env: From 6b16dfc472103702a33f253d1f3635b5c809f3ec Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Wed, 7 Jan 2026 11:40:08 -0500 Subject: [PATCH 5/8] bump testcontainers --- benchmark/build.gradle.kts | 5 +++-- smoke-tests/build.gradle | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts index 0f5f3f9b..cdc9600c 100644 --- a/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -16,9 +16,10 @@ repositories { dependencies { implementation(enforcedPlatform("org.junit:junit-bom:5.10.3")) + implementation(enforcedPlatform("org.testcontainers:testcontainers-bom:2.0.3")) - testImplementation("org.testcontainers:testcontainers:1.19.8") - testImplementation("org.testcontainers:postgresql:1.19.8") + testImplementation("org.testcontainers:testcontainers") + testImplementation("org.testcontainers:testcontainers-postgresql") testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testImplementation("com.squareup.okhttp3:okhttp:4.12.0") diff --git a/smoke-tests/build.gradle b/smoke-tests/build.gradle index dd07cc67..0f3a56b2 100644 --- a/smoke-tests/build.gradle +++ b/smoke-tests/build.gradle @@ -34,7 +34,7 @@ repositories { } dependencies { - testImplementation platform("org.testcontainers:testcontainers-bom:2.0.2") + testImplementation platform("org.testcontainers:testcontainers-bom:2.0.3") testImplementation("org.testcontainers:testcontainers") testImplementation platform('org.junit:junit-bom:5.9.1') testImplementation 'org.junit.jupiter:junit-jupiter' From a4bb2da589f81401b4ba27e7fe284aba70c2724e Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Thu, 8 Jan 2026 12:41:21 -0500 Subject: [PATCH 6/8] remove caching --- .github/workflows/push.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 270c72f1..b71ceb12 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -124,8 +124,6 @@ jobs: platforms: linux/amd64 push: true tags: "ghcr.io/${{github.repository_owner}}/xk6:latest" - cache-from: type=gha - cache-to: type=gha,mode=max - name: Build rc image uses: docker/build-push-action@v6 @@ -135,8 +133,6 @@ jobs: platforms: linux/amd64 push: true tags: "ghcr.io/${{github.repository_owner}}/petclinic:agent-rc" - cache-from: type=gha - cache-to: type=gha,mode=max - name: Build stable image uses: docker/build-push-action@v6 @@ -145,8 +141,6 @@ jobs: platforms: linux/amd64 push: true tags: "ghcr.io/${{github.repository_owner}}/petclinic:agent-latest" - cache-from: type=gha - cache-to: type=gha,mode=max test: runs-on: ubuntu-latest From cdd5fdf5046bb64b36661325e0270b17213a9590 Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Mon, 12 Jan 2026 10:14:18 -0500 Subject: [PATCH 7/8] remove artifact upload --- .github/workflows/push.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index b71ceb12..7a0d86fc 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -247,12 +247,6 @@ jobs: cd smoke-tests ./gradlew test - - uses: actions/upload-artifact@v6 - if: always() - with: - path: smoke-tests/build/reports/tests/test - name: lambda-release-test - - name: Free Disk Space After Build run: | echo "Disk space before post-build cleanup:" From e3fd75341daae90250c938a42346b01b71b4d21c Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Mon, 12 Jan 2026 12:19:38 -0500 Subject: [PATCH 8/8] remove other caching --- .github/workflows/push.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 7a0d86fc..5a54aa89 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -638,8 +638,6 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} load: true - cache-from: type=gha - cache-to: type=gha,mode=max - name: Login to Docker Hub uses: docker/login-action@v3