diff --git a/.github/actions/add-codeowners/codeowners.sh b/.github/actions/add-codeowners/codeowners.sh
index bdcc9077c6..087ac9f563 100755
--- a/.github/actions/add-codeowners/codeowners.sh
+++ b/.github/actions/add-codeowners/codeowners.sh
@@ -9,6 +9,7 @@ for file in gotestsum-report*.xml; do
     echo -e "\n" >> $file
 
     while read p; do
+        echo "line: $p"
         # we might try to report gotestsum-report.xml multiple times, so don't
         # calculate codeowners more times than we need
         if [[ "$p" =~ \<testcase && ! "$p" =~ "file=" ]]; then
diff --git a/CODEOWNERS b/CODEOWNERS
index b3f43cc8e1..ae93d047c0 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -3,67 +3,71 @@
 # default owner
 *                               @DataDog/dd-trace-go-guild
 # tracing
-/contrib                        @DataDog/apm-go @Datadog/apm-idm-go
-/ddtrace                        @DataDog/apm-go
+/contrib                     @DataDog/apm-go @Datadog/apm-idm-go
+/ddtrace                     @DataDog/apm-go
 
 # profiling
-/profiler                       @DataDog/profiling-go
-/internal/traceprof             @DataDog/profiling-go
+/profiler                    @DataDog/profiling-go
+/internal/traceprof          @DataDog/profiling-go
 
 # appsec
-/appsec                         @DataDog/asm-go
-/internal/appsec                @DataDog/asm-go
-/instrumentation/appsec         @DataDog/asm-go
+/appsec                      @DataDog/asm-go
+/internal/appsec             @DataDog/asm-go
+/instrumentation/appsec      @DataDog/asm-go
 /contrib/**/*appsec*.go         @DataDog/asm-go
 /.github/workflows/appsec.yml   @DataDog/asm-go
-/contrib/envoyproxy             @DataDog/asm-go
-/contrib/haproxy                @DataDog/asm-go
-/contrib/k8s.io/gateway-api     @DataDog/asm-go
+/contrib/envoyproxy          @DataDog/asm-go
+/contrib/haproxy             @DataDog/asm-go
+/contrib/k8s.io/gateway-api  @DataDog/asm-go
 
 # capabilities - config, dynamic config, remote config
 /internal/env                        @DataDog/apm-sdk-capabilities-go
 /internal/stableconfig               @DataDog/apm-sdk-capabilities-go
 /internal/globalconfig               @DataDog/apm-sdk-capabilities-go
 /internal/remoteconfig               @DataDog/apm-sdk-capabilities-go
-/ddtrace/tracer/dynamic_config.go    @DataDog/apm-sdk-capabilities-go
-/ddtrace/tracer/remote_config.go     @DataDog/apm-sdk-capabilities-go
-/ddtrace/tracer/otel_dd_mappings.go  @DataDog/apm-sdk-capabilities-go
+/ddtrace/tracer/dynamic_config.go       @DataDog/apm-sdk-capabilities-go
+/ddtrace/tracer/remote_config.go        @DataDog/apm-sdk-capabilities-go
+/ddtrace/tracer/otel_dd_mappings.go     @DataDog/apm-sdk-capabilities-go
+
 # capabilities - telemetry
 /internal/telemetry                  @DataDog/apm-sdk-capabilities-go
-/ddtrace/tracer/telemetry.go         @DataDog/apm-sdk-capabilities-go
+/ddtrace/tracer/telemetry.go            @DataDog/apm-sdk-capabilities-go
+
 # capabilities - sampling
