From b5979af640133e3ac1056b00d4a38e94b8551035 Mon Sep 17 00:00:00 2001 From: Po-Yao Chen Date: Fri, 8 Nov 2024 19:06:04 +0000 Subject: [PATCH] fix --- go.mod | 4 ++-- server/server.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 6489f25..9b3b8e3 100644 --- a/go.mod +++ b/go.mod @@ -13,8 +13,10 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.31.0 + go.opentelemetry.io/otel/metric v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 go.opentelemetry.io/otel/sdk/metric v1.31.0 + go.opentelemetry.io/otel/trace v1.31.0 golang.org/x/crypto v0.29.0 google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 google.golang.org/grpc v1.67.1 @@ -30,8 +32,6 @@ require ( github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/otel/metric v1.31.0 // indirect - go.opentelemetry.io/otel/trace v1.31.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect golang.org/x/mod v0.20.0 // indirect golang.org/x/net v0.30.0 // indirect diff --git a/server/server.go b/server/server.go index c4b8d5a..61d1e8b 100644 --- a/server/server.go +++ b/server/server.go @@ -22,7 +22,7 @@ import ( recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - "github.com/theparanoids/crypki/utils" + "github.com/theparanoids/crypki/certreload" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.opentelemetry.io/otel/sdk/resource" semconv "go.opentelemetry.io/otel/semconv/v1.26.0" @@ -366,8 +366,8 @@ func tlsServerConfiguration(caCertPath string, certPath, keyPath string, clientA } func tlsClientConfiguration(caCertPath, certPath, keyPath string) (*tls.Config, error) { - reloader, err := utils.NewCertReloader( - utils.CertReloadConfig{ + reloader, err := certreload.NewCertReloader( + certreload.CertReloadConfig{ CertKeyGetter: func() ([]byte, []byte, error) { certPEMBlock, err := os.ReadFile(certPath) if err != nil {