Deprecate SanitizedEndpoint

open-telemetry · Mar 18, 2024 · eaf041d · eaf041d
1 parent 3b5aee0
commit eaf041d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/config/configgrpc/configgrpc.go b/config/configgrpc/configgrpc.go
@@ -151,6 +151,7 @@ type ServerConfig struct {
 }
 
 // SanitizedEndpoint strips the prefix of either http:// or https:// from configgrpc.ClientConfig.Endpoint.
+// Deprecated: [v0.97.0]
 func (gcs *ClientConfig) SanitizedEndpoint() string {
 	switch {
 	case gcs.isSchemeHTTP():

diff --git a/exporter/otlpexporter/config.go b/exporter/otlpexporter/config.go
@@ -5,6 +5,7 @@ package otlpexporter // import "go.opentelemetry.io/collector/exporter/otlpexpor
 
 import (
 	"errors"
+	"strings"
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/configgrpc"
@@ -22,10 +23,21 @@ type Config struct {
 }
 
 func (c *Config) Validate() error {
-	if c.SanitizedEndpoint() == "" {
+	if c.sanitizedEndpoint() == "" {
 		return errors.New(`requires a non-empty "endpoint"`)
 	}
 	return nil
 }
 
+func (c *Config) sanitizedEndpoint() string {
+	switch {
+	case strings.HasPrefix(c.Endpoint, "http://"):
+		return strings.TrimPrefix(c.Endpoint, "http://")
+	case strings.HasPrefix(c.Endpoint, "https://"):
+		return strings.TrimPrefix(c.Endpoint, "https://")
+	default:
+		return c.Endpoint
+	}
+}
+
 var _ component.Config = (*Config)(nil)