Merge pull request #1696 from aws-observability/rapphil-step1-updated…

…-dev Update dev branch to match mainline.
aws-observability · Dec 9, 2022 · 1a96fc1 · 1a96fc1
2 parents 8a73a88 + 5cdce34
commit 1a96fc1
Show file tree

Hide file tree

Showing 21 changed files with 615 additions and 454 deletions.
diff --git a/.github/workflows/CD-adot-operator.yml b/.github/workflows/CD-adot-operator.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: ~1.18.8
+          go-version: ~1.18.9
 
       - name: Login to Public Release ECR
         uses: docker/login-action@v2

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -13,15 +13,18 @@
 
 name: C/D
 
-on:        
+on:     
   workflow_dispatch:
     inputs:
       version:
         description: 'the version number to release'
         required: true
       sha:
         description: 'the github sha to release'
-        required: true
+        required: true   
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
 
 env:
   IMAGE_NAME: aws-otel-collector
@@ -42,12 +45,22 @@ jobs:
   release-checking: 
     runs-on: ubuntu-latest
     outputs:
-      version: ${{ steps.checking_sha_version.outputs.version }}
+      version: ${{ steps.set-input-vars.outputs.version }}
       testing_version: ${{ steps.checking_sha_version.outputs.testing_version }}
       latest-or-newer: ${{ steps.version.outputs.latest-or-newer }}
+      sha: ${{ steps.set-input-vars.outputs.sha }}
     steps: 
       - uses: actions/checkout@v3
-
+      - name: Set Input Variables
+        id: set-input-vars
+        run: |
+          if ${{ github.event_name == 'workflow_dispatch' }}; then
+            echo "version=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
+            echo "sha=${{ github.event.inputs.sha }}" >> $GITHUB_OUTPUT
+          else
+            echo "version=${{ github.ref_name }}" >> $GITHUB_OUTPUT
+            echo "sha=${{ github.sha }}" >> $GITHUB_OUTPUT
+          fi
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1-node16
         with:
@@ -61,7 +74,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_RELEASE_TOKEN }}
 
       - name: Download candidate
-        run: aws s3 cp "s3://aws-otel-collector-release-candidate/${{ github.event.inputs.sha }}.tar.gz" candidate.tar.gz
+        run: aws s3 cp "s3://aws-otel-collector-release-candidate/${{ steps.set-input-vars.outputs.sha }}.tar.gz" candidate.tar.gz
 
       - name: Uncompress the candidate package
         run: tar zxvf candidate.tar.gz
@@ -73,22 +86,21 @@ jobs:
           version_in_release_candidate=`cat $PACKAGING_ROOT/TESTING_VERSION`
           sha_in_candidate=`cat $PACKAGING_ROOT/GITHUB_SHA`
 
-          if [ $version_in_release != ${{ github.event.inputs.version }} ]; then
-            echo "::error::Wrong version is detected: $version_in_release != ${{ github.event.inputs.version }}"
+          if [ $version_in_release != ${{ steps.set-input-vars.outputs.version }} ]; then
+            echo "::error::Wrong version is detected: $version_in_release != ${{ steps.set-input-vars.outputs.version }}"
             exit 1
           fi
-          if [ $sha_in_candidate != ${{ github.event.inputs.sha }} ]; then
-            echo "::error::Wrong SHA is detected: $sha_in_candidate != ${{ github.event.inputs.sha }}"
+          if [ $sha_in_candidate != ${{ steps.set-input-vars.outputs.sha }} ]; then
+            echo "::error::Wrong SHA is detected: $sha_in_candidate != ${{ steps.set-input-vars.outputs.sha }}"
             exit 1
           fi
 
-          echo "::set-output name=version::$version_in_release"
           echo "::set-output name=testing_version::$version_in_release_candidate"
           
       - name: Compare version with Dockerhub latest
         id: version
         run: |
-          TAG="${{ steps.checking_sha_version.outputs.version }}" 
+          TAG="${{ steps.set-input-vars.outputs.version }}" 
           TARGET_VERSION=$TAG bash tools/workflow/docker-version-compare.sh
 
       - name: Cache packages
