Change

aws · Dec 17, 2024 · a9b5116 · a9b5116
1 parent d59d4dd
commit a9b5116
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/ecs-agent/acs/session/session_test.go b/ecs-agent/acs/session/session_test.go
@@ -229,7 +229,7 @@ func TestSessionReconnectsOnConnectErrors(t *testing.T) {
 
 	mockACSConnectEndpointEntry := mock_metrics.NewMockEntry(ctrl)
 	mockACSConnectEndpointEntry.EXPECT().Done(gomock.Any()).AnyTimes()
-	mockMetricsFactory.EXPECT().New("ACSStartSession.ACSConnectEndpointDuration").Return(mockACSConnectEndpointEntry).AnyTimes()
+	mockMetricsFactory.EXPECT().New("ACSSession.ACSConnect").Return(mockACSConnectEndpointEntry).AnyTimes()
 
 	ecsClient := mock_ecs.NewMockECSClient(ctrl)
 	ecsClient.EXPECT().DiscoverPollEndpoint(gomock.Any()).Return(acsURL, nil).AnyTimes()
@@ -357,7 +357,7 @@ func TestSessionReconnectsWithoutBackoffOnEOFError(t *testing.T) {
 
 	mockACSConnectEndpointEntry := mock_metrics.NewMockEntry(ctrl)
 	mockACSConnectEndpointEntry.EXPECT().Done(gomock.Any()).AnyTimes()
-	mockMetricsFactory.EXPECT().New("ACSStartSession.ACSConnectEndpointDuration").Return(mockACSConnectEndpointEntry).AnyTimes()
+	mockMetricsFactory.EXPECT().New("ACSSession.ACSConnect").Return(mockACSConnectEndpointEntry).AnyTimes()
 
 	ecsClient := mock_ecs.NewMockECSClient(ctrl)
 	ecsClient.EXPECT().DiscoverPollEndpoint(gomock.Any()).Return(acsURL, nil).AnyTimes()
@@ -413,7 +413,7 @@ func TestSessionReconnectsWithBackoffOnNonEOFError(t *testing.T) {
 
 	mockACSConnectEndpointEntry := mock_metrics.NewMockEntry(ctrl)
 	mockACSConnectEndpointEntry.EXPECT().Done(gomock.Any()).AnyTimes()
-	mockMetricsFactory.EXPECT().New("ACSStartSession.ACSConnectEndpointDuration").Return(mockACSConnectEndpointEntry).AnyTimes()
+	mockMetricsFactory.EXPECT().New("ACSSession.ACSConnect").Return(mockACSConnectEndpointEntry).AnyTimes()
 
 	ecsClient := mock_ecs.NewMockECSClient(ctrl)
 	ecsClient.EXPECT().DiscoverPollEndpoint(gomock.Any()).Return(acsURL, nil).AnyTimes()
@@ -470,7 +470,7 @@ func TestSessionCallsInactiveInstanceCB(t *testing.T) {
 
 	mockACSConnectEndpointEntry := mock_metrics.NewMockEntry(ctrl)
 	mockACSConnectEndpointEntry.EXPECT().Done(gomock.Any()).AnyTimes()
-	mockMetricsFactory.EXPECT().New("ACSStartSession.ACSConnectEndpointDuration").Return(mockACSConnectEndpointEntry).AnyTimes()
+	mockMetricsFactory.EXPECT().New("ACSSession.ACSConnect").Return(mockACSConnectEndpointEntry).AnyTimes()
 
 	ecsClient := mock_ecs.NewMockECSClient(ctrl)
 	ecsClient.EXPECT().DiscoverPollEndpoint(gomock.Any()).Return(acsURL, nil).AnyTimes()
@@ -532,7 +532,7 @@ func TestSessionReconnectDelayForInactiveInstanceError(t *testing.T) {
 
 	mockACSConnectEndpointEntry := mock_metrics.NewMockEntry(ctrl)
 	mockACSConnectEndpointEntry.EXPECT().Done(gomock.Any()).AnyTimes()
-	mockMetricsFactory.EXPECT().New("ACSStartSession.ACSConnectEndpointDuration").Return(mockACSConnectEndpointEntry).AnyTimes()
+	mockMetricsFactory.EXPECT().New("ACSSession.ACSConnect").Return(mockACSConnectEndpointEntry).AnyTimes()
 
 	ecsClient := mock_ecs.NewMockECSClient(ctrl)
 	ecsClient.EXPECT().DiscoverPollEndpoint(gomock.Any()).Return(acsURL, nil).AnyTimes()
@@ -599,7 +599,7 @@ func TestSessionReconnectsOnServeErrors(t *testing.T) {
 
 	mockACSConnectEndpointEntry := mock_metrics.NewMockEntry(ctrl)
 	mockACSConnectEndpointEntry.EXPECT().Done(gomock.Any()).AnyTimes()
-	mockMetricsFactory.EXPECT().New("ACSStartSession.ACSConnectEndpointDuration").Return(mockACSConnectEndpointEntry).AnyTimes()
+	mockMetricsFactory.EXPECT().New("ACSSession.ACSConnect").Return(mockACSConnectEndpointEntry).AnyTimes()
 
 	ecsClient := mock_ecs.NewMockECSClient(ctrl)
 	ecsClient.EXPECT().DiscoverPollEndpoint(gomock.Any()).Return(acsURL, nil).AnyTimes()
@@ -655,7 +655,7 @@ func TestSessionStopsWhenContextIsCanceled(t *testing.T) {
 
 	mockACSConnectEndpointEntry := mock_metrics.NewMockEntry(ctrl)
 	mockACSConnectEndpointEntry.EXPECT().Done(gomock.Any()).AnyTimes()
-	mockMetricsFactory.EXPECT().New("ACSStartSession.ACSConnectEndpointDuration").Return(mockACSConnectEndpointEntry).AnyTimes()
+	mockMetricsFactory.EXPECT().New("ACSSession.ACSConnect").Return(mockACSConnectEndpointEntry).AnyTimes()
 
 	ecsClient := mock_ecs.NewMockECSClient(ctrl)
 	ecsClient.EXPECT().DiscoverPollEndpoint(gomock.Any()).Return(acsURL, nil).AnyTimes()
@@ -707,7 +707,7 @@ func TestSessionStopsWhenContextIsErrorDueToTimeout(t *testing.T) {
 
 	mockACSConnectEndpointEntry := mock_metrics.NewMockEntry(ctrl)
 	mockACSConnectEndpointEntry.EXPECT().Done(gomock.Any())
-	mockMetricsFactory.EXPECT().New("ACSStartSession.ACSConnectEndpointDuration").Return(mockACSConnectEndpointEntry)
+	mockMetricsFactory.EXPECT().New("ACSSession.ACSConnect").Return(mockACSConnectEndpointEntry)
 
 	ecsClient := mock_ecs.NewMockECSClient(ctrl)
 	ecsClient.EXPECT().DiscoverPollEndpoint(gomock.Any()).Return(acsURL, nil).AnyTimes()
@@ -755,7 +755,7 @@ func TestSessionReconnectsOnDiscoverPollEndpointError(t *testing.T) {
 
 	mockACSConnectEndpointEntry := mock_metrics.NewMockEntry(ctrl)
 	mockACSConnectEndpointEntry.EXPECT().Done(gomock.Any())
-	mockMetricsFactory.EXPECT().New("ACSStartSession.ACSConnectEndpointDuration").Return(mockACSConnectEndpointEntry)
+	mockMetricsFactory.EXPECT().New("ACSSession.ACSConnect").Return(mockACSConnectEndpointEntry)
 
 	ecsClient := mock_ecs.NewMockECSClient(ctrl)
 	ctx, cancel := context.WithCancel(context.Background())
@@ -823,7 +823,7 @@ func TestConnectionIsClosedOnIdle(t *testing.T) {
 	mockMetricsFactory := mock_metrics.NewMockEntryFactory(ctrl)
 
 	mockACSConnectEndpointEntry := mock_metrics.NewMockEntry(ctrl)
-	mockMetricsFactory.EXPECT().New("ACSStartSession.ACSConnectEndpointDuration").Return(mockACSConnectEndpointEntry)
+	mockMetricsFactory.EXPECT().New("ACSSession.ACSConnect").Return(mockACSConnectEndpointEntry)
 	mockACSConnectEndpointEntry.EXPECT().Done(gomock.Any())
 
 	ecsClient := mock_ecs.NewMockECSClient(ctrl)
@@ -1077,7 +1077,7 @@ func TestSessionCorrectlySetsSendCredentials(t *testing.T) {
 	mockMetricsFactory := mock_metrics.NewMockEntryFactory(ctrl)
 
 	mockACSConnectEndpointEntry := mock_metrics.NewMockEntry(ctrl)
-	mockMetricsFactory.EXPECT().New("ACSStartSession.ACSConnectEndpointDuration").Return(mockACSConnectEndpointEntry).Times(10)
+	mockMetricsFactory.EXPECT().New("ACSSession.ACSConnect").Return(mockACSConnectEndpointEntry).Times(10)
 	mockACSConnectEndpointEntry.EXPECT().Done(gomock.Any()).Times(10)
 
 	const numInvocations = 10