Update main-gazpacho with main (#474)

aws · Aug 29, 2023 · 6e7b74a · 6e7b74a
2 parents fa205eb + 5f876eb
commit 6e7b74a
Show file tree

Hide file tree

Showing 475 changed files with 1,672 additions and 1,812 deletions.
diff --git a/.github/repo_sync_pr_template.md b/.github/repo_sync_pr_template.md
@@ -26,7 +26,6 @@ Some useful commands
 
 ### Best practices 
 
-* Remember to update all references from `amazon-cloudwatch-agent` to `private-amazon-cloudwatch-agent-staging`
 * Resolve the `go.sum` with `go mod tidy`. Don't bother manually resolving conflicts in this file
 * When finished, ensure builds work by using `make build` or `make release`
 * When unsure or blocked, do a deep dive on the `git blame` for greater context. Maybe even look for the associated PR's and ask the original authors and PR approvers

diff --git a/.github/workflows/clean-aws-resources.yml b/.github/workflows/clean-aws-resources.yml
@@ -151,4 +151,40 @@ jobs:
           aws-region: us-west-2
 
       - name: Clean old ecs cluster
-        run: go run ./tool/clean/clean_ecs/clean_ecs.go --tags=clean
+        run: go run ./tool/clean/clean_ecs/clean_ecs.go --tags=clean
+
+  clean-eks-clusters:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ secrets.TERRAFORM_AWS_ASSUME_ROLE }}
+          aws-region: us-west-2
+
+      - name: Clean old eks cluster
+        run: go run ./tool/clean/clean_eks/clean_eks.go --tags=clean
+
+  clean-asg:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ secrets.TERRAFORM_AWS_ASSUME_ROLE }}
+          aws-region: us-west-2
+
+      - name: Clean old asg
+        run: go run ./tool/clean/clean_auto_scaling_groups/clean_auto_scaling_groups.go --tags=clean
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -618,7 +618,7 @@ jobs:
             else
               cd terraform/ecs_ec2/daemon
             fi
-
+            
             terraform init
             if terraform apply --auto-approve\
               -var="test_dir=${{ matrix.arrays.test_dir }}"\
@@ -700,7 +700,7 @@ jobs:
             else
               cd terraform/ecs_fargate/linux
             fi
-
+            
             terraform init
             if terraform apply --auto-approve\
               -var="test_dir=${{ matrix.arrays.test_dir }}"\
@@ -1024,80 +1024,6 @@ jobs:
           retry_wait_seconds: 5
           command: cd terraform/stress && terraform destroy --auto-approve
 
-  TracesLinuxIntegrationTest:
-    needs: [BuildAndUpload]
-    name: 'TracesLinuxIntegrationTest'
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      contents: read
-    steps:
-      - name: Checkout CWA Test
-        uses: actions/checkout@v3
-        with:
-          repository: ${{env.CWA_GITHUB_TEST_REPO_NAME}}
-          ref: ${{env.CWA_GITHUB_TEST_REPO_BRANCH}}
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
-        with:
-          role-to-assume: ${{ env.TERRAFORM_AWS_ASSUME_ROLE }}
-          aws-region: us-west-2
-          role-duration-seconds: ${{ env.TERRAFORM_AWS_ASSUME_ROLE_DURATION }}
-
-      - name: Cache if success
-        id: traces-integration-test
-        uses: actions/cache@v3
-        with:
-          path: go.mod
-          key: traces-integration-test-${{ github.sha }}
-
-      # nick-fields/retry@v2 starts at base dir
-      - name: Terraform apply
-        if: steps.traces-integration-test.outputs.cache-hit != 'true'
-        uses: nick-fields/retry@v2
-        env:
-          TF_VAR_test_name: trace
-          TF_VAR_ssh_key_name: ${{ env.KEY_NAME }}
-          TF_VAR_ssh_key_value: ${{ env.PRIVATE_KEY }}
-          TF_VAR_user: ec2-user
-          TF_VAR_ami: cloudwatch-agent-integration-test-al2*
-          TF_VAR_arc: amd64
-          TF_VAR_ec2_instance_type: t3a.medium
-          TF_VAR_github_test_repo: ${{ env.CWA_GITHUB_TEST_REPO_URL }}
-          TF_VAR_github_test_repo_branch: ${{ env.CWA_GITHUB_TEST_REPO_BRANCH }}
-          TF_VAR_cwa_github_sha: ${{ github.sha }}
-          TF_VAR_s3_bucket: ${{ env.S3_INTEGRATION_BUCKET }}
-          TF_VAR_binary_name: amazon-cloudwatch-agent.rpm
-          TF_VAR_install_agent: go run ./install/install_agent.go rpm
-          TF_VAR_pre_test_setup: |
-            git clone https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/aws/private-amazon-cloudwatch-agent-staging.git ccwa
-            cd ccwa
-            git checkout ${{ github.sha }}
-            cd test
-        with:
-          max_attempts: 3
-          timeout_minutes: 60
-          retry_wait_seconds: 5
-          command: |
-            cd terraform/ec2/linux
-
-            terraform init
-            if terraform apply --auto-approve -var="test_dir=./trace" ; then terraform destroy -auto-approve
-            else
-              terraform destroy -auto-approve && exit 1
-            fi
-
-      #This is here just in case workflow cancel
-      - name: Terraform destroy
-        if: ${{ cancelled() || failure() }}
-        uses: nick-fields/retry@v2
-        with:
-          max_attempts: 3
-          timeout_minutes: 8
-          retry_wait_seconds: 5
-          command: cd terraform/ec2/linux && terraform destroy --auto-approve
-
   LogsAPILinuxIntegrationTest:
     needs: [BuildAndUpload]
     name: 'LogsAPILinuxIntegrationTest'