@@ -199,7 +211,7 @@ jobs:
         with:
           workflow: release SSM package
           token: ${{ secrets.REPO_WRITE_ACCESS_TOKEN }}
-          inputs: '{ "version": "${{ needs.release-checking.outputs.version }}", "sha": "${{ github.event.inputs.sha }}", "public": "true", "pkgname": "${{ env.SSM_RELEASE_PACKAGE_NAME }}" }'
+          inputs: '{ "version": "${{ needs.release-checking.outputs.version }}", "sha": "${{ needs.release-checking.outputs.sha }}", "public": "true", "pkgname": "${{ env.SSM_RELEASE_PACKAGE_NAME }}" }'
 
   release-to-github:
     runs-on: ubuntu-latest
@@ -208,7 +220,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.inputs.sha }}
+          ref: ${{ needs.release-checking.outputs.sha }}
 
       - name: Generate release-note
         run: sh tools/release/generate-release-note.sh
@@ -219,7 +231,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
         with:
           tag_name: ${{ needs.release-checking.outputs.version }}
-          commitish: ${{ github.event.inputs.sha }}
+          commitish: ${{ needs.release-checking.outputs.sha }}
           release_name: ${{ needs.release-checking.outputs.version }}
           body_path: release-note
           draft: true

diff --git a/.github/workflows/CI-Operator.yml b/.github/workflows/CI-Operator.yml
@@ -36,8 +36,6 @@ env:
   TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
   DDB_TABLE_NAME: BatchTestCache
   NUM_BATCHES: 2
-  TF_VAR_aoc_vpc_name: aoc-vpc-large
-  TF_VAR_aoc_vpc_security_group: aoc-vpc-security-group-large
 
 
 concurrency:
@@ -80,7 +78,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: '~1.18.8'
+          go-version: '~1.18.9'
 
       - name: Create test batch key values
         id: set-batches
@@ -184,9 +182,14 @@ jobs:
           cd testing-framework/terraform
           make checkCacheHits
       
-      #This is here just in case workflow cancel
+      # This is here just in case workflow cancel
+      # We first kill terraform processes to ensure that no state
+      # file locks are being held from SIGTERMS dispatched in previous
+      # steps. 
       - name: Destroy resources
         if: ${{ cancelled() }}
+        shell: bash {0}
         run: |
+          ps -ef | grep terraform | grep -v grep | awk '{print $2}' | xargs -n 1 kill
           cd testing-framework/terraform
           make terraformCleanup
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -33,8 +33,6 @@ env:
   IMAGE_NAME: aws-otel-collector
   PACKAGING_ROOT: build/packages
   ECR_REPO: aws-otel-test/adot-collector-integration-test
-  TF_VAR_aoc_vpc_name: aoc-vpc-large
-  TF_VAR_aoc_vpc_security_group: aoc-vpc-security-group-large
   # TF_VAR_patch: 'true'
   PKG_SIGN_PRIVATE_KEY_NAME: aoc-linux-pkg-signing-gpg-key
   WIN_UNSIGNED_PKG_BUCKET: aoc-aws-signer-unsigned-artifact-src
@@ -50,7 +48,7 @@ env:
   DDB_TABLE_NAME: BatchTestCache
   MAX_JOBS: 90
   BATCH_INCLUDED_SERVICES: EC2
-  GO_VERSION: ~1.18.8
+  GO_VERSION: ~1.18.9
 
 
 concurrency:
@@ -646,6 +644,7 @@ jobs:
       # steps. 
       - name: Destroy resources
         if: ${{ cancelled() }}
+        shell: bash {0}
         run: |
           ps -ef | grep terraform | grep -v grep | awk '{print $2}' | xargs -n 1 kill
           cd testing-framework/terraform

