wip

Author: BFergerson

gradle.properties

@@ -3,7 +3,7 @@ kotlin.code.style=official
 probeGroup = spp.probe
 probeVersion = 0.2.0-alpha-1
 
-protocolVersion=0.2.0-alpha-4
+protocolVersion=0.2.0-alpha-5
 
 #SkyWalking 8.8.1-compatible
 vertxVersion = 4.0.2

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

@@ -165,7 +165,7 @@ object ContextReceiver {
         val meter = ProbeMemory.computeIfAbsent("spp.base-meter:$meterId") {
             when (meterType) {
                 MeterType.COUNT -> return@computeIfAbsent MeterFactory.counter(
-                    "counter_" + meterId.replace("-", "_")
+                    "count_" + meterId.replace("-", "_")
                 ).mode(CounterMode.RATE)
                     .build()
                 MeterType.GAUGE -> return@computeIfAbsent MeterFactory.gauge(

services/src/main/java/spp/probe/services/common/model/ActiveLiveInstrument.kt

@@ -8,14 +8,20 @@ class ActiveLiveInstrument @JvmOverloads constructor(
     val instrument: LiveInstrument,
     val expression: Expression? = null
 ) {
-    val throttle: HitThrottle = HitThrottle(instrument.throttle.limit, instrument.throttle.step)
+    val throttle: HitThrottle? = instrument.throttle.let {
+        if (it != null) {
+            HitThrottle(it.limit, it.step)
+        } else {
+            null
+        }
+    }
     var isRemoval = false
     var isLive = false
 
     val isFinished: Boolean
         get() = if (instrument.expiresAt != null && System.currentTimeMillis() >= instrument.expiresAt!!) {
             true
         } else {
-            instrument.hitLimit != -1 && throttle.totalHitCount >= instrument.hitLimit
+            instrument.hitLimit != -1 && (throttle != null && throttle.totalHitCount >= instrument.hitLimit)
         }
 }

services/src/main/java/spp/probe/services/instrument/LiveInstrumentService.kt

@@ -278,7 +278,7 @@ object LiveInstrumentService {
     @JvmStatic
     fun isHit(instrumentId: String): Boolean {
         val instrument = instruments[instrumentId] ?: return false
-        if (instrument.throttle.isRateLimited()) {
+        if (instrument.throttle?.isRateLimited() == true) {
             ContextReceiver.clear(instrumentId)
             return false
         }