Upgrade to use links

Author: shikokuchuo

R/daemon.R

@@ -216,11 +216,10 @@ eval_mirai <- function(._mirai_.) {
       {
         list2env(._mirai_.[["._globals_."]], envir = .GlobalEnv)
         if (otel_tracing && length(._mirai_.[["._otel_."]])) {
-          currid <- otel::get_active_span_context()$get_span_id()
           prtctx <- otel::extract_http_context(._mirai_.[["._otel_."]])
           spn <- otel::start_local_active_span(
             "mirai::daemon->eval",
-            attributes = otel::as_attributes(list(daemon_id = currid)),
+            links = list(daemon = dynGet("spn")),
             options = list(parent = prtctx)
           )
         }

R/daemons.R

@@ -304,7 +304,7 @@ daemons <- function(
         attributes = otel::as_attributes(list(
           url = envir[["url"]],
           n = envir[["n"]],
-          dispatcher = envir[["dispatcher"]],
+          dispatcher = if (is.null(envir[["dispatcher"]])) "false" else "true",
           compute_profile = .compute
         ))
       )

R/map.R

@@ -156,15 +156,15 @@
 mirai_map <- function(.x, .f, ..., .args = list(), .promise = NULL, .compute = NULL) {
   require_daemons(.compute = .compute, call = environment())
   is.function(.f) || stop(sprintf(._[["function_required"]], typeof(.f)))
-  if (is.null(.compute)) .compute <- .[["cp"]]
+  envir <- compute_env(.compute)
 
   if (otel_tracing) {
     if (!otel::get_active_span_context()$is_valid()) {
-      otel::local_active_span(..[[.compute]][["otel_span"]])
+      otel::local_active_span(envir[["otel_span"]])
     }
     spn <- otel::start_local_active_span(
       "mirai::mirai_map",
-      attributes = otel::as_attributes(list(compute_profile = .compute))
+      links = list(compute_profile = envir[["otel_span"]])
     )
   }
 

R/mirai.R

@@ -142,9 +142,8 @@
 #'
 mirai <- function(.expr, ..., .args = list(), .timeout = NULL, .compute = NULL) {
   missing(.expr) && stop(._[["missing_expression"]])
+  envir <- compute_env(.compute)
 
-  if (is.null(.compute)) .compute <- .[["cp"]]
-  envir <- ..[[.compute]]
   expr <- substitute(.expr)
   globals <- list(...)
   length(globals) && {
@@ -166,12 +165,11 @@ mirai <- function(.expr, ..., .args = list(), .timeout = NULL, .compute = NULL)
     ) .expr else expr,
     ._globals_. = globals,
     ._otel_. = if (otel_tracing && length(envir)) {
-      if (!otel::get_active_span_context()$is_valid()) {
-        otel::local_active_span(envir[["otel_span"]])
-      }
+      active <- otel::get_active_span_context()$is_valid()
       spn <- otel::start_local_active_span(
         "mirai::mirai",
-        attributes = otel::as_attributes(list(compute_profile = .compute))
+        links = if (active) list(compute_profile = envir[["otel_span"]]),
+        options = if (!active) list(parent = envir[["otel_span"]])
       )
       otel::pack_http_context()
     }