report url parse error

open-telemetry · Jan 3, 2024 · b404160 · b404160
1 parent f041abe
commit b404160
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 42 deletions.
diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/oconf/options.go b/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/oconf/options.go
@@ -32,6 +32,7 @@ import (
 	"google.golang.org/grpc/encoding/gzip"
 
 	"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/retry"
+	"go.opentelemetry.io/otel/internal/global"
 	"go.opentelemetry.io/otel/sdk/metric"
 )
 
@@ -280,14 +281,18 @@ func WithEndpoint(endpoint string) GenericOption {
 	})
 }
 
-func WithEndpointURL(r string) GenericOption {
+func WithEndpointURL(v string) GenericOption {
 	return newGenericOption(func(cfg Config) Config {
-		if u, err := url.Parse(r); err == nil {
-			cfg.Metrics.Endpoint = u.Host
-			cfg.Metrics.URLPath = u.Path
-			if u.Scheme != "https" {
-				cfg.Metrics.Insecure = true
-			}
+		u, err := url.Parse(v)
+		if err != nil {
+			global.Error(err, "otlpmetric: parse endpoint url", "url", v)
+			return cfg
+		}
+
+		cfg.Metrics.Endpoint = u.Host
+		cfg.Metrics.URLPath = u.Path
+		if u.Scheme != "https" {
+			cfg.Metrics.Insecure = true
 		}
 
 		return cfg

diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf/options.go b/exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf/options.go
@@ -32,6 +32,7 @@ import (
 	"google.golang.org/grpc/encoding/gzip"
 
 	"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp/internal/retry"
+	"go.opentelemetry.io/otel/internal/global"
 	"go.opentelemetry.io/otel/sdk/metric"
 )
 
@@ -280,14 +281,18 @@ func WithEndpoint(endpoint string) GenericOption {
 	})
 }
 
-func WithEndpointURL(r string) GenericOption {
+func WithEndpointURL(v string) GenericOption {
 	return newGenericOption(func(cfg Config) Config {
-		if u, err := url.Parse(r); err == nil {
-			cfg.Metrics.Endpoint = u.Host
-			cfg.Metrics.URLPath = u.Path
-			if u.Scheme != "https" {
-				cfg.Metrics.Insecure = true
-			}
+		u, err := url.Parse(v)
+		if err != nil {
+			global.Error(err, "otlpmetric: parse endpoint url", "url", v)
+			return cfg
+		}
+
+		cfg.Metrics.Endpoint = u.Host
+		cfg.Metrics.URLPath = u.Path
+		if u.Scheme != "https" {
+			cfg.Metrics.Insecure = true
 		}
 
 		return cfg

diff --git a/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/options.go b/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/options.go
@@ -32,6 +32,7 @@ import (
 	"google.golang.org/grpc/encoding/gzip"
 
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
+	"go.opentelemetry.io/otel/internal/global"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/retry"
 )
 
@@ -266,14 +267,18 @@ func WithEndpoint(endpoint string) GenericOption {
 	})
 }
 
-func WithEndpointURL(r string) GenericOption {
+func WithEndpointURL(v string) GenericOption {
 	return newGenericOption(func(cfg Config) Config {
-		if u, err := url.Parse(r); err == nil {
-			cfg.Traces.Endpoint = u.Host
-			cfg.Traces.URLPath = u.Path
-			if u.Scheme != "https" {
-				cfg.Traces.Insecure = true
-			}
+		u, err := url.Parse(v)
+		if err != nil {
+			global.Error(err, "otlptrace: parse endpoint url", "url", v)
+			return cfg
+		}
+
+		cfg.Traces.Endpoint = u.Host
+		cfg.Traces.URLPath = u.Path
+		if u.Scheme != "https" {
+			cfg.Traces.Insecure = true
 		}
 
 		return cfg

diff --git a/exporters/otlp/otlptrace/otlptracehttp/internal/otlpconfig/options.go b/exporters/otlp/otlptrace/otlptracehttp/internal/otlpconfig/options.go
@@ -32,6 +32,7 @@ import (
 	"google.golang.org/grpc/encoding/gzip"
 
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
+	"go.opentelemetry.io/otel/internal/global"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal/retry"
 )
 
@@ -266,14 +267,18 @@ func WithEndpoint(endpoint string) GenericOption {
 	})
 }
 
-func WithEndpointURL(r string) GenericOption {
+func WithEndpointURL(v string) GenericOption {
 	return newGenericOption(func(cfg Config) Config {
-		if u, err := url.Parse(r); err == nil {
-			cfg.Traces.Endpoint = u.Host
-			cfg.Traces.URLPath = u.Path
-			if u.Scheme != "https" {
-				cfg.Traces.Insecure = true
-			}
+		u, err := url.Parse(v)
+		if err != nil {
+			global.Error(err, "otlptrace: parse endpoint url", "url", v)
+			return cfg
+		}
+
+		cfg.Traces.Endpoint = u.Host
+		cfg.Traces.URLPath = u.Path
+		if u.Scheme != "https" {
+			cfg.Traces.Insecure = true
 		}
 
 		return cfg

diff --git a/internal/shared/otlp/otlpmetric/oconf/options.go.tmpl b/internal/shared/otlp/otlpmetric/oconf/options.go.tmpl
@@ -32,6 +32,7 @@ import (
 	"google.golang.org/grpc/encoding/gzip"
 
 	"{{ .retryImportPath }}"
+	"go.opentelemetry.io/otel/internal/global"
 	"go.opentelemetry.io/otel/sdk/metric"
 )
 
@@ -280,14 +281,18 @@ func WithEndpoint(endpoint string) GenericOption {
 	})
 }
 
-func WithEndpointURL(r string) GenericOption {
+func WithEndpointURL(v string) GenericOption {
 	return newGenericOption(func(cfg Config) Config {
-		if u, err := url.Parse(r); err == nil {
-			cfg.Metrics.Endpoint = u.Host
-			cfg.Metrics.URLPath = u.Path
-			if u.Scheme != "https" {
-				cfg.Metrics.Insecure = true
-			}
+		u, err := url.Parse(v)
+		if err != nil {
+			global.Error(err, "otlpmetric: parse endpoint url", "url", v)
+			return cfg
+		}
+
+		cfg.Metrics.Endpoint = u.Host
+		cfg.Metrics.URLPath = u.Path
+		if u.Scheme != "https" {
+			cfg.Metrics.Insecure = true
 		}
 
 		return cfg

diff --git a/internal/shared/otlp/otlptrace/otlpconfig/options.go.tmpl b/internal/shared/otlp/otlptrace/otlpconfig/options.go.tmpl
@@ -32,6 +32,7 @@ import (
 	"google.golang.org/grpc/encoding/gzip"
 
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
+	"go.opentelemetry.io/otel/internal/global"
 	"{{ .retryImportPath }}"
 )
 
@@ -266,14 +267,18 @@ func WithEndpoint(endpoint string) GenericOption {
 	})
 }
 
-func WithEndpointURL(r string) GenericOption {
+func WithEndpointURL(v string) GenericOption {
 	return newGenericOption(func(cfg Config) Config {
-		if u, err := url.Parse(r); err == nil {
-			cfg.Traces.Endpoint = u.Host
-			cfg.Traces.URLPath = u.Path
-			if u.Scheme != "https" {
-				cfg.Traces.Insecure = true
-			}
+		u, err := url.Parse(v)
+		if err != nil {
+			global.Error(err, "otlptrace: parse endpoint url", "url", v)
+			return cfg
+		}
+
+		cfg.Traces.Endpoint = u.Host
+		cfg.Traces.URLPath = u.Path
+		if u.Scheme != "https" {
+			cfg.Traces.Insecure = true
 		}
 
 		return cfg