Rebase merge conflict

go.mod

@@ -26,18 +26,15 @@ require (
 replace cloud.google.com/go/storage v1.43.1-0.20240903175418-70b73daa0730 => ../google-cloud-go/storage
 
 require (
+	cel.dev/expr v0.16.0 // indirect
 	cloud.google.com/go v0.115.1 // indirect
+	cloud.google.com/go/auth v0.9.1 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
 	cloud.google.com/go/compute/metadata v0.5.0 // indirect
 	cloud.google.com/go/iam v1.2.0 // indirect
 	cloud.google.com/go/monitoring v1.21.0 // indirect
 	cloud.google.com/go/trace v1.11.0 // indirect
 	git.sr.ht/~sbinet/gg v0.5.0 // indirect
-)
-
-require (
-	cel.dev/expr v0.16.0 // indirect
-	cloud.google.com/go/auth v0.9.1 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect

util/dynamic_delay_test.go

@@ -8,14 +8,6 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"fmt"
-	"math"
-"math/rand"
-"testing"
-"time"
-
-"github.com/google/go-cmp/cmp"
-"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 func applySamples(numSamples int, expectedValue float64, rnd *rand.Rand, d *Delay) int {