feat: Address PR comments

Author: BeegiiK

aitelemetry/connection_string_parser.go

@@ -1,44 +1,51 @@
 package aitelemetry
 
 import (
-	"fmt"
 	"strings"
+
+	"github.com/pkg/errors"
 )
 
 type connectionVars struct {
-	InstrumentationKey string
-	IngestionUrl       string
+	instrumentationKey string
+	ingestionUrl       string
+}
+
+func (c *connectionVars) String() string {
+	return "InstrumentationKey=" + c.instrumentationKey + ";IngestionEndpoint=" + c.ingestionUrl
 }
 
 func parseConnectionString(connectionString string) (*connectionVars, error) {
 	connectionVars := &connectionVars{}
 
 	if connectionString == "" {
-		return nil, fmt.Errorf("Connection string cannot be empty")
+		return nil, errors.New("connection string cannot be empty")
 	}
 
 	pairs := strings.Split(connectionString, ";")
 	for _, pair := range pairs {
 		kv := strings.SplitN(pair, "=", 2)
 		if len(kv) != 2 {
-			return nil, fmt.Errorf("Invalid connection string format: %s", pair)
+			return nil, errors.Errorf("invalid connection string format: %s", pair)
 		}
 		key, value := strings.TrimSpace(kv[0]), strings.TrimSpace(kv[1])
 
 		if key == "" {
-			return nil, fmt.Errorf("Key in connection string cannot be empty")
+			return nil, errors.Errorf("key in connection string cannot be empty")
 		}
 
 		switch strings.ToLower(key) {
 		case "instrumentationkey":
-			connectionVars.InstrumentationKey = value
+			connectionVars.instrumentationKey = value
 		case "ingestionendpoint":
-			connectionVars.IngestionUrl = value + "v2.1/track"
+			if value != "" {
+				connectionVars.ingestionUrl = value + "v2.1/track"
+			}
 		}
 	}
 
-	if connectionVars.InstrumentationKey == "" || connectionVars.IngestionUrl == "" {
-		return nil, fmt.Errorf("Missing required fields in connection string")
+	if connectionVars.instrumentationKey == "" || connectionVars.ingestionUrl == "" {
+		return nil, errors.Errorf("missing required fields in connection string: %s", connectionVars)
 	}
 
 	return connectionVars, nil

aitelemetry/connection_string_parser_test.go

@@ -19,8 +19,8 @@ func TestParseConnectionString(t *testing.T) {
 			name:             "Valid connection string and instrumentation key",
 			connectionString: connectionString,
 			want: &connectionVars{
-				InstrumentationKey: "00000000-0000-0000-0000-000000000000",
-				IngestionUrl:       "https://ingestion.endpoint.com/v2.1/track",
+				instrumentationKey: "00000000-0000-0000-0000-000000000000",
+				ingestionUrl:       "https://ingestion.endpoint.com/v2.1/track",
 			},
 			wantErr: false,
 		},
@@ -32,13 +32,13 @@ func TestParseConnectionString(t *testing.T) {
 		},
 		{
 			name:             "Valid instrumentation key with missing ingestion endpoint",
-			connectionString: "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=;",
+			connectionString: "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=",
 			want:             nil,
 			wantErr:          true,
 		},
 		{
 			name:             "Missing instrumentation key with valid ingestion endpoint",
-			connectionString: "InstrumentationKey=;IngestionEndpoint=https://ingestion.endpoint.com/;LiveEndpoint=https://live.endpoint.com/;",
+			connectionString: "InstrumentationKey=;IngestionEndpoint=https://ingestion.endpoint.com/",
 			want:             nil,
 			wantErr:          true,
 		},
@@ -58,8 +58,8 @@ func TestParseConnectionString(t *testing.T) {
 			} else {
 				require.NoError(t, err, "Expected no error but got one")
 				require.NotNil(t, got, "Expected a non-nil result")
-				require.Equal(t, tt.want.InstrumentationKey, got.InstrumentationKey, "Instrumentation Key does not match")
-				require.Equal(t, tt.want.IngestionUrl, got.IngestionUrl, "Ingestion URL does not match")
+				require.Equal(t, tt.want.instrumentationKey, got.instrumentationKey, "Instrumentation Key does not match")
+				require.Equal(t, tt.want.ingestionUrl, got.ingestionUrl, "Ingestion URL does not match")
 			}
 		})
 	}

