Supply library-defined props with NewConnectionProperties

connection.go

@@ -76,11 +76,15 @@ type Config struct {
 	Dial func(network, addr string) (net.Conn, error)
 }
 
-// NewConnectionProperties initialises an amqp.Table struct to empty value. This
-// amqp.Table can be used as Properties in amqp.Config to set the connection
-// name, using amqp.DialConfig()
+// NewConnectionProperties creates an amqp.Table to be used as amqp.Config.Properties.
+//
+// Defaults to library-defined values. For empty properties, use make(amqp.Table) instead.
 func NewConnectionProperties() Table {
-	return make(Table)
+	return Table{
+		"product":  defaultProduct,
+		"version":  buildVersion,
+		"platform": platform,
+	}
 }
 
 // Connection manages the serialization and deserialization of frames from IO
@@ -875,11 +879,7 @@ func (c *Connection) openStart(config Config) error {
 
 func (c *Connection) openTune(config Config, auth Authentication) error {
 	if len(config.Properties) == 0 {
-		config.Properties = Table{
-			"product":  defaultProduct,
-			"version":  buildVersion,
-			"platform": platform,
-		}
+		config.Properties = NewConnectionProperties()
 	}
 
 	config.Properties["capabilities"] = Table{

connection_test.go

@@ -11,6 +11,7 @@ package amqp091
 import (
 	"crypto/tls"
 	"net"
+	"regexp"
 	"sync"
 	"testing"
 	"time"
@@ -285,3 +286,49 @@ func TestConnectionConfigPropertiesWithClientProvidedConnectionName(t *testing.T
 			expectedConnectionName)
 	}
 }
+
+func TestNewConnectionProperties_HasDefaultProperties(t *testing.T) {
+	expectedProductName := defaultProduct
+	expectedPlatform := platform
+
+	props := NewConnectionProperties()
+
+	productName, ok := props["product"]
+	if !ok {
+		t.Fatal("Product name was not set by NewConnectionProperties")
+	}
+	if productName != expectedProductName {
+		t.Fatalf("Product name is set to: %s. Expected: %s",
+			productName,
+			expectedProductName,
+		)
+	}
+
+	platform, ok := props["platform"]
+	if !ok {
+		t.Fatal("Platform was not set by NewConnectionProperties")
+	}
+	if platform != expectedPlatform {
+		t.Fatalf("Platform is set to: %s. Expected: %s",
+			platform,
+			expectedPlatform,
+		)
+	}
+
+	versionUntyped, ok := props["version"]
+	if !ok {
+		t.Fatal("Version was not set by NewConnectionProperties")
+	}
+
+	version, ok := versionUntyped.(string)
+	if !ok {
+		t.Fatalf("Version in NewConnectionProperties should be string. Type given was: %T", versionUntyped)
+	}
+
+	// semver regexp as specified by https://semver.org/
+	semverRegexp := regexp.MustCompile(`^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$`)
+
+	if !semverRegexp.MatchString(version) {
+		t.Fatalf("Version in NewConnectionProperties is not a valid semver value: %s", version)
+	}
+}