diff --git a/.github/workflows/PR-build.yml b/.github/workflows/PR-build.yml
@@ -76,7 +76,7 @@ jobs:
       if: ${{ needs.changes.outputs.changed == 'true' }}
       uses: actions/setup-go@v3
       with:
-        go-version: '~1.18.8'
+        go-version: '~1.18.9'
 
     - name: Checkout
       if: ${{ needs.changes.outputs.changed == 'true' }}

diff --git a/.github/workflows/aws-resources-clean.yml b/.github/workflows/aws-resources-clean.yml
@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        resource: [aps, autoscaling, ec2, ecs, efs, iam, launchconfig, loadbalancer, ebs]
+        resource: [aps, autoscaling, ec2, ecs, efs, iam, launchconfig, loadbalancer, ebs, lambda]
         region: [us-east-1, us-east-2, us-west-1, us-west-2, ap-south-1, ap-northeast-2, ap-southeast-1, ap-southeast-2,
                  ap-northeast-1, ca-central-1, eu-central-1, eu-west-1, eu-west-2, eu-west-3, eu-north-1, sa-east-1]
     steps:

diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
@@ -57,7 +57,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: '~1.18.8'
+          go-version: '~1.18.9'
       - name: Build aotutil
         run: cd testing-framework/cmd/aotutil && make build
       - name: Cache aotutil

diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml
@@ -27,7 +27,7 @@ env:
   COMMIT_USER: Github Actions
   COMMIT_EMAIL: actions@github.com
   TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
-  GO_VERSION: ~1.18.8
+  GO_VERSION: ~1.18.9
 
 permissions:
   id-token: write

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.23.0
+v0.24.0
diff --git a/cmd/awscollector/main.go b/cmd/awscollector/main.go
@@ -109,7 +109,7 @@ func newCommand(params service.CollectorSettings) *cobra.Command {
 		Version:      params.BuildInfo.Version,
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := featuregate.GetRegistry().Apply(config.GatesList); err != nil {
+			if err := featuregate.GetRegistry().Apply(config.GetFeatureGatesFlag(flagSet)); err != nil {
 				return err
 			}
 			// Initialize provider after flags have been set

diff --git a/docs/releases/v0.24.0.md b/docs/releases/v0.24.0.md
@@ -0,0 +1,26 @@
+# Changelog
+
+## [v0.24.0](https://github.com/aws-observability/aws-otel-collector/tree/v0.24.0) (2022-11-30)
+
+[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.23.0...v0.24.0)
+
+### Upstream release notes
+**v0.66.0**: [OpenTelemetry Collector](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.66.0) - [OpenTelemetry Collector Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.66.0) Due to release issues
+in the upstream repositories `v0.66.0` and `v0.65.0` are functionally the same.\
+**v0.65.0**: [OpenTelemetry Collector](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.65.0) - [OpenTelemetry Collector Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.65.0)\
+**v0.64.1**: [OpenTelemetry Collector](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.64.1)\
+**v0.64.0**: [OpenTelemetry Collector](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.64.0) - [OpenTelemetry Collector Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.64.0)\
+**v0.63.1**: [OpenTelemetry Collector](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.63.1)\
+**v0.63.0**: [OpenTelemetry Collector](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.63.0) - [OpenTelemetry Collector Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.63.0)
+
+**Closed issues:**
+
+- Ability to set log retention on CloudWatch log group when using awsemf exporter [\#991](https://github.com/aws-observability/aws-otel-collector/issues/991)
+
+**Merged pull requests:**
+
+- Update upstream dependencies to `v0.66.0` [\#1674](https://github.com/aws-observability/aws-otel-collector/pull/1674) ([bryan-aguilar](https://github.com/bryan-aguilar))
+- Update upstream dependencies to `v0.64.x` [\#1627](https://github.com/aws-observability/aws-otel-collector/pull/1627) ([bryan-aguilar](https://github.com/bryan-aguilar))
+- Update upstream dependencies to `v0.63.0` [\#1593](https://github.com/aws-observability/aws-otel-collector/pull/1593) ([PaurushGarg](https://github.com/PaurushGarg))
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*