move constant for cancelled

emeraldpay · Aug 21, 2023 · 80a8996 · 80a8996
1 parent fd6f617
commit 80a8996
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/commons/constatnts.kt b/src/main/kotlin/io/emeraldpay/dshackle/commons/constatnts.kt
@@ -9,6 +9,7 @@ const val SPAN_REQUEST_API_TYPE = "request.api.type"
 const val SPAN_REQUEST_UPSTREAM_ID = "request.upstreamId"
 const val SPAN_REQUEST_ID = "request.id"
 const val SPAN_NO_RESPONSE_MESSAGE = "no-response.message"
+const val SPAN_REQUEST_CANCELLED = "cancelled"
 
 const val LOCAL_READER = "localReader"
 const val RPC_READER = "rpcReader"

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/reader/SpannedReader.kt b/src/main/kotlin/io/emeraldpay/dshackle/reader/SpannedReader.kt
@@ -3,6 +3,7 @@ package io.emeraldpay.dshackle.reader
 import io.emeraldpay.dshackle.commons.SPAN_ERROR
 import io.emeraldpay.dshackle.commons.SPAN_READER_NAME
 import io.emeraldpay.dshackle.commons.SPAN_READER_RESULT
+import io.emeraldpay.dshackle.commons.SPAN_REQUEST_CANCELLED
 import io.emeraldpay.dshackle.commons.SPAN_REQUEST_INFO
 import io.emeraldpay.dshackle.commons.SPAN_STATUS_MESSAGE
 import io.emeraldpay.dshackle.data.HashId
@@ -39,7 +40,7 @@ class SpannedReader<K, D>(
             }
             .doOnNext { newSpan.end() }
             .doOnCancel {
-                newSpan.tag(SPAN_STATUS_MESSAGE, "cancelled").end()
+                newSpan.tag(SPAN_STATUS_MESSAGE, SPAN_REQUEST_CANCELLED).end()
             }
             .switchIfEmpty {
                 newSpan.tag(SPAN_READER_RESULT, "empty result").end()

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeCall.kt b/src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeCall.kt
@@ -27,6 +27,7 @@ import io.emeraldpay.dshackle.SilentException
 import io.emeraldpay.dshackle.commons.LOCAL_READER
 import io.emeraldpay.dshackle.commons.RPC_READER
 import io.emeraldpay.dshackle.commons.SPAN_ERROR
+import io.emeraldpay.dshackle.commons.SPAN_REQUEST_CANCELLED
 import io.emeraldpay.dshackle.commons.SPAN_REQUEST_ID
 import io.emeraldpay.dshackle.commons.SPAN_STATUS_MESSAGE
 import io.emeraldpay.dshackle.config.MainConfig
@@ -125,7 +126,7 @@ open class NativeCall(
                     }
                     .doOnNext { callRes -> completeSpan(callRes, requestCount) }
                     .doOnCancel {
-                        tracer.currentSpan()?.tag(SPAN_STATUS_MESSAGE, "cancel")?.end()
+                        tracer.currentSpan()?.tag(SPAN_STATUS_MESSAGE, SPAN_REQUEST_CANCELLED)?.end()
                     }
                     .contextWrite { ctx -> createTracingReactorContext(ctx, requestCount, requestId, requestSpan) }
             }