raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

chore: Remove SecurityManager usage. (#2106)

Browse source
This commit is contained in:
He-Pin(kerr) 2025-08-30 20:36:13 +08:00 • committed by GitHub
parent 2a04e9649e
commit 273dc116d4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 44 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

1
actor-typed/src/main/mima-filters/2.0.x.backwards.excludes/remove-deprecated-methods.excludes
View file

@ -18,3 +18,4 @@
# Remove deprecated methods
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.actor.typed.javadsl.TimerScheduler.startPeriodicTimer")
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.actor.typed.scaladsl.TimerScheduler.startPeriodicTimer")
ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.actor.typed.internal.LoggerClass$TrickySecurityManager")

12
actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/LoggerClass.scala
View file

@ -13,12 +13,11 @@
package org.apache.pekko.actor.typed.internal
import scala.annotation.nowarn
import scala.util.control.NonFatal
import org.apache.pekko
import pekko.annotation.InternalApi
import pekko.util.OptionVal
import pekko.util.{ ClassContext, OptionVal }
/**
* INTERNAL API
@ -26,19 +25,12 @@ import pekko.util.OptionVal
@InternalApi
private[pekko] object LoggerClass {
// just to get access to the class context
@nowarn("msg=deprecated")
private final class TrickySecurityManager extends SecurityManager {
def getClassStack: Array[Class[_]] = getClassContext
}
private val defaultPrefixesToSkip = List("scala.runtime", "org.apache.pekko.actor.typed.internal")
/**
* Try to extract a logger class from the call stack, if not possible the provided default is used
*/
def detectLoggerClassFromStack(default: Class[_], additionalPrefixesToSkip: List[String] = Nil): Class[_] = {
// TODO use stack walker API when we no longer need to support Java 8
try {
def skip(name: String): Boolean = {
def loop(skipList: List[String]): Boolean = skipList match {
@ -51,7 +43,7 @@ private[pekko] object LoggerClass {
loop(additionalPrefixesToSkip ::: defaultPrefixesToSkip)
}
val trace = new TrickySecurityManager().getClassStack
val trace = ClassContext.getClassStack
var suitableClass: OptionVal[Class[_]] = OptionVal.None
var idx = 1 // skip this method/class and right away
while (suitableClass.isEmpty && idx < trace.length) {

41
actor/src/main/java/org/apache/pekko/util/ClassContext.java Normal file
View file

@ -0,0 +1,41 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.pekko.util;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Stream;
import org.apache.pekko.annotation.InternalApi;
/** INTERNAL API */
@InternalApi
public final class ClassContext {
private ClassContext() {
throw new UnsupportedOperationException("Cannot instantiate utility class");
}
private static final Set<StackWalker.Option> OPTIONS =
Set.of(StackWalker.Option.RETAIN_CLASS_REFERENCE, StackWalker.Option.SHOW_HIDDEN_FRAMES);
private static final Function<Stream<StackWalker.StackFrame>, Class<?>[]> CLASS_STACK_WALKER =
frames -> frames.map(StackWalker.StackFrame::getDeclaringClass).toArray(Class<?>[]::new);
public static Class<?>[] getClassStack() {
return StackWalker.getInstance(OPTIONS).walk(CLASS_STACK_WALKER);
}
}

41
bench-jmh/src/main/scala/org/apache/pekko/util/StackBench.scala
View file

@ -1,41 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* license agreements; and to You under the Apache License, version 2.0:
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
/*
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
package org.apache.pekko.util
import java.util.concurrent.TimeUnit
import scala.annotation.nowarn
import org.openjdk.jmh.annotations.{ Benchmark, Measurement, Scope, State }
@State(Scope.Benchmark)
@Measurement(timeUnit = TimeUnit.MICROSECONDS)
class StackBench {
@nowarn("msg=deprecated")
class CustomSecurtyManager extends SecurityManager {
def getTrace: Array[Class[_]] =
getClassContext
}
@Benchmark
def currentThread(): Array[StackTraceElement] = {
Thread.currentThread().getStackTrace
}
@Benchmark
def securityManager(): Array[Class[_]] = {
(new CustomSecurtyManager).getTrace
}
}