chore: synchronize workspaces

ory · Dec 28, 2023 · 6bd81a5 · 6bd81a5
1 parent bc5bf80
commit 6bd81a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/driver/config/config.go b/driver/config/config.go
@@ -18,6 +18,8 @@ import (
 	"testing"
 	"time"
 
+	"go.opentelemetry.io/otel/trace/noop"
+
 	"github.com/ory/x/crdbx"
 
 	"github.com/go-webauthn/webauthn/protocol"
@@ -27,7 +29,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/rs/cors"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/net/publicsuffix"
 
 	"github.com/ory/herodot"
@@ -426,7 +427,7 @@ func (p *Config) validateIdentitySchemas(ctx context.Context) error {
 		// Tracing still works correctly even though we pass a no-op tracer
 		// here, because the otelhttp package will preferentially use the
 		// tracer from the incoming request context over this one.
-		httpx.ResilientClientWithTracer(trace.NewNoopTracerProvider().Tracer("github.com/ory/kratos/driver/config")),
+		httpx.ResilientClientWithTracer(noop.NewTracerProvider().Tracer("github.com/ory/kratos/driver/config")),
 	}
 
 	if o, ok := ctx.Value(validateIdentitySchemasClientKey).([]httpx.ResilientOptions); ok {

diff --git a/selfservice/strategy/password/validator.go b/selfservice/strategy/password/validator.go
@@ -14,13 +14,14 @@ import (
 	"strings"
 	"time"
 
+	"go.opentelemetry.io/otel/trace/noop"
+
 	"github.com/ory/kratos/text"
 
 	"github.com/arbovm/levenshtein"
 	"github.com/dgraph-io/ristretto"
 	"github.com/hashicorp/go-retryablehttp"
 	"github.com/pkg/errors"
-	"go.opentelemetry.io/otel/trace"
 
 	"github.com/ory/herodot"
 	"github.com/ory/kratos/driver/config"
@@ -88,7 +89,7 @@ func NewDefaultPasswordValidatorStrategy(reg validatorDependencies) (*DefaultPas
 			// Tracing still works correctly even though we pass a no-op tracer
 			// here, because the otelhttp package will preferentially use the
 			// tracer from the incoming request context over this one.
-			httpx.ResilientClientWithTracer(trace.NewNoopTracerProvider().Tracer("github.com/ory/kratos/selfservice/strategy/password"))),
+			httpx.ResilientClientWithTracer(noop.NewTracerProvider().Tracer("github.com/ory/kratos/selfservice/strategy/password"))),
 		reg:                       reg,
 		hashes:                    cache,
 		minIdentifierPasswordDist: 5, maxIdentifierPasswordSubstrThreshold: 0.5}, nil