Move instrumentation to within test_code()

Author: shikokuchuo

R/otel.R

@@ -18,17 +18,11 @@ local({
   otel_local_active_span <<- function(
     name,
     label,
-    attributes = list(),
-    links = NULL,
-    options = NULL,
     scope = parent.frame()
   ) {
     otel_is_tracing || return()
-    spn <- otel::start_local_active_span(
+    otel::start_local_active_span(
       sprintf("%s %s", name, label),
-      attributes = otel::as_attributes(attributes),
-      links = links,
-      options = options,
       tracer = otel_tracer,
       activation_scope = scope
     )

R/test-that.R

@@ -35,7 +35,6 @@
 #' }
 test_that <- function(desc, code) {
   local_description_push(desc)
-  otel_local_active_span("test that", desc)
 
   code <- substitute(code)
   test_code(code, parent.frame())
@@ -52,6 +51,7 @@ test_code <- function(code, env, reporter = NULL, skip_on_empty = TRUE) {
 
   test <- test_description()
   if (!is.null(test)) {
+    otel_local_active_span("test that", test, scope = frame)
     reporter$start_test(context = reporter$.context, test = test)
     withr::defer(reporter$end_test(context = reporter$.context, test = test))
   }

tests/testthat/test-otel.R

@@ -10,6 +10,6 @@ test_that("otel instrumentation works", {
 
   traces <- record$traces
   expect_length(traces, 1L)
-  expect_equal(traces[[1L]]$name, "test that otel testing")
+  expect_equal(traces[[1L]]$name, "test that otel instrumentation works / otel testing")
   expect_equal(traces[[1L]]$instrumentation_scope$name , "org.r-lib.testthat")
 })