diff --git a/.golangci.yml b/.golangci.yml
@@ -38,7 +38,7 @@ linters-settings:
   goimports:
     # Put imports beginning with prefix after 3rd-party packages.
     # It's a comma-separated list of prefixes.
-    local-prefixes: github.com/aws/private-amazon-cloudwatch-agent-staging
+    local-prefixes: github.com/aws/amazon-cloudwatch-agent
   misspell:
     # Correct spellings using locale preferences for US or UK.
     # Default is to use a neutral variety of English.

diff --git a/Makefile b/Makefile
@@ -17,8 +17,8 @@ endif
 
 BUILD := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 LDFLAGS = -s -w
-LDFLAGS +=  -X github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo.VersionStr=${VERSION}
-LDFLAGS +=  -X github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo.BuildStr=${BUILD}
+LDFLAGS +=  -X github.com/aws/amazon-cloudwatch-agent/cfg/agentinfo.VersionStr=${VERSION}
+LDFLAGS +=  -X github.com/aws/amazon-cloudwatch-agent/cfg/agentinfo.BuildStr=${BUILD}
 LINUX_AMD64_BUILD = CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -buildmode=${CWAGENT_BUILD_MODE} -ldflags="${LDFLAGS}" -o $(BUILD_SPACE)/bin/linux_amd64
 LINUX_ARM64_BUILD = CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -trimpath -buildmode=${CWAGENT_BUILD_MODE} -ldflags="${LDFLAGS}" -o $(BUILD_SPACE)/bin/linux_arm64
 WIN_BUILD = GOOS=windows GOARCH=amd64 go build -trimpath -buildmode=${CWAGENT_BUILD_MODE} -ldflags="${LDFLAGS}" -o $(BUILD_SPACE)/bin/windows_amd64
@@ -28,7 +28,7 @@ DARWIN_BUILD_ARM64 = CGO_ENABLED=1 GO111MODULE=on GOOS=darwin GOARCH=arm64 go bu
 IMAGE = amazon/cloudwatch-agent:$(VERSION)
 DOCKER_BUILD_FROM_SOURCE = docker build -t $(IMAGE) -f ./amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile
 
-CW_AGENT_IMPORT_PATH=github.com/aws/private-amazon-cloudwatch-agent-staging
+CW_AGENT_IMPORT_PATH=github.com/aws/amazon-cloudwatch-agent
 ALL_SRC := $(shell find . -name '*.go' -type f | sort)
 TOOLS_BIN_DIR := $(abspath ./build/tools)
 
@@ -61,55 +61,55 @@ copy-version-file: create-version-file
 
 amazon-cloudwatch-agent-linux: copy-version-file
 	@echo Building CloudWatchAgent for Linux,Debian with ARM64 and AMD64
