From 8d341f14d4d5a27ebf1c295294c7d765092e3eb5 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 12 May 2026 10:31:33 -0700 Subject: [PATCH] Normalize spark javaagent package --- .../{sparkjava => spark/v2_3}/RoutesInstrumentation.java | 2 +- .../{sparkjava => spark/v2_3}/SparkInstrumentationModule.java | 2 +- .../{sparkjava => spark/v2_3}/SparkRouteUpdater.java | 2 +- .../{sparkjava => spark/v2_3}/SparkJavaBasedTest.java | 2 +- .../{sparkjava => spark/v2_3}/TestSparkJavaApplication.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/{sparkjava => spark/v2_3}/RoutesInstrumentation.java (95%) rename instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/{sparkjava => spark/v2_3}/SparkInstrumentationModule.java (91%) rename instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/{sparkjava => spark/v2_3}/SparkRouteUpdater.java (91%) rename instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/{sparkjava => spark/v2_3}/SparkJavaBasedTest.java (98%) rename instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/{sparkjava => spark/v2_3}/TestSparkJavaApplication.java (89%) diff --git a/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/RoutesInstrumentation.java b/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/RoutesInstrumentation.java similarity index 95% rename from instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/RoutesInstrumentation.java rename to instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/RoutesInstrumentation.java index efba42253ea6..f1e6c1f19f6a 100644 --- a/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/RoutesInstrumentation.java +++ b/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/RoutesInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.sparkjava; +package io.opentelemetry.javaagent.instrumentation.spark.v2_3; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkInstrumentationModule.java b/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/SparkInstrumentationModule.java similarity index 91% rename from instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkInstrumentationModule.java rename to instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/SparkInstrumentationModule.java index 6e78dbc6292e..906d2dedf55e 100644 --- a/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkInstrumentationModule.java +++ b/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/SparkInstrumentationModule.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.sparkjava; +package io.opentelemetry.javaagent.instrumentation.spark.v2_3; import static java.util.Collections.singletonList; diff --git a/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkRouteUpdater.java b/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/SparkRouteUpdater.java similarity index 91% rename from instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkRouteUpdater.java rename to instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/SparkRouteUpdater.java index 6545e59cd9c0..0bed2c1bfd09 100644 --- a/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkRouteUpdater.java +++ b/instrumentation/spark-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/SparkRouteUpdater.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.sparkjava; +package io.opentelemetry.javaagent.instrumentation.spark.v2_3; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute; diff --git a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/SparkJavaBasedTest.java similarity index 98% rename from instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java rename to instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/SparkJavaBasedTest.java index f2cf286e5e64..c988115ab816 100644 --- a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java +++ b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/SparkJavaBasedTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.sparkjava; +package io.opentelemetry.javaagent.instrumentation.spark.v2_3; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; diff --git a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/TestSparkJavaApplication.java b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/TestSparkJavaApplication.java similarity index 89% rename from instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/TestSparkJavaApplication.java rename to instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/TestSparkJavaApplication.java index 753fdd0d698a..0d358d65c2aa 100644 --- a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/TestSparkJavaApplication.java +++ b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spark/v2_3/TestSparkJavaApplication.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.sparkjava; +package io.opentelemetry.javaagent.instrumentation.spark.v2_3; import spark.Spark;