port is optional for sqlserver

Author: justinianvoss22

internal/sqlquery/config.go

@@ -39,8 +39,10 @@ func (c Config) Validate() error {
 		if c.DataSourceConfig.Host == "" {
 			return errors.New("'datasource_config.host' or 'datasource' must be specified")
 		}
-		if c.DataSourceConfig.Port == 0 {
-			return errors.New("'datasource_config.port' or 'datasource' must be specified")
+		if c.Driver != "sqlserver" {
+			if c.DataSourceConfig.Port == 0 {
+				return errors.New("'datasource_config.port' or 'datasource' must be specified")
+			}
 		}
 		if c.DataSourceConfig.Database == "" {
 			return errors.New("'datasource_config.database' or 'datasource' must be specified")

receiver/sqlqueryreceiver/config_test.go

@@ -146,6 +146,42 @@ func TestLoadConfig(t *testing.T) {
 			id:           component.NewIDWithName(metadata.Type, ""),
 			errorMessage: "'datasource' must be specified",
 		},
+		{
+			fname: "config-invalid-missing-datasource-config-port-sql-server.yaml",
+			id:    component.NewIDWithName(metadata.Type, ""),
+			expected: &Config{
+				Config: sqlquery.Config{
+					ControllerConfig: scraperhelper.ControllerConfig{
+						CollectionInterval: 10 * time.Second,
+						InitialDelay:       time.Second,
+					},
+					Driver: "sqlserver",
+					DataSourceConfig: sqlquery.DataSourceConfig{
+						Host:     "localhost",
+						Database: "mydb",
+						Username: "me",
+						Password: "s3cr3t",
+					},
+					Queries: []sqlquery.Query{
+						{
+							SQL: "select count(*) as count, type from mytable group by type",
+							Metrics: []sqlquery.MetricCfg{
+								{
+									MetricName:       "val.count",
+									ValueColumn:      "count",
+									AttributeColumns: []string{"type"},
+									Monotonic:        false,
+									ValueType:        sqlquery.MetricValueTypeInt,
+									DataType:         sqlquery.MetricTypeSum,
+									Aggregation:      sqlquery.MetricAggregationCumulative,
+									StaticAttributes: map[string]string{"foo": "bar"},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
 		{
 			fname:        "config-invalid-missing-datasource-config-port.yaml",
 			id:           component.NewIDWithName(metadata.Type, ""),

receiver/sqlqueryreceiver/testdata/config-invalid-missing-datasource-config-port-sql-server.yaml

@@ -0,0 +1,20 @@
+sqlquery:
+  collection_interval: 10s
+  driver: sqlserver
+  datasource_config:
+    host: localhost
+    database: mydb
+    username: me
+    password: s3cr3t
+  queries:
+    - sql: "select count(*) as count, type from mytable group by type"
+      metrics:
+        - metric_name: val.count
+          value_column: "count"
+          attribute_columns: ["type"]
+          data_type: sum
+          value_type: int
+          monotonic: false
+          aggregation: cumulative
+          static_attributes:
+            foo: bar

receiver/sqlqueryreceiver/testdata/config-invalid-missing-datasource-config-port.yaml

@@ -3,13 +3,18 @@ sqlquery:
   driver: mysql
   datasource_config:
     host: localhost
+    database: mydb
+    username: me
+    password: s3cr3t
   queries:
     - sql: "select count(*) as count, type from mytable group by type"
       metrics:
         - metric_name: val.count
           value_column: "count"
           attribute_columns: ["type"]
-          data_type: gauge
+          data_type: sum
           value_type: int
           monotonic: false
           aggregation: cumulative
+          static_attributes:
+            foo: bar