-	$(LINUX_AMD64_BUILD)/config-downloader github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-downloader
-	$(LINUX_ARM64_BUILD)/config-downloader github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-downloader
-	$(LINUX_AMD64_BUILD)/config-translator github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-translator
-	$(LINUX_ARM64_BUILD)/config-translator github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-translator
-	$(LINUX_AMD64_BUILD)/amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent
-	$(LINUX_ARM64_BUILD)/amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent
-	$(LINUX_AMD64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/start-amazon-cloudwatch-agent
-	$(LINUX_ARM64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/start-amazon-cloudwatch-agent
-	$(LINUX_AMD64_BUILD)/amazon-cloudwatch-agent-config-wizard github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent-config-wizard
-	$(LINUX_ARM64_BUILD)/amazon-cloudwatch-agent-config-wizard github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent-config-wizard
+	$(LINUX_AMD64_BUILD)/config-downloader github.com/aws/amazon-cloudwatch-agent/cmd/config-downloader
+	$(LINUX_ARM64_BUILD)/config-downloader github.com/aws/amazon-cloudwatch-agent/cmd/config-downloader
+	$(LINUX_AMD64_BUILD)/config-translator github.com/aws/amazon-cloudwatch-agent/cmd/config-translator
+	$(LINUX_ARM64_BUILD)/config-translator github.com/aws/amazon-cloudwatch-agent/cmd/config-translator
+	$(LINUX_AMD64_BUILD)/amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent
+	$(LINUX_ARM64_BUILD)/amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent
+	$(LINUX_AMD64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/start-amazon-cloudwatch-agent
+	$(LINUX_ARM64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/start-amazon-cloudwatch-agent
+	$(LINUX_AMD64_BUILD)/amazon-cloudwatch-agent-config-wizard github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent-config-wizard
+	$(LINUX_ARM64_BUILD)/amazon-cloudwatch-agent-config-wizard github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent-config-wizard
 
 
 amazon-cloudwatch-agent-darwin: copy-version-file
 ifneq ($(OS),Windows_NT)
 ifeq ($(shell uname -s),Darwin)
 	@echo Building CloudWatchAgent for MacOS with ARM64 and AMD64
-	$(DARWIN_BUILD_AMD64)/config-downloader github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-downloader
-	$(DARWIN_BUILD_ARM64)/config-downloader github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-downloader
-	$(DARWIN_BUILD_AMD64)/config-translator github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-translator
-	$(DARWIN_BUILD_ARM64)/config-translator github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-translator
-	$(DARWIN_BUILD_AMD64)/amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent
-	$(DARWIN_BUILD_ARM64)/amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent
-	$(DARWIN_BUILD_AMD64)/start-amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/start-amazon-cloudwatch-agent
-	$(DARWIN_BUILD_ARM64)/start-amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/start-amazon-cloudwatch-agent
-	$(DARWIN_BUILD_AMD64)/amazon-cloudwatch-agent-config-wizard github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent-config-wizard
-	$(DARWIN_BUILD_ARM64)/amazon-cloudwatch-agent-config-wizard github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent-config-wizard
+	$(DARWIN_BUILD_AMD64)/config-downloader github.com/aws/amazon-cloudwatch-agent/cmd/config-downloader
+	$(DARWIN_BUILD_ARM64)/config-downloader github.com/aws/amazon-cloudwatch-agent/cmd/config-downloader
+	$(DARWIN_BUILD_AMD64)/config-translator github.com/aws/amazon-cloudwatch-agent/cmd/config-translator
+	$(DARWIN_BUILD_ARM64)/config-translator github.com/aws/amazon-cloudwatch-agent/cmd/config-translator
+	$(DARWIN_BUILD_AMD64)/amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent
+	$(DARWIN_BUILD_ARM64)/amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent
+	$(DARWIN_BUILD_AMD64)/start-amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/start-amazon-cloudwatch-agent
+	$(DARWIN_BUILD_ARM64)/start-amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/start-amazon-cloudwatch-agent
+	$(DARWIN_BUILD_AMD64)/amazon-cloudwatch-agent-config-wizard github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent-config-wizard
+	$(DARWIN_BUILD_ARM64)/amazon-cloudwatch-agent-config-wizard github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent-config-wizard
 endif
 endif
 
 amazon-cloudwatch-agent-windows:
 	@echo Building CloudWatchAgent for Windows with AMD64
-	$(WIN_BUILD)/config-downloader.exe github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-downloader
-	$(WIN_BUILD)/config-translator.exe github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-translator
-	$(WIN_BUILD)/amazon-cloudwatch-agent.exe github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent
-	$(WIN_BUILD)/start-amazon-cloudwatch-agent.exe github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/start-amazon-cloudwatch-agent
-	$(WIN_BUILD)/amazon-cloudwatch-agent-config-wizard.exe github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent-config-wizard
+	$(WIN_BUILD)/config-downloader.exe github.com/aws/amazon-cloudwatch-agent/cmd/config-downloader
+	$(WIN_BUILD)/config-translator.exe github.com/aws/amazon-cloudwatch-agent/cmd/config-translator
+	$(WIN_BUILD)/amazon-cloudwatch-agent.exe github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent
+	$(WIN_BUILD)/start-amazon-cloudwatch-agent.exe github.com/aws/amazon-cloudwatch-agent/cmd/start-amazon-cloudwatch-agent
+	$(WIN_BUILD)/amazon-cloudwatch-agent-config-wizard.exe github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent-config-wizard
 
 # A fast build that only builds amd64, we don't need wizard and config downloader
 build-for-docker: build-for-docker-amd64
 
 build-for-docker-amd64:
-	$(LINUX_AMD64_BUILD)/amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent
-	$(LINUX_AMD64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/start-amazon-cloudwatch-agent
-	$(LINUX_AMD64_BUILD)/config-translator github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-translator
+	$(LINUX_AMD64_BUILD)/amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent
+	$(LINUX_AMD64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/start-amazon-cloudwatch-agent
+	$(LINUX_AMD64_BUILD)/config-translator github.com/aws/amazon-cloudwatch-agent/cmd/config-translator
 
 build-for-docker-arm64:
-	$(LINUX_ARM64_BUILD)/amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent
-	$(LINUX_ARM64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/start-amazon-cloudwatch-agent
-	$(LINUX_ARM64_BUILD)/config-translator github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-translator
+	$(LINUX_ARM64_BUILD)/amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent
+	$(LINUX_ARM64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/start-amazon-cloudwatch-agent
+	$(LINUX_ARM64_BUILD)/config-translator github.com/aws/amazon-cloudwatch-agent/cmd/config-translator
 
 # this is because we docker ignore our build dir
 # even if there is no dir rm -rf will not fail but if there already is a dir mkdir will

diff --git a/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile b/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile
@@ -7,17 +7,17 @@ FROM $GO_IMAGE as builder
 # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
 ARG TARGETARCH
 ENV GOPROXY=direct
-RUN mkdir -p /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/
-WORKDIR /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/
+RUN mkdir -p /go/src/github.com/aws/amazon-cloudwatch-agent/
+WORKDIR /go/src/github.com/aws/amazon-cloudwatch-agent/
 
 ARG GO111MODULE="on"
 ENV GO111MODULE=${GO111MODULE}
 
-COPY go.mod /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/
-COPY go.sum /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/
+COPY go.mod /go/src/github.com/aws/amazon-cloudwatch-agent/
+COPY go.sum /go/src/github.com/aws/amazon-cloudwatch-agent/
 RUN go mod download -x
 
-COPY . /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/
+COPY . /go/src/github.com/aws/amazon-cloudwatch-agent/
 
 RUN make build-for-docker-${TARGETARCH}
 
@@ -31,7 +31,7 @@ RUN mkdir -p /opt/aws/amazon-cloudwatch-agent/var
 RUN apt-get update &&  \
     apt-get install -y ca-certificates && \
     rm -rf /var/lib/apt/lists/*
-COPY --from=builder /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/build/bin/linux_${TARGETARCH}/ /opt/aws/amazon-cloudwatch-agent/bin
+COPY --from=builder /go/src/github.com/aws/amazon-cloudwatch-agent/build/bin/linux_${TARGETARCH}/ /opt/aws/amazon-cloudwatch-agent/bin
 
 FROM scratch
 

diff --git a/cmd/amazon-cloudwatch-agent-config-wizard/wizard.go b/cmd/amazon-cloudwatch-agent-config-wizard/wizard.go
@@ -9,17 +9,17 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data"
-	"github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors"
-	"github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/basicInfo"
-	"github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/linux"
-	"github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/windows"
-	"github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/serialization"
-	"github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/tracesconfig"
-	"github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime"
-	"github.com/aws/private-amazon-cloudwatch-agent-staging/tool/stdin"
-	"github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil"
-	"github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util"
+	"github.com/aws/amazon-cloudwatch-agent/tool/data"
+	"github.com/aws/amazon-cloudwatch-agent/tool/processors"
+	"github.com/aws/amazon-cloudwatch-agent/tool/processors/basicInfo"
+	"github.com/aws/amazon-cloudwatch-agent/tool/processors/migration/linux"
+	"github.com/aws/amazon-cloudwatch-agent/tool/processors/migration/windows"
+	"github.com/aws/amazon-cloudwatch-agent/tool/processors/serialization"
+	"github.com/aws/amazon-cloudwatch-agent/tool/processors/tracesconfig"
+	"github.com/aws/amazon-cloudwatch-agent/tool/runtime"
+	"github.com/aws/amazon-cloudwatch-agent/tool/stdin"
+	"github.com/aws/amazon-cloudwatch-agent/tool/testutil"
+	"github.com/aws/amazon-cloudwatch-agent/tool/util"
 )
 
 type IMainProcessor interface {