-/ddtrace/tracer/tracer.go            @DataDog/apm-sdk-capabilities-go
-/ddtrace/tracer/sampler.go           @DataDog/apm-sdk-capabilities-go
-/ddtrace/tracer/rules_sampler.go     @DataDog/apm-sdk-capabilities-go
+/ddtrace/tracer/tracer.go               @DataDog/apm-sdk-capabilities-go
+/ddtrace/tracer/sampler.go              @DataDog/apm-sdk-capabilities-go
+/ddtrace/tracer/rules_sampler.go        @DataDog/apm-sdk-capabilities-go
 /internal/samplernames               @DataDog/apm-sdk-capabilities-go
+
 # capabilities - context, propagation, injection/extraction
 /ddtrace/baggage                     @DataDog/apm-sdk-capabilities-go
-/ddtrace/tracer/textmap.go           @DataDog/apm-sdk-capabilities-go
-/ddtrace/tracer/spancontext.go       @DataDog/apm-sdk-capabilities-go
-/ddtrace/tracer/context.go           @DataDog/apm-sdk-capabilities-go
-/ddtrace/tracer/propagator.go        @DataDog/apm-sdk-capabilities-go
-/ddtrace/tracer/propagating_tags.go  @DataDog/apm-sdk-capabilities-go
+/ddtrace/tracer/textmap.go              @DataDog/apm-sdk-capabilities-go
+/ddtrace/tracer/spancontext.go          @DataDog/apm-sdk-capabilities-go
+/ddtrace/tracer/context.go              @DataDog/apm-sdk-capabilities-go
+/ddtrace/tracer/propagator.go           @DataDog/apm-sdk-capabilities-go
+/ddtrace/tracer/propagating_tags.go     @DataDog/apm-sdk-capabilities-go
+
 # capabilities- OTel integration
 /ddtrace/opentelemetry               @DataDog/apm-sdk-capabilities-go
 
 # datastreams
-/datastreams                    @Datadog/data-streams-monitoring
-/internal/datastreams           @Datadog/data-streams-monitoring
+/datastreams                 @Datadog/data-streams-monitoring
+/internal/datastreams        @Datadog/data-streams-monitoring
 
 # civisibility
-/civisibility                   @DataDog/ci-app-libraries
-/internal/civisibility          @DataDog/ci-app-libraries
+/civisibility                @DataDog/ci-app-libraries
+/internal/civisibility       @DataDog/ci-app-libraries
 
 # llm observability
-/llmobs                         @DataDog/ml-observability
-/internal/llmobs                @DataDog/ml-observability
+/llmobs                      @DataDog/ml-observability
+/internal/llmobs             @DataDog/ml-observability
 
 # Gitlab configuration
 .gitlab-ci.yml                  @DataDog/dd-trace-go-guild @DataDog/apm-ecosystems-reliability
-/.gitlab-ci                     @DataDog/dd-trace-go-guild @DataDog/apm-ecosystems-reliability
+/.gitlab-ci                  @DataDog/dd-trace-go-guild @DataDog/apm-ecosystems-reliability
 
 # Orchestrion
-/internal/orchestrion           @DataDog/apm-orchestrion
+/internal/orchestrion        @DataDog/apm-orchestrion
 /**/orchestrion.yml             @DataDog/apm-orchestrion
 
 # Serverless
@@ -76,4 +80,4 @@
 **/go.mod
 **/go.sum
 go.work
-go.work.sum
+go.work.sum
\ No newline at end of file
diff --git a/scripts/ci_test_contrib.sh b/scripts/ci_test_contrib.sh
index d9ad0cdd2f..5f8ebec488 100755
--- a/scripts/ci_test_contrib.sh
+++ b/scripts/ci_test_contrib.sh
@@ -20,6 +20,9 @@ export GOEXPERIMENT=synctest # TODO: remove once go1.25 is the minimum supported
 
 report_error=0
 
+TEST_RESULTS="${TEST_RESULTS:-.}"
+mkdir -p "$TEST_RESULTS"
+
 for contrib in $CONTRIBS; do
   echo "Testing contrib module: $contrib"
   contrib_id=$(echo "$contrib" | sed 's/^\.\///g;s/[\/\.]/_/g')