Merge pull request #42 from sourceplusplus/issue-39

Issue 39

Author: BFergerson

.ext/gson-2.8.6-SNAPSHOT.jar

@@ -50,7 +50,7 @@ import java.util.zip.ZipInputStream
 
 object SourceProbe {
 
-    private val BUILD = ResourceBundle.getBundle("build")
+    private val BUILD = ResourceBundle.getBundle("probe_build")
     private var PROBE_DIRECTORY = File(
         if (System.getProperty("os.name").lowercase().startsWith("mac"))
             "/tmp" else System.getProperty("java.io.tmpdir"), "spp-probe"
@@ -96,7 +96,7 @@ object SourceProbe {
                 "org.apache.skywalking.apm.agent.core.plugin.loader.AgentClassLoader"
             ).getMethod("getDefault").invoke(null) as java.lang.ClassLoader
             val sizeCappedClass = Class.forName(
-                "spp.probe.services.common.serialize.SizeCappedTypeAdapterFactory", true, agentClassLoader
+                "spp.probe.services.common.serialize.CappedTypeAdapterFactory", true, agentClassLoader
             )
             sizeCappedClass.getMethod("setInstrumentation", Instrumentation::class.java)
                 .invoke(null, instrumentation)
@@ -138,7 +138,7 @@ object SourceProbe {
                 "org.apache.skywalking.apm.agent.core.plugin.loader.AgentClassLoader"
             ).getMethod("getDefault").invoke(null) as java.lang.ClassLoader
             val sizeCappedClass = Class.forName(
-                "spp.probe.services.common.serialize.SizeCappedTypeAdapterFactory", true, agentClassLoader
+                "spp.probe.services.common.serialize.CappedTypeAdapterFactory", true, agentClassLoader
             )
             sizeCappedClass.getMethod("setInstrumentation", Instrumentation::class.java)
                 .invoke(null, instrumentation)

control/src/main/kotlin/spp/probe/SourceProbe.kt

@@ -0,0 +1,5 @@
+#Mon Oct 25 21:48:22 EDT 2021
+build_date=2021-10-26T01\:48\:22.534Z
+build_id=401c4cab-2c7a-4658-87cc-7799553d1b1a
+build_version=dev
+apache_skywalking_version=8.9.0

control/src/main/resources/probe_build.properties

@@ -23,9 +23,11 @@ services:
       - "5445:5445"
       - "5450:5450"
       - "5455:5455"
+      - "5107:5107"
     environment:
       - SPP_LOGGING_LEVEL=trace
       - SPP_OAP_HOST=skywalking-oap
+      - JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5107
     volumes:
       - ./config/spp-platform.crt:/opt/sourceplusplus/config/spp-platform.crt
       - ./config/spp-platform.key:/opt/sourceplusplus/config/spp-platform.key

e2e/docker-compose.yml

@@ -24,7 +24,8 @@ dependencies {
     compileOnly("org.apache.skywalking:apm-agent-core:$skywalkingAgentVersion")
     compileOnly("net.bytebuddy:byte-buddy:1.12.8")
 
-    implementation("com.google.code.gson:gson:$gsonVersion")
+    //implementation("com.google.code.gson:gson:$gsonVersion")
+    implementation(files("../.ext/gson-2.8.6-SNAPSHOT.jar"))
     implementation("org.springframework:spring-expression:5.3.15")
     implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
     implementation("org.jetbrains:annotations:23.0.0")

services/build.gradle.kts

@@ -37,13 +37,15 @@ import spp.protocol.instrument.meter.MeterType
 import spp.protocol.instrument.meter.MetricValueType
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.Executors
 
 object ContextReceiver {
 
     private val localVariables: MutableMap<String?, MutableMap<String, Any>> = ConcurrentHashMap()
     private val fields: MutableMap<String?, MutableMap<String, Any>> = ConcurrentHashMap()
     private val staticFields: MutableMap<String?, MutableMap<String, Any>> = ConcurrentHashMap()
     private val logReport = ServiceManager.INSTANCE.findService(LogReportServiceClient::class.java)
+    private val executor = Executors.newFixedThreadPool(5)
 
     operator fun get(instrumentId: String): ContextMap {
         val contextMap = ContextMap()
@@ -84,7 +86,7 @@ object ContextReceiver {
     }
 
     @JvmStatic
-    fun putBreakpoint(breakpointId: String, source: String?, line: Int, throwable: Throwable) {
+    fun putBreakpoint(breakpointId: String, source: String?, line: Int, throwable: Throwable) = executor.submit {
         val activeSpan = ContextManager.createLocalSpan(throwable.stackTrace[0].toString())
         val localVars: Map<String, Any>? = localVariables.remove(breakpointId)
         localVars?.forEach { (key: String, value: Any) ->
@@ -116,7 +118,7 @@ object ContextReceiver {
     }
 
     @JvmStatic
-    fun putLog(logId: String?, logFormat: String?, vararg logArguments: String) {
+    fun putLog(logId: String?, logFormat: String?, vararg logArguments: String) = executor.submit {
         val localVars: Map<String, Any>? = localVariables.remove(logId)
         val localFields: Map<String, Any>? = fields.remove(logId)
         val localStaticFields: Map<String, Any>? = staticFields.remove(logId)
@@ -170,8 +172,8 @@ object ContextReceiver {
     }
 
     @JvmStatic
-    fun putMeter(meterId: String) {
-        val liveMeter = ProbeMemory["spp.live-meter:$meterId"] as LiveMeter? ?: return
+    fun putMeter(meterId: String) = executor.submit {
+        val liveMeter = ProbeMemory["spp.live-meter:$meterId"] as LiveMeter? ?: return@submit
         val baseMeter = ProbeMemory.computeIfAbsent("spp.base-meter:$meterId") {
             when (liveMeter.meterType) {
                 MeterType.COUNT -> return@computeIfAbsent MeterFactory.counter(
@@ -224,7 +226,7 @@ object ContextReceiver {
     private fun encodeObject(varName: String, value: Any): String? {
         return try {
             String.format(
-                "{\"@class\":\"%s\",\"@identity\":\"%s\",\"$varName\":%s}",
+                "{\"@class\":\"%s\",\"@id\":\"%s\",\"$varName\":%s}",
                 value.javaClass.name, Integer.toHexString(System.identityHashCode(value)),
                 ModelSerializer.INSTANCE.toExtendedJson(value)
             )
@@ -233,8 +235,9 @@ object ContextReceiver {
                 val map: MutableMap<String, Any?> = HashMap()
                 map[varName] = value.javaClass.name + "@" + Integer.toHexString(System.identityHashCode(value))
                 map["@class"] = "java.lang.Class"
-                map["@identity"] = Integer.toHexString(System.identityHashCode(value))
-                map["@ex"] = ex.message
+                map["@id"] = Integer.toHexString(System.identityHashCode(value))
+                map["@skip"] = "EXCEPTION_OCCURRED"
+                map["@cause"] = ex.message
                 return ModelSerializer.INSTANCE.toJson(map)
             } catch (ignore: Exception) {
             }

services/src/main/kotlin/spp/probe/services/common/ContextReceiver.kt

@@ -17,18 +17,15 @@
  */
 package spp.probe.services.common
 
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.TypeAdapter
-import com.google.gson.TypeAdapterFactory
+import com.google.gson.*
 import com.google.gson.reflect.TypeToken
 import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonWriter
-import spp.probe.services.common.serialize.RuntimeClassIdentityTypeAdapterFactory
 import spp.probe.services.common.serialize.RuntimeClassNameTypeAdapterFactory
-import spp.probe.services.common.serialize.SizeCappedTypeAdapterFactory
+import spp.probe.services.common.serialize.CappedTypeAdapterFactory
 import java.io.IOException
 import java.io.OutputStream
+import java.util.*
 
 enum class ModelSerializer {
     INSTANCE;
@@ -43,7 +40,8 @@ enum class ModelSerializer {
 
     private val gson: Gson = GsonBuilder().disableHtmlEscaping().create()
     val extendedGson: Gson = GsonBuilder()
-        .registerTypeAdapterFactory(SizeCappedTypeAdapterFactory())
+        .setJsogPolicy(JsogPolicy.DEFAULT.withJsogAlwaysEnabled())
+        .registerTypeAdapterFactory(CappedTypeAdapterFactory(2))
         .registerTypeAdapterFactory(object : TypeAdapterFactory {
             override fun <T> create(gson: Gson, typeToken: TypeToken<T>): TypeAdapter<T>? {
                 return if (ignoredTypes.contains(typeToken.rawType.name)) {
@@ -73,7 +71,6 @@ enum class ModelSerializer {
                 } else null
             }
         })
-        .registerTypeAdapterFactory(RuntimeClassIdentityTypeAdapterFactory.of(Any::class.java))
         .registerTypeAdapterFactory(RuntimeClassNameTypeAdapterFactory.of(Any::class.java))
         .disableHtmlEscaping().create()
 

services/src/main/kotlin/spp/probe/services/common/ModelSerializer.kt

@@ -0,0 +1,113 @@
+/*
+ * Source++, the open-source live coding platform.
+ * Copyright (C) 2022 CodeBrig, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package spp.probe.services.common.serialize
+
+import com.google.gson.Gson
+import com.google.gson.TypeAdapter
+import com.google.gson.TypeAdapterFactory
+import com.google.gson.internal.bind.JsogRegistry
+import com.google.gson.reflect.TypeToken
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import spp.probe.services.common.ModelSerializer
+import java.io.IOException
+import java.lang.instrument.Instrumentation
+
+class CappedTypeAdapterFactory(val maxDepth: Int) : TypeAdapterFactory {
+
+    override fun <T> create(gson: Gson, type: TypeToken<T>): TypeAdapter<T>? {
+        return if (instrumentation == null || maxMemorySize == -1L) null else object : TypeAdapter<T>() {
+
+            @Throws(IOException::class)
+            override fun write(jsonWriter: JsonWriter, value: T?) {
+                if (value == null) {
+                    jsonWriter.nullValue()
+                    return
+                } else if (value is Class<*>) {
+                    jsonWriter.value(value.name)
+                    return
+                }
+
+                JsogRegistry.get().userData.putIfAbsent("depth", 0)
+                if ((JsogRegistry.get().userData["depth"] as Int) >= maxDepth) {
+                    jsonWriter.beginObject()
+                    jsonWriter.name("@skip")
+                    jsonWriter.value("MAX_DEPTH_EXCEEDED")
+                    jsonWriter.name("@class")
+                    jsonWriter.value(value.javaClass.name)
+                    jsonWriter.name("@id")
+                    jsonWriter.value(Integer.toHexString(System.identityHashCode(value)))
+                    jsonWriter.endObject()
+                    return
+                }
+
+                val objSize = instrumentation!!.getObjectSize(value)
+                if (objSize <= maxMemorySize) {
+                    JsogRegistry.get().userData["depth"] = (JsogRegistry.get().userData["depth"] as Int) + 1
+                    try {
+                        ModelSerializer.INSTANCE.extendedGson.getDelegateAdapter(
+                            this@CappedTypeAdapterFactory, type
+                        ).write(jsonWriter, value)
+                    } catch (e: Exception) {
+                        jsonWriter.beginObject()
+                        jsonWriter.name("@skip")
+                        jsonWriter.value("EXCEPTION_OCCURRED")
+                        jsonWriter.name("@class")
+                        jsonWriter.value(value.javaClass.name)
+                        jsonWriter.name("@size")
+                        jsonWriter.value(objSize.toString())
+                        jsonWriter.name("@cause")
+                        jsonWriter.value(e.message)
+                        jsonWriter.name("@id")
+                        jsonWriter.value(Integer.toHexString(System.identityHashCode(value)))
+                        jsonWriter.endObject()
+                    }
+                    JsogRegistry.get().userData["depth"] = (JsogRegistry.get().userData["depth"] as Int) - 1
+                } else {
+                    jsonWriter.beginObject()
+                    jsonWriter.name("@skip")
+                    jsonWriter.value("MAX_SIZE_EXCEEDED")
+                    jsonWriter.name("@class")
+                    jsonWriter.value(value.javaClass.name)
+                    jsonWriter.name("@size")
+                    jsonWriter.value(objSize.toString())
+                    jsonWriter.name("@id")
+                    jsonWriter.value(Integer.toHexString(System.identityHashCode(value)))
+                    jsonWriter.endObject()
+                }
+            }
+
+            override fun read(jsonReader: JsonReader): T? = null
+        }
+    }
+
+    companion object {
+        private var instrumentation: Instrumentation? = null
+        private var maxMemorySize: Long = -1
+
+        @JvmStatic
+        fun setInstrumentation(instrumentation: Instrumentation) {
+            Companion.instrumentation = instrumentation
+        }
+
+        @JvmStatic
+        fun setMaxMemorySize(maxMemorySize: Long) {
+            Companion.maxMemorySize = maxMemorySize
+        }
+    }
+}