Fix ECS resource detector bug

detectors/aws/ecs/ecs.go

@@ -43,27 +43,32 @@ var (
 )
 
 // Create interface for methods needing to be mocked
-type detectorUtils interface {
+type detectorUtilsResources interface {
 	getContainerName() (string, error)
 	getContainerID() (string, error)
 }
 
-// struct implements detectorUtils interface
-type ecsDetectorUtils struct{}
+// struct implements detectorUtilsResources interface
+type DetectorUtils struct{}
 
 // resource detector collects resource information from Elastic Container Service environment
-type ResourceDetector struct {
-	utils detectorUtils
+type resourceDetector struct {
+	utils detectorUtilsResources
 }
 
-// compile time assertion that ecsDetectorUtils implements detectorUtils interface
-var _ detectorUtils = (*ecsDetectorUtils)(nil)
+// compile time assertion that ecsDetectorUtils implements detectorUtilsResources interface
+var _ detectorUtilsResources = (*DetectorUtils)(nil)
 
 // compile time assertion that resource detector implements the resource.Detector interface.
-var _ resource.Detector = (*ResourceDetector)(nil)
+var _ resource.Detector = (*resourceDetector)(nil)
+
+// returns resource detector struct
+func NewResourceDetector(detectorUtils detectorUtilsResources) resource.Detector {
+	return &resourceDetector{utils: detectorUtils}
+}
 
 // Detect finds associated resources when running on ECS environment.
-func (detector *ResourceDetector) Detect(ctx context.Context) (*resource.Resource, error) {
+func (detector *resourceDetector) Detect(ctx context.Context) (*resource.Resource, error) {
 	metadataURIV3 := os.Getenv(metadataV3EnvVar)
 	metadataURIV4 := os.Getenv(metadataV4EnvVar)
 
@@ -87,7 +92,7 @@ func (detector *ResourceDetector) Detect(ctx context.Context) (*resource.Resourc
 }
 
 // returns docker container ID from default c group path
-func (ecsUtils ecsDetectorUtils) getContainerID() (string, error) {
+func (ecsUtils DetectorUtils) getContainerID() (string, error) {
 	fileData, err := ioutil.ReadFile(defaultCgroupPath)
 	if err != nil {
 		return "", errCannotReadCGroupFile
@@ -102,7 +107,7 @@ func (ecsUtils ecsDetectorUtils) getContainerID() (string, error) {
 }
 
 // returns host name reported by the kernel
-func (ecsUtils ecsDetectorUtils) getContainerName() (string, error) {
+func (ecsUtils DetectorUtils) getContainerName() (string, error) {
 	hostName, err := os.Hostname()
 	if err != nil {
 		return "", errCannotReadContainerName

detectors/aws/ecs/ecs_test.go

@@ -45,8 +45,8 @@ func (detectorUtils *MockDetectorUtils) getContainerName() (string, error) {
 //succesfully return resource when process is running on Amazon ECS environment
 func TestDetect(t *testing.T) {
 	os.Clearenv()
-	os.Setenv(metadataV3EnvVar, "3")
-	os.Setenv(metadataV4EnvVar, "4")
+	_ = os.Setenv(metadataV3EnvVar, "3")
+	_ = os.Setenv(metadataV4EnvVar, "4")
 
 	detectorUtils := new(MockDetectorUtils)
 
@@ -58,52 +58,52 @@ func TestDetect(t *testing.T) {
 		semconv.ContainerIDKey.String("0123456789A"),
 	}
 	expectedResource := resource.NewWithAttributes(labels...)
-	detector := ResourceDetector{detectorUtils}
-	resource, _ := detector.Detect(context.Background())
+	detector := NewResourceDetector(detectorUtils)
+	res, _ := detector.Detect(context.Background())
 
-	assert.Equal(t, resource, expectedResource, "Resource returned is incorrect")
+	assert.Equal(t, res, expectedResource, "Resource returned is incorrect")
 }
 
 //returns empty resource when detector cannot read container ID
 func TestDetectCannotReadContainerID(t *testing.T) {
 	os.Clearenv()
-	os.Setenv(metadataV3EnvVar, "3")
-	os.Setenv(metadataV4EnvVar, "4")
+	_ = os.Setenv(metadataV3EnvVar, "3")
+	_ = os.Setenv(metadataV4EnvVar, "4")
 	detectorUtils := new(MockDetectorUtils)
 
 	detectorUtils.On("getContainerName").Return("container-Name", nil)
 	detectorUtils.On("getContainerID").Return("", errCannotReadContainerID)
 
-	detector := ResourceDetector{detectorUtils}
-	resource, err := detector.Detect(context.Background())
+	detector := NewResourceDetector(detectorUtils)
+	res, err := detector.Detect(context.Background())
 
 	assert.Equal(t, errCannotReadContainerID, err)
-	assert.Equal(t, 0, len(resource.Attributes()))
+	assert.Equal(t, 0, len(res.Attributes()))
 }
 
 //returns empty resource when detector cannot read container Name
 func TestDetectCannotReadContainerName(t *testing.T) {
 	os.Clearenv()
-	os.Setenv(metadataV3EnvVar, "3")
-	os.Setenv(metadataV4EnvVar, "4")
+	_ = os.Setenv(metadataV3EnvVar, "3")
+	_ = os.Setenv(metadataV4EnvVar, "4")
 	detectorUtils := new(MockDetectorUtils)
 
 	detectorUtils.On("getContainerName").Return("", errCannotReadContainerName)
 	detectorUtils.On("getContainerID").Return("0123456789A", nil)
 
-	detector := ResourceDetector{detectorUtils}
-	resource, err := detector.Detect(context.Background())
+	detector := NewResourceDetector(detectorUtils)
+	res, err := detector.Detect(context.Background())
 
 	assert.Equal(t, errCannotReadContainerName, err)
-	assert.Equal(t, 0, len(resource.Attributes()))
+	assert.Equal(t, 0, len(res.Attributes()))
 }
 
 //returns empty resource when process is not running ECS
 func TestReturnsIfNoEnvVars(t *testing.T) {
 	os.Clearenv()
-	detector := ResourceDetector{}
-	resource, err := detector.Detect(context.Background())
+	detector := NewResourceDetector(nil)
+	res, err := detector.Detect(context.Background())
 
 	assert.Equal(t, errNotOnECS, err)
-	assert.Equal(t, 0, len(resource.Attributes()))
+	assert.Equal(t, 0, len(res.Attributes()))
 }