[otlpexporter] support validation for dns:https:// and dns:https:/// (#10450)

This allows users to continue using the recommended
dns:https://authority/host:port notation when needing to specify a custom
authority.
    
Fixes #10449

---------

Signed-off-by: Alex Boten <[email protected]>
Co-authored-by: Tyler Helmuth <[email protected]>

.chloggen/codeboten_remove-additional-slash.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: otlpexporter
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Update validation to support both dns:https:// and dns:https:///
+
+# One or more tracking issues or pull requests related to the change
+issues: [10449]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [user]

exporter/otlpexporter/config.go

@@ -7,6 +7,7 @@ import (
  "errors"
  "fmt"
  "net"
+ "regexp"
  "strconv"
  "strings"
 
@@ -49,8 +50,9 @@ func (c *Config) sanitizedEndpoint() string {
  return strings.TrimPrefix(c.Endpoint, "https://")
  case strings.HasPrefix(c.Endpoint, "https://"):
  return strings.TrimPrefix(c.Endpoint, "https://")
- case strings.HasPrefix(c.Endpoint, "dns:https:///"):
- return strings.TrimPrefix(c.Endpoint, "dns:https:///")
+ case strings.HasPrefix(c.Endpoint, "dns:https://"):
+ r := regexp.MustCompile("^dns:https://[/]?")
+ return r.ReplaceAllString(c.Endpoint, "")
  default:
  return c.Endpoint
  }

exporter/otlpexporter/config_test.go

@@ -134,6 +134,17 @@ func TestUnmarshalInvalidConfig(t *testing.T) {
 func TestValidDNSEndpoint(t *testing.T) {
  factory := NewFactory()
  cfg := factory.CreateDefaultConfig().(*Config)
- cfg.Endpoint = "dns:https:///backend.example.com:4317"
+ cfg.Endpoint = "dns:https://authority/backend.example.com:4317"
  assert.NoError(t, cfg.Validate())
 }
+
+func TestSanitizeEndpoint(t *testing.T) {
+ factory := NewFactory()
+ cfg := factory.CreateDefaultConfig().(*Config)
+ cfg.Endpoint = "dns:https://authority/backend.example.com:4317"
+ assert.Equal(t, "authority/backend.example.com:4317", cfg.sanitizedEndpoint())
+ cfg.Endpoint = "dns:https:///backend.example.com:4317"
+ assert.Equal(t, "backend.example.com:4317", cfg.sanitizedEndpoint())
+ cfg.Endpoint = "dns:https:////backend.example.com:4317"
+ assert.Equal(t, "/backend.example.com:4317", cfg.sanitizedEndpoint())
+}