Skip to content

Commit 7d7b25d

Browse files
YiyuanzzzYiyuanzzz
committed
fix tests in agent/stats
1 parent 533fbdf commit 7d7b25d

14 files changed

+226
-204
lines changed

‎agent/app/agent.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ func (agent *ecsAgent) startAsyncRoutines(
991991
}
992992
go statsEngine.StartMetricsPublish()
993993

994-
session, err := reporter.NewDockerTelemetrySession(agent.containerInstanceARN, agent.credentialProvider, agent.cfg, deregisterInstanceEventStream,
994+
session, err := reporter.NewDockerTelemetrySession(agent.containerInstanceARN, agent.credentialsCache, agent.cfg, deregisterInstanceEventStream,
995995
client, taskEngine, telemetryMessages, healthMessages, doctor)
996996
if err != nil {
997997
seelog.Warnf("Error creating telemetry session: %v", err)
@@ -1102,7 +1102,7 @@ func (agent *ecsAgent) startACSSession(
11021102
acsSession := session.NewSession(agent.containerInstanceARN,
11031103
agent.cfg.Cluster,
11041104
client,
1105-
agent.credentialProvider,
1105+
agent.credentialsCache,
11061106
inactiveInstanceCB,
11071107
acsclient.NewACSClientFactory(),
11081108
metricsfactory.NewNopEntryFactory(),

‎agent/stats/common_test.go

+24-24
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ import (
2929
dm "github.com/aws/amazon-ecs-agent/agent/engine/daemonmanager"
3030
"github.com/aws/amazon-ecs-agent/agent/statechange"
3131
"github.com/aws/amazon-ecs-agent/ecs-agent/eventstream"
32-
"github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs"
3332

33+
"github.com/aws/aws-sdk-go-v2/aws"
3434
ecstypes "github.com/aws/aws-sdk-go-v2/service/ecs/types"
35-
"github.com/aws/aws-sdk-go/aws"
35+
tcstypes "github.com/aws/aws-sdk-go-v2/service/tcs/types"
3636
"github.com/docker/docker/api/types"
3737
dockercontainer "github.com/docker/docker/api/types/container"
3838
"github.com/docker/docker/api/types/network"
@@ -157,8 +157,8 @@ func validateInstanceMetrics(t *testing.T, engine *DockerStatsEngine, includeSer
157157
assert.Len(t, taskMetrics, 1, "incorrect number of tasks")
158158

159159
taskMetric := taskMetrics[0]
160-
assert.Equal(t, aws.StringValue(taskMetric.TaskDefinitionFamily), taskDefinitionFamily, "unexpected task definition family")
161-
assert.Equal(t, aws.StringValue(taskMetric.TaskDefinitionVersion), taskDefinitionVersion, "unexpected task definition version")
160+
assert.Equal(t, aws.ToString(taskMetric.TaskDefinitionFamily), taskDefinitionFamily, "unexpected task definition family")
161+
assert.Equal(t, aws.ToString(taskMetric.TaskDefinitionVersion), taskDefinitionVersion, "unexpected task definition version")
162162
assert.NoError(t, validateContainerMetrics(taskMetric.ContainerMetrics, 1), "validating container metrics failed")
163163
if includeServiceConnectStats {
164164
assert.NoError(t, validateServiceConnectMetrics(taskMetric.ServiceConnectMetricsWrapper, 1), "validating service connect metrics failed")
@@ -172,15 +172,15 @@ func validateInstanceMetricsWithDisabledMetrics(t *testing.T, engine *DockerStat
172172
assert.Len(t, taskMetrics, 1, "incorrect number of tasks")
173173

174174
taskMetric := taskMetrics[0]
175-
assert.Equal(t, aws.StringValue(taskMetric.TaskDefinitionFamily), taskDefinitionFamily, "unexpected task definition family")
176-
assert.Equal(t, aws.StringValue(taskMetric.TaskDefinitionVersion), taskDefinitionVersion, "unexpected task definition version")
175+
assert.Equal(t, aws.ToString(taskMetric.TaskDefinitionFamily), taskDefinitionFamily, "unexpected task definition family")
176+
assert.Equal(t, aws.ToString(taskMetric.TaskDefinitionVersion), taskDefinitionVersion, "unexpected task definition version")
177177
assert.NoError(t, validateContainerMetrics(taskMetric.ContainerMetrics, 0), "validating container metrics failed")
178178
if includeServiceConnectStats {
179179
assert.NoError(t, validateServiceConnectMetrics(taskMetric.ServiceConnectMetricsWrapper, 1), "validating service connect metrics failed")
180180
}
181181
}
182182

183-
func validateContainerMetrics(containerMetrics []*ecstcs.ContainerMetric, expected int) error {
183+
func validateContainerMetrics(containerMetrics []tcstypes.ContainerMetric, expected int) error {
184184
if len(containerMetrics) != expected {
185185
return fmt.Errorf("Mismatch in number of ContainerStatsSet elements. Expected: %d, Got: %d", expected, len(containerMetrics))
186186
}
@@ -204,7 +204,7 @@ func validateContainerMetrics(containerMetrics []*ecstcs.ContainerMetric, expect
204204
return nil
205205
}
206206

207-
func validateServiceConnectMetrics(serviceConnectMetrics []*ecstcs.GeneralMetricsWrapper, expected int) error {
207+
func validateServiceConnectMetrics(serviceConnectMetrics []tcstypes.GeneralMetricsWrapper, expected int) error {
208208
if len(serviceConnectMetrics) != expected {
209209
return fmt.Errorf("Mismatch in number of serviceConnectMetrics elements. Expected: %d, Got: %d", expected, len(serviceConnectMetrics))
210210
}
@@ -224,12 +224,12 @@ func validateIdleContainerMetrics(t *testing.T, engine *DockerStatsEngine) {
224224
assert.NoError(t, err, "getting instance metrics failed")
225225
assert.NoError(t, validateMetricsMetadata(metadata), "validating metadata failed")
226226

227-
assert.True(t, aws.BoolValue(metadata.Idle), "expected idle metadata to be true")
228-
assert.True(t, aws.BoolValue(metadata.Fin), "fin not set to true when idle")
227+
assert.True(t, metadata.Idle, "expected idle metadata to be true")
228+
assert.True(t, metadata.Fin, "fin not set to true when idle")
229229
assert.Len(t, taskMetrics, 0, "expected empty task metrics")
230230
}
231231

232-
func validateMetricsMetadata(metadata *ecstcs.MetricsMetadata) error {
232+
func validateMetricsMetadata(metadata *tcstypes.MetricsMetadata) error {
233233
if metadata == nil {
234234
return fmt.Errorf("Metadata is nil")
235235
}
@@ -248,40 +248,40 @@ func validateMetricsMetadata(metadata *ecstcs.MetricsMetadata) error {
248248
return nil
249249
}
250250

251-
func validateHealthMetricsMetadata(metadata *ecstcs.HealthMetadata) error {
251+
func validateHealthMetricsMetadata(metadata *tcstypes.HealthMetadata) error {
252252
if metadata == nil {
253253
return fmt.Errorf("metadata is nil")
254254
}
255255

256-
if aws.StringValue(metadata.Cluster) != defaultCluster {
256+
if aws.ToString(metadata.Cluster) != defaultCluster {
257257
return fmt.Errorf("expected cluster in metadata to be: %s, got %s",
258-
defaultCluster, aws.StringValue(metadata.Cluster))
258+
defaultCluster, aws.ToString(metadata.Cluster))
259259
}
260260

261-
if aws.StringValue(metadata.ContainerInstance) != defaultContainerInstance {
261+
if aws.ToString(metadata.ContainerInstance) != defaultContainerInstance {
262262
return fmt.Errorf("expected container instance in metadata to be %s, got %s",
263-
defaultContainerInstance, aws.StringValue(metadata.ContainerInstance))
263+
defaultContainerInstance, aws.ToString(metadata.ContainerInstance))
264264
}
265-
if len(aws.StringValue(metadata.MessageId)) == 0 {
265+
if len(aws.ToString(metadata.MessageId)) == 0 {
266266
return fmt.Errorf("empty MessageId")
267267
}
268268

269269
return nil
270270
}
271271

272-
func validateContainerHealthMetrics(metrics []*ecstcs.ContainerHealth, expected int) error {
272+
func validateContainerHealthMetrics(metrics []tcstypes.ContainerHealth, expected int) error {
273273
if len(metrics) != expected {
274274
return fmt.Errorf("mismatch in number of ContainerHealth elements. Expected: %d, Got: %d",
275275
expected, len(metrics))
276276
}
277277
for _, health := range metrics {
278-
if aws.StringValue(health.ContainerName) == "" {
278+
if aws.ToString(health.ContainerName) == "" {
279279
return fmt.Errorf("container name is empty")
280280
}
281-
if aws.StringValue(health.HealthStatus) == "" {
281+
if health.HealthStatus == "" {
282282
return fmt.Errorf("container health status is empty")
283283
}
284-
if aws.TimeValue(health.StatusSince).IsZero() {
284+
if health.StatusSince.IsZero() {
285285
return fmt.Errorf("container health status change timestamp is empty")
286286
}
287287
}
@@ -293,9 +293,9 @@ func validateTaskHealthMetrics(t *testing.T, engine *DockerStatsEngine) {
293293
assert.NoError(t, err, "getting task health metrics failed")
294294
require.Len(t, healthMetrics, 1)
295295
assert.NoError(t, validateHealthMetricsMetadata(healthMetadata), "validating health metedata failed")
296-
assert.Equal(t, aws.StringValue(healthMetrics[0].TaskArn), taskArn, "task arn not expected")
297-
assert.Equal(t, aws.StringValue(healthMetrics[0].TaskDefinitionFamily), taskDefinitionFamily, "task definition family not expected")
298-
assert.Equal(t, aws.StringValue(healthMetrics[0].TaskDefinitionVersion), taskDefinitionVersion, "task definition version not expected")
296+
assert.Equal(t, aws.ToString(healthMetrics[0].TaskArn), taskArn, "task arn not expected")
297+
assert.Equal(t, aws.ToString(healthMetrics[0].TaskDefinitionFamily), taskDefinitionFamily, "task definition family not expected")
298+
assert.Equal(t, aws.ToString(healthMetrics[0].TaskDefinitionVersion), taskDefinitionVersion, "task definition version not expected")
299299
assert.NoError(t, validateContainerHealthMetrics(healthMetrics[0].Containers, 1))
300300
}
301301

‎agent/stats/container_test.go

+17-16
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
3535
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
3636
ni "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/networkinterface"
37+
3738
"github.com/docker/docker/api/types"
3839
"github.com/golang/mock/gomock"
3940
"github.com/stretchr/testify/require"
@@ -105,34 +106,34 @@ func TestContainerStatsCollection(t *testing.T) {
105106
if err != nil {
106107
t.Fatal("Error gettting cpu stats set:", err)
107108
}
108-
if *cpuStatsSet.Min == math.MaxFloat64 || math.IsNaN(*cpuStatsSet.Min) {
109-
t.Error("Min value incorrectly set: ", *cpuStatsSet.Min)
109+
if cpuStatsSet.Min == math.MaxFloat64 || math.IsNaN(cpuStatsSet.Min) {
110+
t.Error("Min value incorrectly set: ", cpuStatsSet.Min)
110111
}
111-
if *cpuStatsSet.Max == -math.MaxFloat64 || math.IsNaN(*cpuStatsSet.Max) {
112-
t.Error("Max value incorrectly set: ", *cpuStatsSet.Max)
112+
if cpuStatsSet.Max == -math.MaxFloat64 || math.IsNaN(cpuStatsSet.Max) {
113+
t.Error("Max value incorrectly set: ", cpuStatsSet.Max)
113114
}
114-
if *cpuStatsSet.SampleCount == 0 {
115+
if cpuStatsSet.SampleCount == 0 {
115116
t.Error("Samplecount is 0")
116117
}
117-
if *cpuStatsSet.Sum == 0 {
118-
t.Error("Sum value incorrectly set: ", *cpuStatsSet.Sum)
118+
if cpuStatsSet.Sum == 0 {
119+
t.Error("Sum value incorrectly set: ", cpuStatsSet.Sum)
119120
}
120121

121122
memStatsSet, err := container.statsQueue.GetMemoryStatsSet()
122123
if err != nil {
123124
t.Error("Error gettting cpu stats set:", err)
124125
}
125-
if *memStatsSet.Min == math.MaxFloat64 {
126-
t.Error("Min value incorrectly set: ", *memStatsSet.Min)
126+
if memStatsSet.Min == math.MaxFloat64 {
127+
t.Error("Min value incorrectly set: ", memStatsSet.Min)
127128
}
128-
if *memStatsSet.Max == 0 {
129-
t.Error("Max value incorrectly set: ", *memStatsSet.Max)
129+
if memStatsSet.Max == 0 {
130+
t.Error("Max value incorrectly set: ", memStatsSet.Max)
130131
}
131-
if *memStatsSet.SampleCount == 0 {
132+
if memStatsSet.SampleCount == 0 {
132133
t.Error("Samplecount is 0")
133134
}
134-
if *memStatsSet.Sum == 0 {
135-
t.Error("Sum value incorrectly set: ", *memStatsSet.Sum)
135+
if memStatsSet.Sum == 0 {
136+
t.Error("Sum value incorrectly set: ", memStatsSet.Sum)
136137
}
137138

138139
restartStatSet, err := container.statsQueue.GetRestartStatsSet()
@@ -227,7 +228,7 @@ func TestContainerStatsCollection_WithRestartPolicy(t *testing.T) {
227228

228229
restartStatSet, err := container.statsQueue.GetRestartStatsSet()
229230
require.NoError(t, err)
230-
require.Equal(t, int64(numStatsPreRestart), *restartStatSet.RestartCount)
231+
require.Equal(t, int32(numStatsPreRestart), restartStatSet.RestartCount)
231232
// Reset sets all of the existing stats to "sent" status in the stats queue
232233
container.statsQueue.Reset()
233234

@@ -240,7 +241,7 @@ func TestContainerStatsCollection_WithRestartPolicy(t *testing.T) {
240241
// restarts to TCS.
241242
require.Equal(t, totalNumStats, restartTracker.GetRestartCount(), fmt.Sprintf(
242243
"Raw restart count should be %d + %d = %d", numStatsPreRestart, numStatsPostRestart, totalNumStats))
243-
require.Equal(t, int64(numStatsPostRestart), *restartStatSet.RestartCount, fmt.Sprintf(
244+
require.Equal(t, int32(numStatsPostRestart), restartStatSet.RestartCount, fmt.Sprintf(
244245
"Metric sent to TCS should be %d - %d = %d", totalNumStats, numStatsPreRestart, numStatsPostRestart))
245246
container.StopStatsCollection()
246247
}

‎agent/stats/engine.go

+19-4
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ import (
4545
"github.com/aws/amazon-ecs-agent/ecs-agent/stats"
4646
"github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs"
4747

48+
"github.com/aws/aws-sdk-go-v2/aws"
4849
tcstypes "github.com/aws/aws-sdk-go-v2/service/tcs/types"
49-
"github.com/aws/aws-sdk-go/aws"
5050
"github.com/docker/docker/api/types"
5151
)
5252

@@ -78,9 +78,9 @@ type DockerContainerMetadataResolver struct {
7878
// Engine defines methods to be implemented by the engine struct. It is
7979
// defined to make testing easier.
8080
type Engine interface {
81-
GetInstanceMetrics(includeServiceConnectStats bool) (*tcstypes.MetricsMetadata, []*tcstypes.TaskMetric, error)
81+
GetInstanceMetrics(includeServiceConnectStats bool) (*tcstypes.MetricsMetadata, []tcstypes.TaskMetric, error)
8282
ContainerDockerStats(taskARN string, containerID string) (*types.StatsJSON, *stats.NetworkStatsPerSec, error)
83-
GetTaskHealthMetrics() (*tcstypes.HealthMetadata, []*tcstypes.TaskHealth, error)
83+
GetTaskHealthMetrics() (*tcstypes.HealthMetadata, []tcstypes.TaskHealth, error)
8484
GetPublishServiceConnectTickerInterval() int32
8585
SetPublishServiceConnectTickerInterval(int32)
8686
GetPublishMetricsTicker() *time.Ticker
@@ -587,7 +587,7 @@ func (engine *DockerStatsEngine) GetInstanceMetrics(includeServiceConnectStats b
587587
if includeServiceConnectStats {
588588
if serviceConnectStats, ok := engine.taskToServiceConnectStats[taskArn]; ok {
589589
if !serviceConnectStats.HasStatsBeenSent() {
590-
taskMetric.ServiceConnectMetricsWrapper = serviceConnectStats.GetStats()
590+
taskMetric.ServiceConnectMetricsWrapper = convertPtrSliceToValueSlice(serviceConnectStats.GetStats())
591591
seelog.Debugf("Adding service connect stats for task : %s", taskArn)
592592
serviceConnectStats.SetStatsSent(true)
593593
}
@@ -1157,3 +1157,18 @@ func (engine *DockerStatsEngine) getVolumeMetricsWithTimeout(volumeId, hostPath
11571157
defer cancel()
11581158
return engine.csiClient.GetVolumeMetrics(derivedCtx, volumeId, hostPath)
11591159
}
1160+
1161+
// convertPtrSliceToValueSlice converts a slice of GeneralMetricsWrapper pointers to a slice of values
1162+
func convertPtrSliceToValueSlice(ptrSlice []*tcstypes.GeneralMetricsWrapper) []tcstypes.GeneralMetricsWrapper {
1163+
if ptrSlice == nil {
1164+
return nil
1165+
}
1166+
1167+
result := make([]tcstypes.GeneralMetricsWrapper, 0, len(ptrSlice))
1168+
for _, ptr := range ptrSlice {
1169+
if ptr != nil {
1170+
result = append(result, *ptr)
1171+
}
1172+
}
1173+
return result
1174+
}

‎agent/stats/engine_test.go

+20-18
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ import (
3838
mock_csiclient "github.com/aws/amazon-ecs-agent/ecs-agent/csiclient/mocks"
3939
ni "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/networkinterface"
4040
"github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs"
41-
"github.com/aws/aws-sdk-go/aws"
41+
42+
"github.com/aws/aws-sdk-go-v2/aws"
43+
tcstypes "github.com/aws/aws-sdk-go-v2/service/tcs/types"
4244
"github.com/docker/docker/api/types"
4345
"github.com/golang/mock/gomock"
4446
"github.com/stretchr/testify/assert"
@@ -468,7 +470,7 @@ func TestStartMetricsPublish(t *testing.T) {
468470
telemetryMessage := <-telemetryMessages
469471
if tc.expectedNonEmptyMetricsMsg {
470472
assert.NotEmpty(t, telemetryMessage.TaskMetrics)
471-
assert.NotZero(t, *telemetryMessage.TaskMetrics[0].ContainerMetrics[0].StorageStatsSet.ReadSizeBytes.Sum)
473+
assert.NotZero(t, telemetryMessage.TaskMetrics[0].ContainerMetrics[0].StorageStatsSet.ReadSizeBytes.Sum)
472474
} else {
473475
assert.Empty(t, telemetryMessage.TaskMetrics)
474476
}
@@ -496,7 +498,7 @@ func TestStartMetricsPublish(t *testing.T) {
496498
healthMessage := <-healthMessages
497499
assert.NotEmpty(t, telemetryMessage.TaskMetrics)
498500
assert.NotEmpty(t, healthMessage.HealthMetrics)
499-
assert.Zero(t, *telemetryMessage.TaskMetrics[0].ContainerMetrics[0].StorageStatsSet.ReadSizeBytes.Sum)
501+
assert.Zero(t, telemetryMessage.TaskMetrics[0].ContainerMetrics[0].StorageStatsSet.ReadSizeBytes.Sum)
500502
}
501503

502504
cancel()
@@ -571,10 +573,10 @@ func TestGetTaskHealthMetrics(t *testing.T) {
571573
metadata, taskHealth, err := engine.GetTaskHealthMetrics()
572574
assert.NoError(t, err)
573575

574-
assert.Equal(t, aws.StringValue(metadata.ContainerInstance), "container_instance")
576+
assert.Equal(t, aws.ToString(metadata.ContainerInstance), "container_instance")
575577
assert.Len(t, taskHealth, 1)
576578
assert.Len(t, taskHealth[0].Containers, 1)
577-
assert.Equal(t, aws.StringValue(taskHealth[0].Containers[0].HealthStatus), "HEALTHY")
579+
assert.Equal(t, tcstypes.HealthStatusHealthy, taskHealth[0].Containers[0].HealthStatus)
578580
}
579581

580582
func TestGetTaskHealthMetricsStoppedContainer(t *testing.T) {
@@ -818,7 +820,7 @@ func TestFetchEBSVolumeMetrics(t *testing.T) {
818820
tcs := []struct {
819821
name string
820822
setCSIClientExpectation func(*mock_csiclient.MockCSIClient)
821-
expectedMetrics []*ecstcs.VolumeMetric
823+
expectedMetrics []tcstypes.VolumeMetric
822824
numMetrics int
823825
}{
824826
{
@@ -829,21 +831,21 @@ func TestFetchEBSVolumeMetrics(t *testing.T) {
829831
Capacity: 20 * 1024 * 1024 * 1024,
830832
}, nil).Times(1)
831833
},
832-
expectedMetrics: []*ecstcs.VolumeMetric{
834+
expectedMetrics: []tcstypes.VolumeMetric{
833835
{
834836
VolumeId: aws.String("vol-12345"),
835837
VolumeName: aws.String("test-volume"),
836-
Utilized: &ecstcs.UDoubleCWStatsSet{
837-
Max: aws.Float64(15 * 1024 * 1024 * 1024),
838-
Min: aws.Float64(15 * 1024 * 1024 * 1024),
839-
SampleCount: aws.Int64(1),
840-
Sum: aws.Float64(15 * 1024 * 1024 * 1024),
838+
Utilized: &tcstypes.UDoubleCWStatsSet{
839+
Max: *aws.Float64(15 * 1024 * 1024 * 1024),
840+
Min: *aws.Float64(15 * 1024 * 1024 * 1024),
841+
SampleCount: *aws.Int32(1),
842+
Sum: *aws.Float64(15 * 1024 * 1024 * 1024),
841843
},
842-
Size: &ecstcs.UDoubleCWStatsSet{
843-
Max: aws.Float64(20 * 1024 * 1024 * 1024),
844-
Min: aws.Float64(20 * 1024 * 1024 * 1024),
845-
SampleCount: aws.Int64(1),
846-
Sum: aws.Float64(20 * 1024 * 1024 * 1024),
844+
Size: &tcstypes.UDoubleCWStatsSet{
845+
Max: *aws.Float64(20 * 1024 * 1024 * 1024),
846+
Min: *aws.Float64(20 * 1024 * 1024 * 1024),
847+
SampleCount: *aws.Int32(1),
848+
Sum: *aws.Float64(20 * 1024 * 1024 * 1024),
847849
},
848850
},
849851
},
@@ -904,7 +906,7 @@ func TestFetchEBSVolumeMetrics(t *testing.T) {
904906
actualMetrics := engine.fetchEBSVolumeMetrics(t1, "t1")
905907

906908
assert.Len(t, actualMetrics, tc.numMetrics)
907-
assert.Equal(t, actualMetrics, tc.expectedMetrics)
909+
assert.Equal(t, tc.expectedMetrics, actualMetrics)
908910
})
909911
}
910912

‎agent/stats/engine_unix_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
3232
ni "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/networkinterface"
3333
"github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs"
34-
"github.com/aws/aws-sdk-go/aws"
34+
"github.com/aws/aws-sdk-go-v2/aws"
3535
"github.com/docker/docker/api/types"
3636
"github.com/golang/mock/gomock"
3737
"github.com/stretchr/testify/assert"
@@ -286,7 +286,7 @@ func TestStartMetricsPublishForChannelFull(t *testing.T) {
286286
telemetryMessage := <-telemetryMessages
287287
if tc.expectedNonEmptyMetricsMsg {
288288
assert.NotEmpty(t, telemetryMessage.TaskMetrics)
289-
assert.NotZero(t, *telemetryMessage.TaskMetrics[0].ContainerMetrics[0].StorageStatsSet.ReadSizeBytes.Sum)
289+
assert.NotZero(t, telemetryMessage.TaskMetrics[0].ContainerMetrics[0].StorageStatsSet.ReadSizeBytes.Sum)
290290
} else {
291291
assert.Empty(t, telemetryMessage.TaskMetrics)
292292
}
@@ -314,7 +314,7 @@ func TestStartMetricsPublishForChannelFull(t *testing.T) {
314314
healthMessage := <-healthMessages
315315
assert.NotEmpty(t, telemetryMessage.TaskMetrics)
316316
assert.NotEmpty(t, healthMessage.HealthMetrics)
317-
assert.Zero(t, *telemetryMessage.TaskMetrics[0].ContainerMetrics[0].StorageStatsSet.ReadSizeBytes.Sum)
317+
assert.Zero(t, telemetryMessage.TaskMetrics[0].ContainerMetrics[0].StorageStatsSet.ReadSizeBytes.Sum)
318318
}
319319

320320
cancel()

0 commit comments

Comments
 (0)