Moved to using path instead of the full URL

Author: MovieStoreGuy

exporter/signalfxexporter/exporter_test.go

@@ -210,8 +210,7 @@ func TestConsumeMetrics(t *testing.T) {
 				converter: c,
 			}
 
-			errMsg := fmt.Sprintf("HTTP %q %d %q",
-				serverURL.JoinPath("/v2/datapoint").String(),
+			errMsg := fmt.Sprintf("HTTP \"/v2/datapoint\" %d %q",
 				tt.wantStatusCode,
 				http.StatusText(tt.wantStatusCode),
 			)
@@ -2079,8 +2078,7 @@ func TestConsumeMixedMetrics(t *testing.T) {
 			numDroppedTimeSeries, err := sfxClient.pushMetricsData(context.Background(), tt.md)
 			assert.Equal(t, tt.numDroppedTimeSeries, numDroppedTimeSeries)
 
-			errMsg := fmt.Sprintf("HTTP %q %d %q",
-				serverURL.JoinPath("/v2/datapoint").String(),
+			errMsg := fmt.Sprintf("HTTP \"/v2/datapoint\" %d %q",
 				tt.wantStatusCode,
 				http.StatusText(tt.wantStatusCode),
 			)

exporter/splunkhecexporter/client_test.go

@@ -1317,8 +1317,7 @@ func TestErrorReceived(t *testing.T) {
 	case <-time.After(5 * time.Second):
 		t.Fatal("Should have received request")
 	}
-	errMsg := fmt.Sprintf("HTTP %q %d %q",
-		cfg.ClientConfig.Endpoint,
+	errMsg := fmt.Sprintf("HTTP \"/services/collector\" %d %q",
 		http.StatusInternalServerError,
 		http.StatusText(http.StatusInternalServerError),
 	)
@@ -1400,9 +1399,8 @@ func TestHeartbeatStartupFailed(t *testing.T) {
 	assert.NoError(t, err)
 	assert.EqualError(t,
 		exporter.Start(context.Background(), componenttest.NewNopHost()),
-		fmt.Sprintf("%s: heartbeat on startup failed: HTTP %q 403 \"Forbidden\"",
+		fmt.Sprintf("%s: heartbeat on startup failed: HTTP \"/services/collector\" 403 \"Forbidden\"",
 			params.ID.String(),
-			cfg.ClientConfig.Endpoint,
 		),
 	)
 	assert.NoError(t, exporter.Shutdown(context.Background()))
@@ -1602,7 +1600,7 @@ func Test_pushLogData_PostError(t *testing.T) {
 
 func Test_pushLogData_ShouldAddResponseTo400Error(t *testing.T) {
 	config := NewFactory().CreateDefaultConfig().(*Config)
-	url := &url.URL{Scheme: "http", Host: "splunk"}
+	url := &url.URL{Scheme: "http", Host: "splunk", Path: "/v1/endpoint"}
 	splunkClient := newLogsClient(exportertest.NewNopSettings(metadata.Type), NewFactory().CreateDefaultConfig().(*Config))
 	logs := createLogData(1, 1, 1)
 
@@ -1614,7 +1612,7 @@ func Test_pushLogData_ShouldAddResponseTo400Error(t *testing.T) {
 	// Sending logs using the client.
 	err := splunkClient.pushLogData(context.Background(), logs)
 	require.True(t, consumererror.IsPermanent(err), "Expecting permanent error")
-	require.EqualError(t, err, "Permanent error: HTTP \"http://splunk\" 400 \"Bad Request\"")
+	require.EqualError(t, err, "Permanent error: HTTP \"/v1/endpoint\" 400 \"Bad Request\"")
 	// The returned error should contain the response body responseBody.
 
 	// An HTTP client that returns some other status code other than 400 and response body responseBody.
@@ -1623,7 +1621,7 @@ func Test_pushLogData_ShouldAddResponseTo400Error(t *testing.T) {
 	// Sending logs using the client.
 	err = splunkClient.pushLogData(context.Background(), logs)
 	require.False(t, consumererror.IsPermanent(err), "Expecting non-permanent error")
-	require.EqualError(t, err, "HTTP \"http://splunk\" 500 \"Internal Server Error\"")
+	require.EqualError(t, err, "HTTP \"/v1/endpoint\" 500 \"Internal Server Error\"")
 	// The returned error should not contain the response body responseBody.
 	assert.NotContains(t, err.Error(), responseBody)
 }

internal/splunk/httprequest.go

@@ -24,7 +24,7 @@ func HandleHTTPCode(resp *http.Response) error {
 
 	err := fmt.Errorf(
 		"HTTP %q %d %q",
-		resp.Request.URL.String(),
+		resp.Request.URL.Path,
 		resp.StatusCode,
 		http.StatusText(resp.StatusCode),
 	)

internal/splunk/httprequest_test.go

@@ -55,7 +55,7 @@ func TestConsumeMetrics(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			resp := &http.Response{
 				Request: &http.Request{
-					URL: &url.URL{Scheme: "http", Host: "splunk.com"},
+					URL: &url.URL{Scheme: "http", Host: "splunk.com", Path: "/endpoint"},
 				},
 				StatusCode: tt.httpResponseCode,
 			}
@@ -78,7 +78,7 @@ func TestConsumeMetrics(t *testing.T) {
 			}
 
 			if tt.wantThrottleErr {
-				expected := fmt.Errorf("HTTP \"http://splunk.com\" %d %q", tt.httpResponseCode, http.StatusText(tt.httpResponseCode))
+				expected := fmt.Errorf("HTTP \"/endpoint\" %d %q", tt.httpResponseCode, http.StatusText(tt.httpResponseCode))
 				expected = exporterhelper.NewThrottleRetry(expected, time.Duration(tt.retryAfter)*time.Second)
 				assert.EqualValues(t, expected, err)
 				return