Skip to content

Commit 6e48ef2

Browse files
committed
move safe logging to internal
1 parent ba2c1e6 commit 6e48ef2

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

core/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@
365365
<artifactId>spark-tags_${scala.binary.version}</artifactId>
366366
</dependency>
367367

368+
368369
<dependency>
369370
<groupId>org.apache.spark</groupId>
370371
<artifactId>spark-launcher_${scala.binary.version}</artifactId>
@@ -416,6 +417,15 @@
416417
<scope>provided</scope>
417418
</dependency>
418419

420+
<!--
421+
The following dependency is used for safe logging
422+
-->
423+
<dependency>
424+
<groupId>com.palantir.safe-logging</groupId>
425+
<artifactId>safe-logging</artifactId>
426+
<version>1.5.1</version>
427+
</dependency>
428+
419429
</dependencies>
420430
<build>
421431
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.spark.logging
18+
package org.apache.spark.internal
1919

2020
import com.palantir.logsafe.Arg
2121
import org.slf4j.LoggerFactory
@@ -63,3 +63,4 @@ trait SafeLogging {
6363
if (log_.isErrorEnabled) log_.error(message, args :+ error: _*)
6464
}
6565
}
66+

resource-managers/kubernetes/core/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,6 @@
8989
<version>3.8.1</version>
9090
</dependency>
9191

92-
<dependency>
93-
<groupId>com.palantir.safe-logging</groupId>
94-
<artifactId>safe-logging</artifactId>
95-
<version>1.5.1</version>
96-
</dependency>
97-
9892
<dependency>
9993
<groupId>org.mockito</groupId>
10094
<artifactId>mockito-core</artifactId>

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocator.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import org.apache.spark.{SparkConf, SparkException}
2727
import org.apache.spark.deploy.k8s.Config._
2828
import org.apache.spark.deploy.k8s.Constants._
2929
import org.apache.spark.deploy.k8s.KubernetesConf
30-
import org.apache.spark.logging.SafeLogging
30+
import org.apache.spark.internal.SafeLogging
3131
import org.apache.spark.util.{Clock, Utils}
3232

3333
private[spark] class ExecutorPodsAllocator(

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsLifecycleManager.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import scala.collection.mutable
2626
import org.apache.spark.SparkConf
2727
import org.apache.spark.deploy.k8s.Config._
2828
import org.apache.spark.deploy.k8s.KubernetesUtils._
29-
import org.apache.spark.logging.SafeLogging
29+
import org.apache.spark.internal.SafeLogging
3030
import org.apache.spark.scheduler.ExecutorExited
3131
import org.apache.spark.util.Utils
3232

0 commit comments

Comments
 (0)