aitelemetry/telemetrywrapper.go

@@ -13,6 +13,7 @@ import (
 	"github.com/Azure/azure-container-networking/store"
 	"github.com/microsoft/ApplicationInsights-Go/appinsights"
 	"github.com/microsoft/ApplicationInsights-Go/appinsights/contracts"
+	"github.com/pkg/errors"
 )
 
 const (
@@ -214,28 +215,25 @@ func NewAITelemetry(
 	return th, nil
 }
 
-// NewAITelemetry creates telemetry handle with user specified appinsights connection string.
-func NewAITelemetryWithConnectionString(
-	cString string,
-	aiConfig AIConfig,
-) (TelemetryHandle, error) {
+// NewWithConnectionString creates telemetry handle with user specified appinsights connection string.
+func NewWithConnectionString(connectionString string, aiConfig AIConfig) (TelemetryHandle, error) {
 	debugMode = aiConfig.DebugMode
 
-	if cString == "" {
+	if connectionString == "" {
 		debugLog("Empty connection string")
-		return nil, fmt.Errorf("AI connection string is empty")
+		return nil, errors.New("AI connection string is empty")
 	}
 
 	setAIConfigDefaults(&aiConfig)
 
-	connectionVars, err := parseConnectionString(cString)
+	connectionVars, err := parseConnectionString(connectionString)
 	if err != nil {
 		debugLog("Error parsing connection string: %v", err)
 		return nil, err
 	}
 
-	telemetryConfig := appinsights.NewTelemetryConfiguration(connectionVars.InstrumentationKey)
-	telemetryConfig.EndpointUrl = connectionVars.IngestionUrl
+	telemetryConfig := appinsights.NewTelemetryConfiguration(connectionVars.instrumentationKey)
+	telemetryConfig.EndpointUrl = connectionVars.ingestionUrl
 	telemetryConfig.MaxBatchSize = aiConfig.BatchSize
 	telemetryConfig.MaxBatchInterval = time.Duration(aiConfig.BatchInterval) * time.Second
 

aitelemetry/telemetrywrapper_test.go

@@ -19,7 +19,6 @@ var (
 	hostAgentUrl     = "localhost:3501"
 	getCloudResponse = "AzurePublicCloud"
 	httpURL          = "http://" + hostAgentUrl
-	// connectionString = "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://ingestion.endpoint.com/;LiveEndpoint=https://live.endpoint.com/;ApplicationId=11111111-1111-1111-1111-111111111111"
 )
 
 func TestMain(m *testing.M) {
@@ -93,7 +92,7 @@ func TestEmptyAIKey(t *testing.T) {
 		t.Errorf("Error initializing AI telemetry:%v", err)
 	}
 
-	_, err = NewAITelemetryWithConnectionString("", aiConfig)
+	_, err = NewWithConnectionString("", aiConfig)
 	if err == nil {
 		t.Errorf("Error initializing AI telemetry with connection string:%v", err)
 	}
@@ -118,7 +117,7 @@ func TestNewAITelemetry(t *testing.T) {
 		t.Errorf("Error initializing AI telemetry: %v", err)
 	}
 
-	th2, err := NewAITelemetryWithConnectionString(connectionString, aiConfig)
+	th2, err := NewWithConnectionString(connectionString, aiConfig)
 	if th2 == nil {
 		t.Errorf("Error initializing AI telemetry with connection string: %v", err)
 	}
@@ -185,7 +184,7 @@ func TestClosewithoutSend(t *testing.T) {
 		t.Errorf("Error initializing AI telemetry:%v", err)
 	}
 
-	thtest2, err := NewAITelemetryWithConnectionString(connectionString, aiConfig)
+	thtest2, err := NewWithConnectionString(connectionString, aiConfig)
 	if thtest2 == nil {
 		t.Errorf("Error initializing AI telemetry with connection string:%v", err)
 	}