From 42f49d59e02e7b08ef5660e55c22175b6fb2d4e0 Mon Sep 17 00:00:00 2001
From: Pooja Reddy Nathala <poojardy@amazon.com>
Date: Wed, 25 Oct 2023 17:01:37 -0400
Subject: [PATCH] fixed linting errors

---
 test/apm/apm_test.go                    | 2 +-
 test/apm/metrics_test.go                | 3 ++-
 test/apm/resources/traceid_generator.go | 3 +++
 test/apm/traces_test.go                 | 8 +++++---
 test/metric/apm_util.go                 | 3 ++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/test/apm/apm_test.go b/test/apm/apm_test.go
index c788e0913..d1bbcd442 100644
--- a/test/apm/apm_test.go
+++ b/test/apm/apm_test.go
@@ -7,13 +7,13 @@ package apm
 
 import (
 	"fmt"
-	"github.com/aws/amazon-cloudwatch-agent-test/environment/computetype"
 	"log"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
 
 	"github.com/aws/amazon-cloudwatch-agent-test/environment"
+	"github.com/aws/amazon-cloudwatch-agent-test/environment/computetype"
 	"github.com/aws/amazon-cloudwatch-agent-test/test/metric/dimension"
 	"github.com/aws/amazon-cloudwatch-agent-test/test/status"
 	"github.com/aws/amazon-cloudwatch-agent-test/test/test_runner"
diff --git a/test/apm/metrics_test.go b/test/apm/metrics_test.go
index c1fecccc5..0d239eae3 100644
--- a/test/apm/metrics_test.go
+++ b/test/apm/metrics_test.go
@@ -6,11 +6,12 @@
 package apm
 
 import (
+	"time"
+
 	"github.com/aws/amazon-cloudwatch-agent-test/test/metric"
 	"github.com/aws/amazon-cloudwatch-agent-test/test/metric/dimension"
 	"github.com/aws/amazon-cloudwatch-agent-test/test/status"
 	"github.com/aws/amazon-cloudwatch-agent-test/test/test_runner"
-	"time"
 )
 
 const testRetryCount = 6
diff --git a/test/apm/resources/traceid_generator.go b/test/apm/resources/traceid_generator.go
index 47740fc06..a56fde0f8 100644
--- a/test/apm/resources/traceid_generator.go
+++ b/test/apm/resources/traceid_generator.go
@@ -1,3 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
 package main
 
 import (
diff --git a/test/apm/traces_test.go b/test/apm/traces_test.go
index 77d7f0373..d9f059b8d 100644
--- a/test/apm/traces_test.go
+++ b/test/apm/traces_test.go
@@ -9,12 +9,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"time"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/xray"
+
 	"github.com/aws/amazon-cloudwatch-agent-test/test/status"
 	"github.com/aws/amazon-cloudwatch-agent-test/test/test_runner"
 	"github.com/aws/amazon-cloudwatch-agent-test/util/awsservice"
-	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/service/xray"
-	"time"
 )
 
 const (
diff --git a/test/metric/apm_util.go b/test/metric/apm_util.go
index 16c7e06b4..5520841f5 100644
--- a/test/metric/apm_util.go
+++ b/test/metric/apm_util.go
@@ -6,9 +6,10 @@
 package metric
 
 import (
+	"github.com/aws/aws-sdk-go-v2/aws"
+
 	"github.com/aws/amazon-cloudwatch-agent-test/test/metric/dimension"
 	"github.com/aws/amazon-cloudwatch-agent-test/test/status"
-	"github.com/aws/aws-sdk-go-v2/aws"
 )
 
 var (