From 00d1151510ee3d0b7577e56654362a2027701aa6 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 01:16:12 +0000 Subject: [PATCH 01/45] Use different test framework branch for dev branch Signed-off-by: Raphael Silva --- .github/workflows/CI-Operator.yml | 2 +- .github/workflows/CI.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI-Operator.yml b/.github/workflows/CI-Operator.yml index c5948bab8d..9856f430a1 100644 --- a/.github/workflows/CI-Operator.yml +++ b/.github/workflows/CI-Operator.yml @@ -57,7 +57,7 @@ jobs: - name: Set testRef output id: setRef run: | - if [[ ${{ github.ref_name }} == release/v* ]]; then + if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then echo "::set-output name=ref::${{github.ref_name}}" else echo "::set-output name=ref::terraform" diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index aa5693dc6c..9766c1ebde 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -70,7 +70,7 @@ jobs: - name: Set testRef output id: setRef run: | - if [[ ${{ github.ref_name }} == release/v* ]]; then + if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then echo "::set-output name=ref::${{github.ref_name}}" else echo "::set-output name=ref::terraform" From 0b77c84c1c52271b036a0ea60618adadc61fbe81 Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Tue, 22 Nov 2022 15:09:01 -0800 Subject: [PATCH 02/45] Enable only EC2 tests for the dev branch. --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9766c1ebde..18ab375d16 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -49,7 +49,7 @@ env: GITHB_RUN_ID: ${{ github.run_id }} DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 90 - BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE + BATCH_INCLUDED_SERVICES: EC2 GO_VERSION: ~1.18.8 From c98bc2df1799f40923d520d4f2bc1ea4daf1083d Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 23:18:36 +0000 Subject: [PATCH 03/45] Remove release candidate Signed-off-by: Raphael Silva --- .github/workflows/CI.yml | 41 ++-------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 18ab375d16..34f9ba1bf2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -723,46 +723,9 @@ jobs: cd testing-framework/terraform make checkCacheHits - release-candidate: - runs-on: ubuntu-latest - if: ${{ always() && needs.validate-all-tests-pass.result == 'success' }} - needs: validate-all-tests-pass - steps: - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1-node16 - with: - role-to-assume: ${{ secrets.COLLECTOR_ASSUMABLE_ROLE_ARN }} - aws-region: us-west-2 - - - name: restore cached packages - uses: actions/cache@v3 - with: - path: "${{ env.PACKAGING_ROOT }}" - key: "cached_packages_${{ github.run_id }}" - - - name: prepare production version - run: | - TESTING_VERSION=`cat $PACKAGING_ROOT/VERSION` - VERSION=`echo $TESTING_VERSION | awk -F "-" '{print $1}'` - echo $VERSION > $PACKAGING_ROOT/VERSION - echo $GITHUB_SHA > $PACKAGING_ROOT/GITHUB_SHA - echo $TESTING_VERSION > $PACKAGING_ROOT/TESTING_VERSION - - - name: upload packages as release candidate on s3 - run: | - tar czvf $GITHUB_SHA.tar.gz build - aws s3 cp $GITHUB_SHA.tar.gz s3://aws-otel-collector-release-candidate/$GITHUB_SHA.tar.gz - - - name: Trigger performance test - uses: peter-evans/repository-dispatch@v2 - with: - token: "${{ secrets.REPO_WRITE_ACCESS_TOKEN }}" - event-type: trigger-perf - client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}' - publish-ci-status: runs-on: ubuntu-latest - needs: [release-candidate] + needs: [validate-all-tests-pass] if: always() steps: - name: Configure AWS Credentials @@ -773,7 +736,7 @@ jobs: - name: Publish CI status run: | - if [ '${{ needs.release-candidate.result }}' = 'success' ]; then + if [ '${{ needs.validate-all-tests-pass.result }}' = 'success' ]; then aws cloudwatch put-metric-data --namespace 'ADOT/GitHubActions' \ --metric-name Success \ --dimensions repository=${{ github.repository }},branch=${{ github.ref_name }},workflow=CI \ From 35572305b9c7e0e3cba834c81f58a051cdf8b1df Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 01:16:12 +0000 Subject: [PATCH 04/45] Use different test framework branch for dev branch Signed-off-by: Raphael Silva --- .github/workflows/CI-Operator.yml | 2 +- .github/workflows/CI.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI-Operator.yml b/.github/workflows/CI-Operator.yml index 8cd5ce2a62..51d3ed1836 100644 --- a/.github/workflows/CI-Operator.yml +++ b/.github/workflows/CI-Operator.yml @@ -55,7 +55,7 @@ jobs: - name: Set testRef output id: setRef run: | - if [[ ${{ github.ref_name }} == release/v* ]]; then + if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then echo "::set-output name=ref::${{github.ref_name}}" else echo "::set-output name=ref::terraform" diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1b95eef2bc..8f493d0f67 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -68,7 +68,7 @@ jobs: - name: Set testRef output id: setRef run: | - if [[ ${{ github.ref_name }} == release/v* ]]; then + if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then echo "::set-output name=ref::${{github.ref_name}}" else echo "::set-output name=ref::terraform" From 01531da802c7500ca27ac4f6a4319fd982e2f159 Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Tue, 22 Nov 2022 15:09:01 -0800 Subject: [PATCH 05/45] Enable only EC2 tests for the dev branch. --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8f493d0f67..6204d0755d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,7 +47,7 @@ env: GITHB_RUN_ID: ${{ github.run_id }} DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 90 - BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE + BATCH_INCLUDED_SERVICES: EC2 GO_VERSION: ~1.18.9 From 81dbd13ef463557d8ed14b001668c2c43e12bef4 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 23:18:36 +0000 Subject: [PATCH 06/45] Remove release candidate Signed-off-by: Raphael Silva --- .github/workflows/CI.yml | 41 ++-------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6204d0755d..e6c793c1d7 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -722,46 +722,9 @@ jobs: cd testing-framework/terraform make checkCacheHits - release-candidate: - runs-on: ubuntu-latest - if: ${{ always() && needs.validate-all-tests-pass.result == 'success' }} - needs: validate-all-tests-pass - steps: - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1-node16 - with: - role-to-assume: ${{ secrets.COLLECTOR_ASSUMABLE_ROLE_ARN }} - aws-region: us-west-2 - - - name: restore cached packages - uses: actions/cache@v3 - with: - path: "${{ env.PACKAGING_ROOT }}" - key: "cached_packages_${{ github.run_id }}" - - - name: prepare production version - run: | - TESTING_VERSION=`cat $PACKAGING_ROOT/VERSION` - VERSION=`echo $TESTING_VERSION | awk -F "-" '{print $1}'` - echo $VERSION > $PACKAGING_ROOT/VERSION - echo $GITHUB_SHA > $PACKAGING_ROOT/GITHUB_SHA - echo $TESTING_VERSION > $PACKAGING_ROOT/TESTING_VERSION - - - name: upload packages as release candidate on s3 - run: | - tar czvf $GITHUB_SHA.tar.gz build - aws s3 cp $GITHUB_SHA.tar.gz s3://aws-otel-collector-release-candidate/$GITHUB_SHA.tar.gz - - - name: Trigger performance test - uses: peter-evans/repository-dispatch@v2 - with: - token: "${{ secrets.REPO_WRITE_ACCESS_TOKEN }}" - event-type: trigger-perf - client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}' - publish-ci-status: runs-on: ubuntu-latest - needs: [release-candidate] + needs: [validate-all-tests-pass] if: always() steps: - name: Configure AWS Credentials @@ -772,7 +735,7 @@ jobs: - name: Publish CI status run: | - if [ '${{ needs.release-candidate.result }}' = 'success' ]; then + if [ '${{ needs.validate-all-tests-pass.result }}' = 'success' ]; then aws cloudwatch put-metric-data --namespace 'ADOT/GitHubActions' \ --metric-name Success \ --dimensions repository=${{ github.repository }},branch=${{ github.ref_name }},workflow=CI \ From 8991b55ea5fd478f02b5f548d123f9a4cf11514e Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Tue, 22 Nov 2022 15:09:01 -0800 Subject: [PATCH 07/45] Enable only EC2 tests for the dev branch. --- .github/workflows/CI.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e6c793c1d7..b2d6aefacc 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -48,7 +48,11 @@ env: DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 90 BATCH_INCLUDED_SERVICES: EC2 +<<<<<<< HEAD GO_VERSION: ~1.18.9 +======= + GO_VERSION: ~1.18.8 +>>>>>>> 0b77c84 (Enable only EC2 tests for the dev branch.) concurrency: From 7a9be31b81989a7f1b0dbd5e037110eda543ce7e Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 18:54:22 +0000 Subject: [PATCH 08/45] Add support to kafka receiver/exporter Signed-off-by: Raphael Silva --- go.mod | 17 +++++++++++++++++ go.sum | 29 +++++++++++++++++++++++++++++ pkg/defaultcomponents/defaults.go | 4 ++++ 3 files changed, 50 insertions(+) diff --git a/go.mod b/go.mod index 61d4f6fb15..6c21a69a70 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.66.0 @@ -33,6 +34,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.66.0 @@ -87,6 +89,7 @@ require ( github.com/DataDog/zstd v1.5.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.1 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect + github.com/Shopify/sarama v1.37.2 // indirect github.com/Showmax/go-fqdn v1.0.0 // indirect github.com/alecthomas/participle/v2 v2.0.0-beta.5 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect @@ -129,6 +132,9 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 // indirect + github.com/eapache/go-resiliency v1.3.0 // indirect + github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect + github.com/eapache/queue v1.1.0 // indirect github.com/emicklei/go-restful/v3 v3.8.0 // indirect github.com/envoyproxy/go-control-plane v0.10.3 // indirect github.com/envoyproxy/protoc-gen-validate v0.6.7 // indirect @@ -177,6 +183,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-retryablehttp v0.7.1 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/nomad/api v0.0.0-20220809212729-939d643fec2c // indirect github.com/hashicorp/serf v0.9.8 // indirect @@ -186,6 +193,11 @@ require ( github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.2 // indirect github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 // indirect + github.com/jcmturner/aescts/v2 v2.0.0 // indirect + github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect + github.com/jcmturner/gofork v1.7.6 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect + github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect @@ -251,6 +263,7 @@ require ( github.com/openzipkin/zipkin-go v0.4.1 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/philhofer/fwd v1.1.1 // indirect + github.com/pierrec/lz4/v4 v4.1.17 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.14.0 // indirect @@ -260,6 +273,7 @@ require ( github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/prometheus v0.38.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect + github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.2 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect @@ -288,6 +302,9 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5 // indirect github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.1.1 // indirect + github.com/xdg-go/stringprep v1.0.3 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/consumer v0.66.0 // indirect diff --git a/go.sum b/go.sum index 379b410478..938d7048f5 100644 --- a/go.sum +++ b/go.sum @@ -154,8 +154,12 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.22.2-0.20190604114437-cd910a683f9f/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs= github.com/Shopify/sarama v1.32.0/go.mod h1:+EmJJKZWVT/faR9RcOxJerP+LId4iWdQPBGLy1Y1Njs= +github.com/Shopify/sarama v1.37.2 h1:LoBbU0yJPte0cE5TZCGdlzZRmMgMtZU/XgnUKZg9Cv4= +github.com/Shopify/sarama v1.37.2/go.mod h1:Nxye/E+YPru//Bpaorfhc3JsSGYwCaDDj+R4bK52U5o= +github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/Shopify/toxiproxy/v2 v2.3.0/go.mod h1:KvQTtB6RjCJY4zqNJn7C7JDFgsG5uoHYDirfUfpIm0c= +github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= github.com/Showmax/go-fqdn v1.0.0 h1:0rG5IbmVliNT5O19Mfuvna9LL7zlHyRfsSvBPZmF9tM= github.com/Showmax/go-fqdn v1.0.0/go.mod h1:SfrFBzmDCtCGrnHhoDjuvFnKsWjEQX/Q9ARZvOrJAko= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= @@ -391,7 +395,11 @@ github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 h1:wHGPJSXvwKQVf/XfhjU github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0/go.mod h1:PseHFo8Leko7J4A/TfZ6kkHdkzKBLUta6hRZR/OEbbc= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-resiliency v1.3.0 h1:RRL0nge+cWGlxXbUzJ7yMcq6w2XBEr19dCN6HECGaT0= +github.com/eapache/go-resiliency v1.3.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= @@ -438,6 +446,7 @@ github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/flynn/go-docopt v0.0.0-20140912013429-f6dd2ebbb31e/go.mod h1:HyVoz1Mz5Co8TFO8EupIdlcpwShBmY98dkT2xeHkvEI= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2/go.mod h1:VzmDKDJVZI3aJmnRI9VjAn9nJ8qPPsN1fqzr9dqInIo= @@ -874,6 +883,7 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= @@ -934,12 +944,20 @@ github.com/jaegertracing/jaeger v1.36.0/go.mod h1:67uyR2zQgEk7EfguOR3eZOGvGDRzY5 github.com/jaegertracing/jaeger v1.38.0/go.mod h1:4MBTMxfCp3d4buDLxRlHnESQvTFCkN16OUIeE9BEdl4= github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 h1:YLZ10whw2OQWjHnjqklvXSpS6QY+xhPsUTUya8yQQvc= github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856/go.mod h1:4UMLDc2yEm0f2Djlej2F7B/BMXRpSyVQX8CkuvtQ4nk= +github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= +github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= +github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg= +github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= +github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc= +github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE/Tq8= +github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0= +github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jgautheron/goconst v1.4.0/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= @@ -1236,6 +1254,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexpo github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.66.0/go.mod h1:Ywr9SWB0L3oIaejEazUpSGdmQfotGZt1yEy33zE2UsY= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.66.0 h1:qyLVcRXVQaFR4pkvbtix7LNj246UVWxsMCshIHZHs2o= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.66.0/go.mod h1:IZAMjwXdHNQMvVpP0Es0AhEkc1qgqjNmAXmdf8Rm+0E= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.66.0 h1:RMpiGiYvsWxiza/LR+0LdO7ijcaUl1lWGgVqQALI0dA= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.66.0/go.mod h1:R2SflSho/S8dHjEzXA6h32uYVsTDRaCIY7ajmdLAFjk= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.66.0 h1:pdzmxd3GNKMTkX2/eOZGnUc2aB6M8+Qnj01OscHYzG0= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.66.0/go.mod h1:OvZzh5Mc43/PgjvT3k+M//v2/YCF7wsXZvV6/D6Ujp0= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.66.0 h1:ZG1WCBvB3QDb48XdH/nXMxc0CCJpQjwlFeSJnexFDw4= @@ -1346,6 +1366,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiv github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.66.0 h1:p7kt9kDdh4UoGjEQ9Xn7jVuB9tv5B6uBd/0UrZD/JA4= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.66.0 h1:93ZWSVDiZkBpO0dC/mjFVpExWDN0Dezn1G7RObK4Eq0= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.66.0/go.mod h1:O9jOlxGVrteBIn76ga11huyGfoDIfc2balu+WHi9V4U= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.66.0 h1:iWDvM2Sv5V67rv50t8Ql0kODPLDJ3kbjuZ576Z6HPLM= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.66.0/go.mod h1:/AidsQYkQRnDznVJvSe7cT5azKtdGb7oFxiW5uxIsFE= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.66.0 h1:0EG2mEVj6QLNZEghWLPQInvdIyJmTz2sZOx0CYhqPDg= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.66.0/go.mod h1:aqg+ZuY7ZPXOZPmahXYhKMQBz+YwpX3xGculeFAMkAY= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.66.0 h1:6Dw3N3Fi8L2ZyQ8l3ZPjPoPvjNWuSaqvdkzptjsRxZE= @@ -1418,6 +1440,8 @@ github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v3 v3.3.4/go.mod h1:280XNCGS8jAcG++AHdd6SeWnzyJ1w9oow2vbORyey8Q= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= +github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -1500,6 +1524,7 @@ github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mo github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/rivo/tview v0.0.0-20200219210816-cd38d7432498/go.mod h1:6lkG1x+13OShEf0EaOCaTQYyB7d5nSbb181KtjlS+84= @@ -1720,11 +1745,14 @@ github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vb github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad/go.mod h1:Hy8o65+MXnS6EwGElrSRjUzQDLXreJlzYLlWiHtt8hM= +github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/scram v1.1.0/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= +github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E= github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= +github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs= github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= @@ -2050,6 +2078,7 @@ golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= diff --git a/pkg/defaultcomponents/defaults.go b/pkg/defaultcomponents/defaults.go index d1793f5e48..6bde8edab2 100644 --- a/pkg/defaultcomponents/defaults.go +++ b/pkg/defaultcomponents/defaults.go @@ -21,6 +21,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter" + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter" @@ -45,6 +46,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver" @@ -84,6 +86,7 @@ func Components() (component.Factories, error) { awsxrayreceiver.NewFactory(), statsdreceiver.NewFactory(), prometheusreceiver.NewFactory(), + kafkareceiver.NewFactory(), jaegerreceiver.NewFactory(), zipkinreceiver.NewFactory(), otlpreceiver.NewFactory(), @@ -119,6 +122,7 @@ func Components() (component.Factories, error) { prometheusremotewriteexporter.NewFactory(), prometheusexporter.NewFactory(), fileexporter.NewFactory(), + kafkaexporter.NewFactory(), dynatraceexporter.NewFactory(), sapmexporter.NewFactory(), signalfxexporter.NewFactory(), From a93d98a0cb459b1d1283f2cbe0c99a8c14c97b6d Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Fri, 16 Dec 2022 14:31:32 -0800 Subject: [PATCH 09/45] Update package signer to use assumed IAM role --- .github/workflows/CI.yml | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e6c793c1d7..0c1e95dd52 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -201,6 +201,14 @@ jobs: Invoke-WebRequest -Uri "https://awscli.amazonaws.com/AWSCLIV2.msi" -OutFile "AWSCLIV2.msi" msiexec.exe /i AWSCLIV2.msi /passive [System.Environment]::SetEnvironmentVariable('Path',$Env:Path + ";C:\\Program Files\\Amazon\\AWSCLIV2",'User') + + - name: Configure AWS Credentials + + - uses: aws-actions/configure-aws-credentials@v1-node16 + with: + role-to-assume: ${{ secrets.COLLECTOR_PROD_PKG_SIGNER_ROLE_ARN }} + aws-region: us-west-2 + - name: Sign windows artifacts run: | $pkgfile = "build\packages\windows\amd64\aws-otel-collector.msi" @@ -224,10 +232,6 @@ jobs: Throw "Could not find the signed artifact" } aws s3api get-object "--bucket" ${{ env.WIN_SIGNED_PKG_BUCKET }} "--key" $objkey $pkgfile - env: - AWS_ACCESS_KEY_ID: ${{ secrets.SIGN_PKG_AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SIGN_PKG_AWS_SECRET_ACCESS_KEY }} - AWS_DEFAULT_REGION: us-west-2 - name: Verify package signature run: | @@ -273,14 +277,17 @@ jobs: run: | ARCH=x86_64 SOURCE_ARCH=amd64 DEST=$PACKAGING_ROOT/linux/amd64 tools/packaging/linux/create_rpm.sh ARCH=aarch64 SOURCE_ARCH=arm64 DEST=$PACKAGING_ROOT/linux/arm64 tools/packaging/linux/create_rpm.sh + + - uses: aws-actions/configure-aws-credentials@v1-node16 + with: + role-to-assume: ${{ secrets.COLLECTOR_PROD_PKG_SIGNER_ROLE_ARN }} + aws-region: us-west-2 + - name: Download Package Signing GPG key if: steps.cached_rpms.outputs.cache-hit != 'true' run: | aws secretsmanager get-secret-value --region us-west-2 --secret-id "$PKG_SIGN_PRIVATE_KEY_NAME" | jq -r ".SecretString" > pkg_sign_private.key md5sum pkg_sign_private.key - env: - AWS_ACCESS_KEY_ID: ${{ secrets.SIGN_PKG_AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SIGN_PKG_AWS_SECRET_ACCESS_KEY }} - name: Import Package Signing GPG Key if: steps.cached_rpms.outputs.cache-hit != 'true' @@ -327,14 +334,17 @@ jobs: run: | ARCH=amd64 DEST=$PACKAGING_ROOT/debian/amd64 tools/packaging/debian/create_deb.sh ARCH=arm64 DEST=$PACKAGING_ROOT/debian/arm64 tools/packaging/debian/create_deb.sh + + - uses: aws-actions/configure-aws-credentials@v1-node16 + with: + role-to-assume: ${{ secrets.COLLECTOR_PROD_PKG_SIGNER_ROLE_ARN }} + aws-region: us-west-2 + - name: Download Package Signing GPG key if: steps.cached_debs.outputs.cache-hit != 'true' run: | aws secretsmanager get-secret-value --region us-west-2 --secret-id "$PKG_SIGN_PRIVATE_KEY_NAME" | jq -r ".SecretString" > pkg_sign_private.key md5sum pkg_sign_private.key - env: - AWS_ACCESS_KEY_ID: ${{ secrets.SIGN_PKG_AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SIGN_PKG_AWS_SECRET_ACCESS_KEY }} - name: Import Package Signing GPG Key if: steps.cached_debs.outputs.cache-hit != 'true' From ededb58e4949e41a67aff76f7b9b9dce088db153 Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Tue, 20 Dec 2022 10:59:03 -0800 Subject: [PATCH 10/45] Fix syntax --- .github/workflows/CI.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0c1e95dd52..74ac5c462b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -202,8 +202,6 @@ jobs: msiexec.exe /i AWSCLIV2.msi /passive [System.Environment]::SetEnvironmentVariable('Path',$Env:Path + ";C:\\Program Files\\Amazon\\AWSCLIV2",'User') - - name: Configure AWS Credentials - - uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ secrets.COLLECTOR_PROD_PKG_SIGNER_ROLE_ARN }} From a24ef409f22f7658f085fb9a62a7ae7032a26005 Mon Sep 17 00:00:00 2001 From: Huy Vo Date: Wed, 4 Jan 2023 13:24:43 -0800 Subject: [PATCH 11/45] Add ECS tests to the dev branch --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 34f9ba1bf2..d77b165bd5 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -49,7 +49,7 @@ env: GITHB_RUN_ID: ${{ github.run_id }} DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 90 - BATCH_INCLUDED_SERVICES: EC2 + BATCH_INCLUDED_SERVICES: EC2,ECS GO_VERSION: ~1.18.8 From 76b47b39dbe13e2c17604869cc62f155b2f4fd6c Mon Sep 17 00:00:00 2001 From: Huy Vo Date: Wed, 4 Jan 2023 13:38:02 -0800 Subject: [PATCH 12/45] Fix go version --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index adb6e104bf..9f0a030917 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -48,7 +48,7 @@ env: DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 90 BATCH_INCLUDED_SERVICES: EC2,ECS - GO_VERSION: ~1.18.8 + GO_VERSION: ~1.18.9 concurrency: From ffccd2b8b989431c2996d2c86871ad8047b63bb9 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Thu, 8 Dec 2022 07:53:52 +0000 Subject: [PATCH 13/45] Fix unit tests Signed-off-by: Raphael Silva --- .github/workflows/CI.yml | 4 ---- pkg/defaultcomponents/defaults_test.go | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b2d6aefacc..e6c793c1d7 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -48,11 +48,7 @@ env: DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 90 BATCH_INCLUDED_SERVICES: EC2 -<<<<<<< HEAD GO_VERSION: ~1.18.9 -======= - GO_VERSION: ~1.18.8 ->>>>>>> 0b77c84 (Enable only EC2 tests for the dev branch.) concurrency: diff --git a/pkg/defaultcomponents/defaults_test.go b/pkg/defaultcomponents/defaults_test.go index 9ce16e0b9a..66e33e9e93 100644 --- a/pkg/defaultcomponents/defaults_test.go +++ b/pkg/defaultcomponents/defaults_test.go @@ -22,8 +22,8 @@ import ( ) const ( - exportersCount = 13 - receiversCount = 8 + exportersCount = 14 + receiversCount = 9 extensionsCount = 7 processorCount = 12 ) @@ -49,6 +49,7 @@ func TestComponents(t *testing.T) { assert.NotNil(t, exporters["signalfx"]) assert.NotNil(t, exporters["logzio"]) assert.NotNil(t, exporters["prometheusremotewrite"]) + assert.NotNil(t, exporters["kafka"]) receivers := factories.Receivers assert.Len(t, receivers, receiversCount) @@ -63,6 +64,7 @@ func TestComponents(t *testing.T) { assert.NotNil(t, receivers["prometheus"]) assert.NotNil(t, receivers["zipkin"]) assert.NotNil(t, receivers["jaeger"]) + assert.NotNil(t, receivers["kafka"]) extensions := factories.Extensions assert.Len(t, extensions, extensionsCount) From 3610653b35de18ee20a349f2d9b5b63b07676c18 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 01:16:12 +0000 Subject: [PATCH 14/45] Use different test framework branch for dev branch Signed-off-by: Raphael Silva --- .github/workflows/CI-Operator.yml | 5 +++++ .github/workflows/CI.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/CI-Operator.yml b/.github/workflows/CI-Operator.yml index 0f7d964765..5743ff8078 100644 --- a/.github/workflows/CI-Operator.yml +++ b/.github/workflows/CI-Operator.yml @@ -52,8 +52,13 @@ jobs: - name: Set testRef output id: setRef run: | +<<<<<<< HEAD if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT +======= + if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then + echo "::set-output name=ref::${{github.ref_name}}" +>>>>>>> 00d1151 (Use different test framework branch for dev branch) else echo "ref=terraform" >> $GITHUB_OUTPUT fi diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d2520dfbc8..5f71211ffe 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -68,8 +68,13 @@ jobs: - name: Set testRef output id: setRef run: | +<<<<<<< HEAD if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT +======= + if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then + echo "::set-output name=ref::${{github.ref_name}}" +>>>>>>> 00d1151 (Use different test framework branch for dev branch) else echo "ref=terraform" >> $GITHUB_OUTPUT fi From 761141217efaa5a3f04769965e0cc5dd986a76dd Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Tue, 22 Nov 2022 15:09:01 -0800 Subject: [PATCH 15/45] Enable only EC2 tests for the dev branch. --- .github/workflows/CI.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5f71211ffe..8ce519f8d1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,8 +47,13 @@ env: GITHB_RUN_ID: ${{ github.run_id }} DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 90 +<<<<<<< HEAD BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE GO_VERSION: ~1.18.9 +======= + BATCH_INCLUDED_SERVICES: EC2 + GO_VERSION: ~1.18.8 +>>>>>>> 0b77c84 (Enable only EC2 tests for the dev branch.) concurrency: From cd8d103afa61bd8b17c73ad23261ec635a565317 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 23:18:36 +0000 Subject: [PATCH 16/45] Remove release candidate Signed-off-by: Raphael Silva --- .github/workflows/CI.yml | 41 ++-------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8ce519f8d1..eea84871f9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -740,46 +740,9 @@ jobs: cd testing-framework/terraform make checkCacheHits - release-candidate: - runs-on: ubuntu-latest - if: ${{ always() && needs.validate-all-tests-pass.result == 'success' }} - needs: validate-all-tests-pass - steps: - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1-node16 - with: - role-to-assume: ${{ secrets.COLLECTOR_ASSUMABLE_ROLE_ARN }} - aws-region: us-west-2 - - - name: restore cached packages - uses: actions/cache@v3 - with: - path: "${{ env.PACKAGING_ROOT }}" - key: "cached_packages_${{ github.run_id }}" - - - name: prepare production version - run: | - TESTING_VERSION=`cat $PACKAGING_ROOT/VERSION` - VERSION=`echo $TESTING_VERSION | awk -F "-" '{print $1}'` - echo $VERSION > $PACKAGING_ROOT/VERSION - echo $GITHUB_SHA > $PACKAGING_ROOT/GITHUB_SHA - echo $TESTING_VERSION > $PACKAGING_ROOT/TESTING_VERSION - - - name: upload packages as release candidate on s3 - run: | - tar czvf $GITHUB_SHA.tar.gz build - aws s3 cp $GITHUB_SHA.tar.gz s3://aws-otel-collector-release-candidate/$GITHUB_SHA.tar.gz - - - name: Trigger performance test - uses: peter-evans/repository-dispatch@v2 - with: - token: "${{ secrets.REPO_WRITE_ACCESS_TOKEN }}" - event-type: trigger-perf - client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}' - publish-ci-status: runs-on: ubuntu-latest - needs: [release-candidate] + needs: [validate-all-tests-pass] if: always() steps: - name: Configure AWS Credentials @@ -790,7 +753,7 @@ jobs: - name: Publish CI status run: | - if [ '${{ needs.release-candidate.result }}' = 'success' ]; then + if [ '${{ needs.validate-all-tests-pass.result }}' = 'success' ]; then aws cloudwatch put-metric-data --namespace 'ADOT/GitHubActions' \ --metric-name Success \ --dimensions repository=${{ github.repository }},branch=${{ github.ref_name }},workflow=CI \ From 47b9d0ab826f8f92cc124a977e8eeaa57611967b Mon Sep 17 00:00:00 2001 From: Huy Vo Date: Wed, 4 Jan 2023 13:24:43 -0800 Subject: [PATCH 17/45] Add ECS tests to the dev branch --- .github/workflows/CI.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index eea84871f9..8d9f174af8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,13 +47,8 @@ env: GITHB_RUN_ID: ${{ github.run_id }} DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 90 -<<<<<<< HEAD - BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE + BATCH_INCLUDED_SERVICES: EC2,ECS GO_VERSION: ~1.18.9 -======= - BATCH_INCLUDED_SERVICES: EC2 - GO_VERSION: ~1.18.8 ->>>>>>> 0b77c84 (Enable only EC2 tests for the dev branch.) concurrency: @@ -73,13 +68,8 @@ jobs: - name: Set testRef output id: setRef run: | -<<<<<<< HEAD if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT -======= - if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then - echo "::set-output name=ref::${{github.ref_name}}" ->>>>>>> 00d1151 (Use different test framework branch for dev branch) else echo "ref=terraform" >> $GITHUB_OUTPUT fi From 13516daa75dd6fbe3995ec35a33cfa39ac668e53 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 01:16:12 +0000 Subject: [PATCH 18/45] Use different test framework branch for dev branch Signed-off-by: Raphael Silva --- .github/workflows/CI-Operator.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/CI-Operator.yml b/.github/workflows/CI-Operator.yml index 5743ff8078..0f7d964765 100644 --- a/.github/workflows/CI-Operator.yml +++ b/.github/workflows/CI-Operator.yml @@ -52,13 +52,8 @@ jobs: - name: Set testRef output id: setRef run: | -<<<<<<< HEAD if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT -======= - if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then - echo "::set-output name=ref::${{github.ref_name}}" ->>>>>>> 00d1151 (Use different test framework branch for dev branch) else echo "ref=terraform" >> $GITHUB_OUTPUT fi From 7254bd84fa6a8fe405bfaa87463e54880da170aa Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 18:54:22 +0000 Subject: [PATCH 19/45] Add support to kafka receiver/exporter Signed-off-by: Raphael Silva --- go.mod | 17 ++++++++++++++++ go.sum | 32 +++++++++++++++++++++++++++++++ pkg/defaultcomponents/defaults.go | 4 ++++ 3 files changed, 53 insertions(+) diff --git a/go.mod b/go.mod index 34f183c1ec..72b6bb7f03 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.68.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.68.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.68.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.68.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.68.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.68.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.68.0 @@ -33,6 +34,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.68.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.68.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.68.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.68.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.68.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.68.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.68.0 @@ -89,6 +91,7 @@ require ( github.com/DataDog/zstd v1.5.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.3-0.20221202192616-0186b89ba914 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect + github.com/Shopify/sarama v1.37.2 // indirect github.com/Showmax/go-fqdn v1.0.0 // indirect github.com/alecthomas/participle/v2 v2.0.0-beta.5 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect @@ -131,6 +134,9 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 // indirect + github.com/eapache/go-resiliency v1.3.0 // indirect + github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect + github.com/eapache/queue v1.1.0 // indirect github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/envoyproxy/go-control-plane v0.10.3 // indirect github.com/envoyproxy/protoc-gen-validate v0.6.13 // indirect @@ -180,6 +186,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-retryablehttp v0.7.1 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/nomad/api v0.0.0-20221102143410-8a95f1239005 // indirect github.com/hashicorp/serf v0.10.1 // indirect @@ -189,6 +196,11 @@ require ( github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.3 // indirect github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 // indirect + github.com/jcmturner/aescts/v2 v2.0.0 // indirect + github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect + github.com/jcmturner/gofork v1.7.6 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect + github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect @@ -255,6 +267,7 @@ require ( github.com/ovh/go-ovh v1.1.0 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/philhofer/fwd v1.1.2-0.20210722190033-5c56ac6d0bb9 // indirect + github.com/pierrec/lz4/v4 v4.1.17 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.14.0 // indirect @@ -264,6 +277,7 @@ require ( github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/prometheus v0.40.7 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect + github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.2 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect @@ -291,6 +305,9 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5 // indirect github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.1.2 // indirect + github.com/xdg-go/stringprep v1.0.4 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/consumer v0.68.0 // indirect diff --git a/go.sum b/go.sum index 806cdde9a0..bb744dc04f 100644 --- a/go.sum +++ b/go.sum @@ -156,8 +156,12 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.22.2-0.20190604114437-cd910a683f9f/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs= github.com/Shopify/sarama v1.32.0/go.mod h1:+EmJJKZWVT/faR9RcOxJerP+LId4iWdQPBGLy1Y1Njs= +github.com/Shopify/sarama v1.37.2 h1:LoBbU0yJPte0cE5TZCGdlzZRmMgMtZU/XgnUKZg9Cv4= +github.com/Shopify/sarama v1.37.2/go.mod h1:Nxye/E+YPru//Bpaorfhc3JsSGYwCaDDj+R4bK52U5o= +github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/Shopify/toxiproxy/v2 v2.3.0/go.mod h1:KvQTtB6RjCJY4zqNJn7C7JDFgsG5uoHYDirfUfpIm0c= +github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= github.com/Showmax/go-fqdn v1.0.0 h1:0rG5IbmVliNT5O19Mfuvna9LL7zlHyRfsSvBPZmF9tM= github.com/Showmax/go-fqdn v1.0.0/go.mod h1:SfrFBzmDCtCGrnHhoDjuvFnKsWjEQX/Q9ARZvOrJAko= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= @@ -394,7 +398,11 @@ github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 h1:wHGPJSXvwKQVf/XfhjU github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0/go.mod h1:PseHFo8Leko7J4A/TfZ6kkHdkzKBLUta6hRZR/OEbbc= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-resiliency v1.3.0 h1:RRL0nge+cWGlxXbUzJ7yMcq6w2XBEr19dCN6HECGaT0= +github.com/eapache/go-resiliency v1.3.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= @@ -442,6 +450,7 @@ github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/flynn/go-docopt v0.0.0-20140912013429-f6dd2ebbb31e/go.mod h1:HyVoz1Mz5Co8TFO8EupIdlcpwShBmY98dkT2xeHkvEI= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2/go.mod h1:VzmDKDJVZI3aJmnRI9VjAn9nJ8qPPsN1fqzr9dqInIo= @@ -877,6 +886,7 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= @@ -939,12 +949,20 @@ github.com/jaegertracing/jaeger v1.36.0/go.mod h1:67uyR2zQgEk7EfguOR3eZOGvGDRzY5 github.com/jaegertracing/jaeger v1.38.0/go.mod h1:4MBTMxfCp3d4buDLxRlHnESQvTFCkN16OUIeE9BEdl4= github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 h1:YLZ10whw2OQWjHnjqklvXSpS6QY+xhPsUTUya8yQQvc= github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856/go.mod h1:4UMLDc2yEm0f2Djlej2F7B/BMXRpSyVQX8CkuvtQ4nk= +github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= +github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= +github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg= +github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= +github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc= +github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE/Tq8= +github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0= +github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jgautheron/goconst v1.4.0/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= @@ -1242,6 +1260,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexpo github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.68.0/go.mod h1:T7eJG7kns1M3SWQTYS8RzFTq8i7AQBAB4QyyEHDe70E= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.68.0 h1:wrceFicW7hrPnsroere4kRC+k8pgyu9Vcp1Ja7PL/Lc= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.68.0/go.mod h1:mIqi1dPlW2i+BlCxynv3PZoW4lBZRFtr1pixFLWM9yY= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.68.0 h1:4gLPtnPGRdxQweqgSnTX1r5hW54y41PA0VK4K5XYnzo= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.68.0/go.mod h1:WI9XFbIukURqlQy+3bedTx40docvqj0LZnwAOOlxQCk= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.68.0 h1:5BAXAHB76qDTLYDLBgB1QMv1mvdr9SBF8KpYEumsFOw= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.68.0/go.mod h1:5IVajr45AHGkf47pjsjPZOnsHfMtAMckFxn8F3zxe/0= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.68.0 h1:bDv+CdtytOLzEHaxyArvZUyN5MPrzcO4pmoF/hCnmNY= @@ -1352,6 +1372,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiv github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.68.0 h1:qyC/l2IUKv+s4VUNjTU5dgrYwuuyfmSYqamFFGVSYIo= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.68.0 h1:iegGIxDCcFxNwahIiDReaxX/6SOS/MD9YDlLIxfXnQM= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.68.0/go.mod h1:MTDzoha4oGf4opzos5HU7SRkRSEVR8CRmhq+da72wv4= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.68.0 h1:jjn0wTtt7i1cvis+jSN3XXuSElZA6H1QJtApOSgGvvY= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.68.0/go.mod h1:eG4cCi0SVnG8J1QYI45P4gV+mqeoFLojBNkgsEhB9VY= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.68.0 h1:E+cMXZVebOxCRlhCAX8O2kwna6qSyD5DvZi2jaDJLV4= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.68.0/go.mod h1:X4PVmrkPOuUsSXB+UjA+zMgqHaUdQR8ZCKSnw+l73xo= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.68.0 h1:PcLgJFsBK8F72r19fcnIm0EYJo+km2w4qOn1zYh29qY= @@ -1426,6 +1448,8 @@ github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v3 v3.3.4/go.mod h1:280XNCGS8jAcG++AHdd6SeWnzyJ1w9oow2vbORyey8Q= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= +github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -1509,6 +1533,7 @@ github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mo github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/rivo/tview v0.0.0-20200219210816-cd38d7432498/go.mod h1:6lkG1x+13OShEf0EaOCaTQYyB7d5nSbb181KtjlS+84= @@ -1730,12 +1755,17 @@ github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vb github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad/go.mod h1:Hy8o65+MXnS6EwGElrSRjUzQDLXreJlzYLlWiHtt8hM= +github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/scram v1.1.0/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= +github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= +github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= +github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= +github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= @@ -2063,6 +2093,7 @@ golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= golang.org/x/net v0.0.0-20220907135653-1e95f45603a7/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= @@ -2253,6 +2284,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= diff --git a/pkg/defaultcomponents/defaults.go b/pkg/defaultcomponents/defaults.go index af7ff1521f..071e7e8069 100644 --- a/pkg/defaultcomponents/defaults.go +++ b/pkg/defaultcomponents/defaults.go @@ -21,6 +21,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter" + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter" @@ -45,6 +46,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver" @@ -88,6 +90,7 @@ func Components() (otelcol.Factories, error) { awsxrayreceiver.NewFactory(), statsdreceiver.NewFactory(), prometheusreceiver.NewFactory(), + kafkareceiver.NewFactory(), jaegerreceiver.NewFactory(), zipkinreceiver.NewFactory(), otlpreceiver.NewFactory(), @@ -123,6 +126,7 @@ func Components() (otelcol.Factories, error) { prometheusremotewriteexporter.NewFactory(), prometheusexporter.NewFactory(), fileexporter.NewFactory(), + kafkaexporter.NewFactory(), dynatraceexporter.NewFactory(), sapmexporter.NewFactory(), signalfxexporter.NewFactory(), From da56a3c13b2262df1232bfa047b309ba9c626a93 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Thu, 8 Dec 2022 07:53:52 +0000 Subject: [PATCH 20/45] Fix unit tests Signed-off-by: Raphael Silva --- pkg/defaultcomponents/defaults_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/defaultcomponents/defaults_test.go b/pkg/defaultcomponents/defaults_test.go index 9ce16e0b9a..66e33e9e93 100644 --- a/pkg/defaultcomponents/defaults_test.go +++ b/pkg/defaultcomponents/defaults_test.go @@ -22,8 +22,8 @@ import ( ) const ( - exportersCount = 13 - receiversCount = 8 + exportersCount = 14 + receiversCount = 9 extensionsCount = 7 processorCount = 12 ) @@ -49,6 +49,7 @@ func TestComponents(t *testing.T) { assert.NotNil(t, exporters["signalfx"]) assert.NotNil(t, exporters["logzio"]) assert.NotNil(t, exporters["prometheusremotewrite"]) + assert.NotNil(t, exporters["kafka"]) receivers := factories.Receivers assert.Len(t, receivers, receiversCount) @@ -63,6 +64,7 @@ func TestComponents(t *testing.T) { assert.NotNil(t, receivers["prometheus"]) assert.NotNil(t, receivers["zipkin"]) assert.NotNil(t, receivers["jaeger"]) + assert.NotNil(t, receivers["kafka"]) extensions := factories.Extensions assert.Len(t, extensions, extensionsCount) From 3280433d98a9a2f59f96f8400199e97fa6eb0964 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 01:16:12 +0000 Subject: [PATCH 21/45] Use different test framework branch for dev branch Signed-off-by: Raphael Silva --- .github/workflows/CI-Operator.yml | 5 +++++ .github/workflows/CI.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/CI-Operator.yml b/.github/workflows/CI-Operator.yml index 0f7d964765..5743ff8078 100644 --- a/.github/workflows/CI-Operator.yml +++ b/.github/workflows/CI-Operator.yml @@ -52,8 +52,13 @@ jobs: - name: Set testRef output id: setRef run: | +<<<<<<< HEAD if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT +======= + if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then + echo "::set-output name=ref::${{github.ref_name}}" +>>>>>>> 00d1151 (Use different test framework branch for dev branch) else echo "ref=terraform" >> $GITHUB_OUTPUT fi diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b23c2f8c17..6f77c0c448 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -68,8 +68,13 @@ jobs: - name: Set testRef output id: setRef run: | +<<<<<<< HEAD if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT +======= + if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then + echo "::set-output name=ref::${{github.ref_name}}" +>>>>>>> 00d1151 (Use different test framework branch for dev branch) else echo "ref=terraform" >> $GITHUB_OUTPUT fi From 8f7cf5073231aa537c03167d1b1f81f008e5c80e Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Tue, 22 Nov 2022 15:09:01 -0800 Subject: [PATCH 22/45] Enable only EC2 tests for the dev branch. --- .github/workflows/CI.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6f77c0c448..d7b6a0228b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,8 +47,13 @@ env: GITHB_RUN_ID: ${{ github.run_id }} DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 90 +<<<<<<< HEAD BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE GO_VERSION: ~1.18.9 +======= + BATCH_INCLUDED_SERVICES: EC2 + GO_VERSION: ~1.18.8 +>>>>>>> 0b77c84 (Enable only EC2 tests for the dev branch.) concurrency: From bc0ef0d6aa58bd47c776dc460fee46a341d28d16 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 23:18:36 +0000 Subject: [PATCH 23/45] Remove release candidate Signed-off-by: Raphael Silva --- .github/workflows/CI.yml | 41 ++-------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d7b6a0228b..6cd1a751d8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -740,46 +740,9 @@ jobs: cd testing-framework/terraform make checkCacheHits - release-candidate: - runs-on: ubuntu-latest - if: ${{ always() && needs.validate-all-tests-pass.result == 'success' }} - needs: validate-all-tests-pass - steps: - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1-node16 - with: - role-to-assume: ${{ secrets.COLLECTOR_ASSUMABLE_ROLE_ARN }} - aws-region: us-west-2 - - - name: restore cached packages - uses: actions/cache@v3 - with: - path: "${{ env.PACKAGING_ROOT }}" - key: "cached_packages_${{ github.run_id }}" - - - name: prepare production version - run: | - TESTING_VERSION=`cat $PACKAGING_ROOT/VERSION` - VERSION=`echo $TESTING_VERSION | awk -F "-" '{print $1}'` - echo $VERSION > $PACKAGING_ROOT/VERSION - echo $GITHUB_SHA > $PACKAGING_ROOT/GITHUB_SHA - echo $TESTING_VERSION > $PACKAGING_ROOT/TESTING_VERSION - - - name: upload packages as release candidate on s3 - run: | - tar czvf $GITHUB_SHA.tar.gz build - aws s3 cp $GITHUB_SHA.tar.gz s3://aws-otel-collector-release-candidate/$GITHUB_SHA.tar.gz - - - name: Trigger performance test - uses: peter-evans/repository-dispatch@v2 - with: - token: "${{ secrets.REPO_WRITE_ACCESS_TOKEN }}" - event-type: trigger-perf - client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}' - publish-ci-status: runs-on: ubuntu-latest - needs: [release-candidate] + needs: [validate-all-tests-pass] if: always() steps: - name: Configure AWS Credentials @@ -790,7 +753,7 @@ jobs: - name: Publish CI status run: | - if [ '${{ needs.release-candidate.result }}' = 'success' ]; then + if [ '${{ needs.validate-all-tests-pass.result }}' = 'success' ]; then aws cloudwatch put-metric-data --namespace 'ADOT/GitHubActions' \ --metric-name Success \ --dimensions repository=${{ github.repository }},branch=${{ github.ref_name }},workflow=CI \ From 0711e6ec2d901b47e864f60d5e2275253ea74df7 Mon Sep 17 00:00:00 2001 From: Huy Vo Date: Wed, 4 Jan 2023 13:24:43 -0800 Subject: [PATCH 24/45] Add ECS tests to the dev branch --- .github/workflows/CI.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6cd1a751d8..9942a1b8d5 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,13 +47,8 @@ env: GITHB_RUN_ID: ${{ github.run_id }} DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 90 -<<<<<<< HEAD - BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE + BATCH_INCLUDED_SERVICES: EC2,ECS GO_VERSION: ~1.18.9 -======= - BATCH_INCLUDED_SERVICES: EC2 - GO_VERSION: ~1.18.8 ->>>>>>> 0b77c84 (Enable only EC2 tests for the dev branch.) concurrency: @@ -73,13 +68,8 @@ jobs: - name: Set testRef output id: setRef run: | -<<<<<<< HEAD if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT -======= - if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then - echo "::set-output name=ref::${{github.ref_name}}" ->>>>>>> 00d1151 (Use different test framework branch for dev branch) else echo "ref=terraform" >> $GITHUB_OUTPUT fi From 76f69a4f0794a8f8cf5b8ddd5413e8ec49f4fdd9 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 01:16:12 +0000 Subject: [PATCH 25/45] Use different test framework branch for dev branch Signed-off-by: Raphael Silva --- .github/workflows/CI-Operator.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/CI-Operator.yml b/.github/workflows/CI-Operator.yml index 5743ff8078..0f7d964765 100644 --- a/.github/workflows/CI-Operator.yml +++ b/.github/workflows/CI-Operator.yml @@ -52,13 +52,8 @@ jobs: - name: Set testRef output id: setRef run: | -<<<<<<< HEAD if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT -======= - if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then - echo "::set-output name=ref::${{github.ref_name}}" ->>>>>>> 00d1151 (Use different test framework branch for dev branch) else echo "ref=terraform" >> $GITHUB_OUTPUT fi From 637a4ce288cf2809f1a8810211768e3aa8a27f84 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 18:54:22 +0000 Subject: [PATCH 26/45] Add support to kafka receiver/exporter Signed-off-by: Raphael Silva --- go.mod | 17 ++++++++++++++++ go.sum | 33 +++++++++++++++++++++++++++++++ pkg/defaultcomponents/defaults.go | 4 ++++ 3 files changed, 54 insertions(+) diff --git a/go.mod b/go.mod index bb64deda39..ab6966c5f0 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.70.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.70.0 @@ -33,6 +34,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.70.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.70.0 @@ -89,6 +91,7 @@ require ( github.com/DataDog/zstd v1.5.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.3-0.20221202192616-0186b89ba914 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect + github.com/Shopify/sarama v1.38.1 // indirect github.com/Showmax/go-fqdn v1.0.0 // indirect github.com/alecthomas/participle/v2 v2.0.0-beta.5 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect @@ -131,6 +134,9 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 // indirect + github.com/eapache/go-resiliency v1.3.0 // indirect + github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect + github.com/eapache/queue v1.1.0 // indirect github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/envoyproxy/go-control-plane v0.10.3 // indirect github.com/envoyproxy/protoc-gen-validate v0.9.1 // indirect @@ -180,6 +186,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-retryablehttp v0.7.1 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/nomad/api v0.0.0-20221214074818-7dbbf6bc584d // indirect github.com/hashicorp/serf v0.10.1 // indirect @@ -189,6 +196,11 @@ require ( github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.3 // indirect github.com/jaegertracing/jaeger v1.41.0 // indirect + github.com/jcmturner/aescts/v2 v2.0.0 // indirect + github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect + github.com/jcmturner/gofork v1.7.6 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect + github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect @@ -255,6 +267,7 @@ require ( github.com/ovh/go-ovh v1.3.0 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/philhofer/fwd v1.1.2 // indirect + github.com/pierrec/lz4/v4 v4.1.17 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.14.0 // indirect @@ -264,6 +277,7 @@ require ( github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/prometheus v0.41.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect + github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.3 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.10 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect @@ -291,6 +305,9 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5 // indirect github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.1.2 // indirect + github.com/xdg-go/stringprep v1.0.4 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/consumer v0.70.0 // indirect diff --git a/go.sum b/go.sum index 6a55bc386a..0f6d81159b 100644 --- a/go.sum +++ b/go.sum @@ -156,8 +156,12 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.22.2-0.20190604114437-cd910a683f9f/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs= github.com/Shopify/sarama v1.32.0/go.mod h1:+EmJJKZWVT/faR9RcOxJerP+LId4iWdQPBGLy1Y1Njs= +github.com/Shopify/sarama v1.38.1 h1:lqqPUPQZ7zPqYlWpTh+LQ9bhYNu2xJL6k1SJN4WVe2A= +github.com/Shopify/sarama v1.38.1/go.mod h1:iwv9a67Ha8VNa+TifujYoWGxWnu2kNVAQdSdZ4X2o5g= +github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/Shopify/toxiproxy/v2 v2.3.0/go.mod h1:KvQTtB6RjCJY4zqNJn7C7JDFgsG5uoHYDirfUfpIm0c= +github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= github.com/Showmax/go-fqdn v1.0.0 h1:0rG5IbmVliNT5O19Mfuvna9LL7zlHyRfsSvBPZmF9tM= github.com/Showmax/go-fqdn v1.0.0/go.mod h1:SfrFBzmDCtCGrnHhoDjuvFnKsWjEQX/Q9ARZvOrJAko= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= @@ -396,7 +400,12 @@ github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 h1:wHGPJSXvwKQVf/XfhjU github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0/go.mod h1:PseHFo8Leko7J4A/TfZ6kkHdkzKBLUta6hRZR/OEbbc= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-resiliency v1.3.0 h1:RRL0nge+cWGlxXbUzJ7yMcq6w2XBEr19dCN6HECGaT0= +github.com/eapache/go-resiliency v1.3.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 h1:8yY/I9ndfrgrXUbOGObLHKBR4Fl3nZXwM2c7OYTT8hM= +github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= +github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= @@ -444,6 +453,7 @@ github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/flynn/go-docopt v0.0.0-20140912013429-f6dd2ebbb31e/go.mod h1:HyVoz1Mz5Co8TFO8EupIdlcpwShBmY98dkT2xeHkvEI= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2/go.mod h1:VzmDKDJVZI3aJmnRI9VjAn9nJ8qPPsN1fqzr9dqInIo= @@ -879,6 +889,7 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= @@ -941,12 +952,20 @@ github.com/jaegertracing/jaeger v1.36.0/go.mod h1:67uyR2zQgEk7EfguOR3eZOGvGDRzY5 github.com/jaegertracing/jaeger v1.38.0/go.mod h1:4MBTMxfCp3d4buDLxRlHnESQvTFCkN16OUIeE9BEdl4= github.com/jaegertracing/jaeger v1.41.0 h1:vVNky8dP46M2RjGaZ7qRENqylW+tBFay3h57N16Ip7M= github.com/jaegertracing/jaeger v1.41.0/go.mod h1:SIkAT75iVmA9U+mESGYuMH6UQv6V9Qy4qxo0lwfCQAc= +github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= +github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= +github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg= +github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= +github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc= +github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE/Tq8= +github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0= +github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jgautheron/goconst v1.4.0/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= @@ -1242,6 +1261,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexpo github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.70.0/go.mod h1:ggb8pPolm3Q0BuVLMs4aOXB3Mm91rjoBENWzEVdQKsY= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.70.0 h1:s/s+kA3rrMsMBOmkYgNqJKXGsHT09xDvc1E0lKSWKZk= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.70.0/go.mod h1:BN0pgB432W7v9FF8KaqWjceQpodUzNboO4zcmnSXDRo= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.70.0 h1:+ka0OMXE9vcYz31IuDaat/sy13oxXnsYgr/EJ898TlM= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.70.0/go.mod h1:eexdjAI8XYwEBxJPHH0/8oov1yR5Bj6tNShSwq0PXkY= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.70.0 h1:1OVmzwNS12ReBsgVdN0Fwy7xuT8iaB3gcIMddfbWvwo= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.70.0/go.mod h1:oTKAscJn8VRmS+f/2ALXxOelI1s3tgydu5TWA+CKld4= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.70.0 h1:VVrCSSCgrG/OTW0q6Vsw2+XpkdiOMn4tkS5qf9DSr5Y= @@ -1354,6 +1375,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiv github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.70.0 h1:QOIx0RLviCoGCvA6yuGNRYONNldWeO3XZGEFssRErpM= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.70.0 h1:39YHXmx/qX2yL4eCmoavlDgwqu4OrUvjAOhSumq7F8A= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.70.0/go.mod h1:Gg4Cps0rcRTcTUfkfT65Uvl2OpY/9z4xlCeNK/dVsCE= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.70.0 h1:7yAQSha+5zrmAH7F1FF8qGii3bVuD86zWeFh0/3ZEYk= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.70.0/go.mod h1:u4UUXBgpPs41Ndozzd9PoGuqt59NkNKzLiCLh07gbh0= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.70.0 h1:XNEvkCcP3B/EXATT3GN9SlgUgvso8Pge9iNR8L45hnw= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.70.0/go.mod h1:CTzTL+dQcBHiHnWn7Q4G/38Oh8+CwdW2wSzdX4XI/4k= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.70.0 h1:2Au0VmRXA5fQBhb0xsC0RgkdMonN7QLaKGK39V1JCpY= @@ -1429,6 +1452,8 @@ github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v3 v3.3.4/go.mod h1:280XNCGS8jAcG++AHdd6SeWnzyJ1w9oow2vbORyey8Q= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= +github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -1512,6 +1537,7 @@ github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mo github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/rivo/tview v0.0.0-20200219210816-cd38d7432498/go.mod h1:6lkG1x+13OShEf0EaOCaTQYyB7d5nSbb181KtjlS+84= @@ -1733,12 +1759,17 @@ github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vb github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad/go.mod h1:Hy8o65+MXnS6EwGElrSRjUzQDLXreJlzYLlWiHtt8hM= +github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/scram v1.1.0/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= +github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= +github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= +github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= +github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= @@ -2066,6 +2097,7 @@ golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= @@ -2257,6 +2289,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= diff --git a/pkg/defaultcomponents/defaults.go b/pkg/defaultcomponents/defaults.go index af7ff1521f..071e7e8069 100644 --- a/pkg/defaultcomponents/defaults.go +++ b/pkg/defaultcomponents/defaults.go @@ -21,6 +21,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter" + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter" @@ -45,6 +46,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver" @@ -88,6 +90,7 @@ func Components() (otelcol.Factories, error) { awsxrayreceiver.NewFactory(), statsdreceiver.NewFactory(), prometheusreceiver.NewFactory(), + kafkareceiver.NewFactory(), jaegerreceiver.NewFactory(), zipkinreceiver.NewFactory(), otlpreceiver.NewFactory(), @@ -123,6 +126,7 @@ func Components() (otelcol.Factories, error) { prometheusremotewriteexporter.NewFactory(), prometheusexporter.NewFactory(), fileexporter.NewFactory(), + kafkaexporter.NewFactory(), dynatraceexporter.NewFactory(), sapmexporter.NewFactory(), signalfxexporter.NewFactory(), From 09c05f065a8ad295d17e68c5789c9555eee75de4 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Thu, 8 Dec 2022 07:53:52 +0000 Subject: [PATCH 27/45] Fix unit tests Signed-off-by: Raphael Silva --- pkg/defaultcomponents/defaults_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/defaultcomponents/defaults_test.go b/pkg/defaultcomponents/defaults_test.go index 9ce16e0b9a..66e33e9e93 100644 --- a/pkg/defaultcomponents/defaults_test.go +++ b/pkg/defaultcomponents/defaults_test.go @@ -22,8 +22,8 @@ import ( ) const ( - exportersCount = 13 - receiversCount = 8 + exportersCount = 14 + receiversCount = 9 extensionsCount = 7 processorCount = 12 ) @@ -49,6 +49,7 @@ func TestComponents(t *testing.T) { assert.NotNil(t, exporters["signalfx"]) assert.NotNil(t, exporters["logzio"]) assert.NotNil(t, exporters["prometheusremotewrite"]) + assert.NotNil(t, exporters["kafka"]) receivers := factories.Receivers assert.Len(t, receivers, receiversCount) @@ -63,6 +64,7 @@ func TestComponents(t *testing.T) { assert.NotNil(t, receivers["prometheus"]) assert.NotNil(t, receivers["zipkin"]) assert.NotNil(t, receivers["jaeger"]) + assert.NotNil(t, receivers["kafka"]) extensions := factories.Extensions assert.Len(t, extensions, extensionsCount) From 5283ca443768fdcdba2b11fabb9586999d53301d Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 01:16:12 +0000 Subject: [PATCH 28/45] Use different test framework branch for dev branch Signed-off-by: Raphael Silva --- .github/workflows/CI-Operator.yml | 5 +++++ .github/workflows/CI.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/CI-Operator.yml b/.github/workflows/CI-Operator.yml index 0f7d964765..5743ff8078 100644 --- a/.github/workflows/CI-Operator.yml +++ b/.github/workflows/CI-Operator.yml @@ -52,8 +52,13 @@ jobs: - name: Set testRef output id: setRef run: | +<<<<<<< HEAD if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT +======= + if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then + echo "::set-output name=ref::${{github.ref_name}}" +>>>>>>> 00d1151 (Use different test framework branch for dev branch) else echo "ref=terraform" >> $GITHUB_OUTPUT fi diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9942a1b8d5..d5a5a5dc6b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -68,8 +68,13 @@ jobs: - name: Set testRef output id: setRef run: | +<<<<<<< HEAD if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT +======= + if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then + echo "::set-output name=ref::${{github.ref_name}}" +>>>>>>> 00d1151 (Use different test framework branch for dev branch) else echo "ref=terraform" >> $GITHUB_OUTPUT fi From 259567c76b6c7f9e3a1821bbdceab3ae8158a3b0 Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Tue, 22 Nov 2022 15:09:01 -0800 Subject: [PATCH 29/45] Enable only EC2 tests for the dev branch. --- .github/workflows/CI.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d5a5a5dc6b..9942a1b8d5 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -68,13 +68,8 @@ jobs: - name: Set testRef output id: setRef run: | -<<<<<<< HEAD if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT -======= - if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then - echo "::set-output name=ref::${{github.ref_name}}" ->>>>>>> 00d1151 (Use different test framework branch for dev branch) else echo "ref=terraform" >> $GITHUB_OUTPUT fi From 012416a667edaaaa5084770971377080f3220901 Mon Sep 17 00:00:00 2001 From: Huy Vo Date: Wed, 4 Jan 2023 13:24:43 -0800 Subject: [PATCH 30/45] Add ECS tests to the dev branch --- .github/workflows/CI.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9942a1b8d5..2c90c54245 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -48,7 +48,11 @@ env: DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 90 BATCH_INCLUDED_SERVICES: EC2,ECS +<<<<<<< HEAD GO_VERSION: ~1.18.9 +======= + GO_VERSION: ~1.18.8 +>>>>>>> a24ef40 (Add ECS tests to the dev branch) concurrency: From 28c9c3573ac1fc1d4ac7d97a93c8dd8c5d2d02e9 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 22 Nov 2022 01:16:12 +0000 Subject: [PATCH 31/45] Use different test framework branch for dev branch Signed-off-by: Raphael Silva --- .github/workflows/CI-Operator.yml | 5 ----- .github/workflows/CI.yml | 4 ---- 2 files changed, 9 deletions(-) diff --git a/.github/workflows/CI-Operator.yml b/.github/workflows/CI-Operator.yml index 5743ff8078..0f7d964765 100644 --- a/.github/workflows/CI-Operator.yml +++ b/.github/workflows/CI-Operator.yml @@ -52,13 +52,8 @@ jobs: - name: Set testRef output id: setRef run: | -<<<<<<< HEAD if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT -======= - if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then - echo "::set-output name=ref::${{github.ref_name}}" ->>>>>>> 00d1151 (Use different test framework branch for dev branch) else echo "ref=terraform" >> $GITHUB_OUTPUT fi diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2c90c54245..9942a1b8d5 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -48,11 +48,7 @@ env: DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 90 BATCH_INCLUDED_SERVICES: EC2,ECS -<<<<<<< HEAD GO_VERSION: ~1.18.9 -======= - GO_VERSION: ~1.18.8 ->>>>>>> a24ef40 (Add ECS tests to the dev branch) concurrency: From 43432efedf792b296f0cef1a148b973b2e28e08c Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Tue, 22 Nov 2022 15:09:01 -0800 Subject: [PATCH 32/45] Enable only EC2 tests for the dev branch. --- .github/workflows/CI.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9942a1b8d5..2b2fe358f8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -50,7 +50,6 @@ env: BATCH_INCLUDED_SERVICES: EC2,ECS GO_VERSION: ~1.18.9 - concurrency: group: ci-batched${{ github.ref_name }} cancel-in-progress: true From 68fb319287d2173e4577c4ceb835bacb99650996 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Fri, 27 Jan 2023 06:00:16 +0000 Subject: [PATCH 33/45] Add new components Signed-off-by: Raphael Silva --- go.mod | 10 ++++++++++ go.sum | 26 ++++++++++++++++++++++++-- pkg/config/config_factory.go | 12 +++++++++++- pkg/defaultcomponents/defaults.go | 6 ++++++ 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ab6966c5f0..63c55171f0 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.184 + github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.70.0 @@ -24,15 +25,18 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.70.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.70.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.70.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.70.0 @@ -99,13 +103,17 @@ require ( github.com/apache/thrift v0.17.0 // indirect github.com/armon/go-metrics v0.4.0 // indirect github.com/aws/aws-sdk-go-v2 v1.17.3 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.0.0 // indirect github.com/aws/aws-sdk-go-v2/config v1.18.8 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.13.8 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.5.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.9.0 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 // indirect @@ -209,6 +217,7 @@ require ( github.com/klauspost/compress v1.15.15 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect + github.com/leoluk/perflib_exporter v0.2.0 // indirect github.com/lightstep/go-expohisto v1.0.0 // indirect github.com/linode/linodego v1.9.3 // indirect github.com/lufia/plan9stats v0.0.0-20220517141722-cf486979b281 // indirect @@ -247,6 +256,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.70.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.70.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.70.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.70.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.70.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.70.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.70.0 // indirect diff --git a/go.sum b/go.sum index 6359670e83..ab4728bb52 100644 --- a/go.sum +++ b/go.sum @@ -223,8 +223,11 @@ github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZw github.com/aws/aws-sdk-go-v2 v1.7.0/go.mod h1:tb9wi5s61kTDA5qCkcDbt3KRVV74GGslQkl/DRdX/P4= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= +github.com/aws/aws-sdk-go-v2 v1.11.0/go.mod h1:SQfA+m2ltnu1cA0soUkj4dRSsmITiVQUJvBIZjzfPyQ= github.com/aws/aws-sdk-go-v2 v1.17.3 h1:shN7NlnVzvDUgPQ+1rLMSxY8OWRNDRYtiqe0p/PgrhY= github.com/aws/aws-sdk-go-v2 v1.17.3/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.0.0 h1:yVUAwvJC/0WNPbyl0nA3j1L6CW1CN8wBubCRqtG7JLI= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.0.0/go.mod h1:Xn6sxgRuIDflLRJFj5Ev7UxABIkNbccFPV/p8itDReM= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/config v1.18.8 h1:lDpy0WM8AHsywOnVrOHaSMfpaiV2igOw8D7svkFkXVA= github.com/aws/aws-sdk-go-v2/config v1.18.8/go.mod h1:5XCmmyutmzzgkpk/6NYTjeWb6lgo9N170m1j6pQkIBs= @@ -234,8 +237,10 @@ github.com/aws/aws-sdk-go-v2/credentials v1.13.8/go.mod h1:lVa4OHbvgjVot4gmh1uou github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 h1:j9wi1kQ8b+e0FBVHxCqCGo4kxDU175hoDHcWAi0sauU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21/go.mod h1:ugwW57Z5Z48bpvUyZuaPy4Kv+vEfJWnIrky7RmkBvJg= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.0/go.mod h1:NO3Q5ZTTQtO2xIg2+xTXYDiT7knSejfeDm7WGDaOo0U= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 h1:I3cakv2Uy1vNmmhRQmFptYDxOvBnwCdNwyw63N0RaRU= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27/go.mod h1:a1/UpzeyBBerajpnP5nGZa9mGzsBn5cOKxm6NWQsvoI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.0.0/go.mod h1:anlUzBoEWglcUxUQwZA7HQOEVEnQALVZsizAapB2hq8= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 h1:5NbbMrIzmUn/TXFqAle6mgrH5m9cOvMLRGL7pnG8tRE= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21/go.mod h1:+Gxn8jYn5k9ebfHEqlhrMirFjSW0v0C9fI+KN5vk2kE= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= @@ -244,9 +249,16 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28/go.mod h1:yRZVr/iT0AqyHeep00SZ github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.5.0/go.mod h1:acH3+MQoiMzozT/ivU+DbRg7Ooo2298RdRaWcOv+4vM= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1/go.mod h1:CM+19rL1+4dFWnOQKwDc7H1KwXTz+h61oUSHyhV0b3o= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.5.0 h1:lPLbw4Gn59uoKqvOfSnkJr54XWk5Ak1NK20ZEiSWb3U= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.5.0/go.mod h1:80NaCIH9YU3rzTTs/J/ECATjXuRqzo/wB6ukO6MZ0XY= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.0/go.mod h1:Mq6AEc+oEjCUlBuLiK5YwW4shSOAKCQ3tXN0sQeYoBA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 h1:5C6XgTViSb0bunmU57b3CT+MhxULqHH2721FVA+/kDM= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21/go.mod h1:lRToEJsn+DRA9lW4O9L9+/3hjTkUzlzyzHqn8MTds5k= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.9.0 h1:0BOlTqnNnrEO04oYKzDxMMe68t107pmIotn18HtVonY= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.9.0/go.mod h1:xKCZ4YFSF2s4Hnb/J0TLeOsKuGzICzcElaOKNGrVnx4= +github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0 h1:5mRAms4TjSTOGYsqKYte5kHr1PzpMJSyLThjF3J+hw0= +github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0/go.mod h1:Gwz3aVctJe6mUY9T//bcALArPUaFmNAy2rTB9qN4No8= github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c= github.com/aws/aws-sdk-go-v2/service/sso v1.12.0/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= @@ -257,6 +269,7 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 h1:kOO++CYo50RcTFISESluhWEi5Prh github.com/aws/aws-sdk-go-v2/service/sts v1.18.0/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= github.com/aws/smithy-go v1.5.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.9.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -1053,6 +1066,7 @@ github.com/kulti/thelper v0.4.0/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5 github.com/kunwardeep/paralleltest v1.0.2/go.mod h1:ZPqNm1fVHPllh5LPVujzbVz1JN2GhLxSfY+oqUsvG30= github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= github.com/leoluk/perflib_exporter v0.2.0 h1:WJU7N3AIHxfc3CjoEJcBgG3i2ltF5Yz1ADVY9T6f1BY= +github.com/leoluk/perflib_exporter v0.2.0/go.mod h1:MinSWm88jguXFFrGsP56PtleUb4Qtm4tNRH/wXNXRTI= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= @@ -1251,6 +1265,8 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.70.0 h1:y1fymQ/BzrGRwHDiFlbvqnlTR0RRp7BF0JDdd8TeZ1A= +github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.70.0/go.mod h1:HSQSP0HhFsVy58KA+mwZON+gS3UuJp/BULu9/0ZKrEQ= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.70.0 h1:9usMa4x2WFlG+GpemcYQFJhFktEXuaBJa3zqS9azhIw= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.70.0/go.mod h1:6SPd7cU4ktIWdqXNrCMC8NzZe0zbjOUrK9qa5VznkLQ= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.70.0 h1:BBYtn3HYYBTUbxA/eeE+l/yRBSSN0h+EJVP5Q0Ybyec= @@ -1320,6 +1336,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.70. github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.70.0/go.mod h1:v2MorAgXdd+jowWvysfFKb0L2H3AflMKXUYDEE+Jh4s= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.70.0 h1:YDr2v8VFuncfat6/z9R3g5BvygAq0E6PwoZoZMLKrLI= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.70.0/go.mod h1:xv+J0M1ZLwEzGbxBTIEwQWktnfLwrH7HL1XZzwifVT4= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.70.0 h1:9kFYiN8oiwtm7n0NkGbDadqWSt2BzhuIp3Vawg5/kAQ= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.70.0/go.mod h1:zbZUOF3HTP4yNZC9aMDuTUbqmYlzKuYXQJr9qSbcrTg= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.70.0 h1:lIjoM6mVDaOyI1p2RuK8CcI+IGTRTVrtzb8ijChJ0BE= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.70.0/go.mod h1:sBcuqgAxOmbXpS/Zern0+BTbWi3XGoO1FA4jOuGqQR0= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.70.0 h1:/THcnH0trQNEvzvZiXOdXIiYZ7yS1GGLEvYbKx7gjsE= @@ -1352,6 +1370,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatoratep github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.70.0/go.mod h1:Uh0yncs0QamT69GFpuN83oPfJ4+FzgbJX6FhZSS7hXc= github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.70.0 h1:7lnZIjtPVag3i+qB50asjLb2VLs0M+r3vVuHOmlGDgE= github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.70.0/go.mod h1:fmWY9Yu4YklJYaKlaTTpfHDc9vCg8mrXio58OZ19X6A= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.70.0 h1:yyBFljQcCTF8De5aoNAuGC9kKI68lJ7YvlnY+fWzqvM= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.70.0/go.mod h1:/Aa/wvk3+kR4L/RRZD669gSx6vNnU6+m4eQwlZA2mf4= github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.70.0 h1:luE/EfQlQqywkl0VMCcwapdzl/fR+MIOLOsWT9x3M6M= github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.70.0 h1:mTQJvIfeWN5ocGfEVkgIKHou4dBlD/+Q7nKBCNVUtI8= github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.70.0/go.mod h1:JWimrSaCXIBTUySYSsaRcVc3WNC6YE1aC44A6EZSm5I= @@ -1365,6 +1385,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceproc github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.70.0/go.mod h1:vLvAQZliC/F7X7GcpRKPxg8ex3w9a/JXo+Ee7rhl7kk= github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.70.0 h1:5WeWbX6UCq2BKVqkI3nljHKgqKeFK1Frfv1Rwzw1g7A= github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.70.0/go.mod h1:mTvo6iPaL3CFLuq6JAvLft1XJfThpqy4U69fetiT3T0= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.70.0 h1:jFRDA8akkUGHoOAzmijT+oWKpTGLx25J/HZZ+RlN7es= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.70.0/go.mod h1:ZNA4d5ezKO8lwksirS9vhrms1SxNjin/LZK7zmYi4EU= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.70.0 h1:HLNij1/OKhV07hHeWqRFt73ilVTqOq/BfoeKenm9DPI= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.70.0/go.mod h1:lyCrrAzR0r/T+Jk1XE0jvWwiHlewqMviRuL1R9hbsGY= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.70.0 h1:Zyxg2l+L9uH2WP8Mavs6TY9hSyV5lFTzizBk/Cvl+JY= @@ -1373,6 +1395,7 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiv github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.70.0/go.mod h1:FzdmsR851O6wIyEgqeN10EpPFzBIKSnrWPNUQ7VsamY= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.70.0 h1:dO1DvCQzSigm4BaSZuzqsVEXCYg/Qg7rTmbXi/JVs/4= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.70.0 h1:QOIx0RLviCoGCvA6yuGNRYONNldWeO3XZGEFssRErpM= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.70.0/go.mod h1:/iPy/3cayCWK2evKCwhhlHkofHIUQUv2oeuGSaRu+74= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.70.0 h1:39YHXmx/qX2yL4eCmoavlDgwqu4OrUvjAOhSumq7F8A= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.70.0/go.mod h1:Gg4Cps0rcRTcTUfkfT65Uvl2OpY/9z4xlCeNK/dVsCE= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.70.0 h1:7yAQSha+5zrmAH7F1FF8qGii3bVuD86zWeFh0/3ZEYk= @@ -1505,6 +1528,7 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.34.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE= github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= @@ -1763,12 +1787,10 @@ github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/scram v1.1.0/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= -github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E= github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= -github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs= github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= diff --git a/pkg/config/config_factory.go b/pkg/config/config_factory.go index f2054c31ce..d9eb4c9325 100644 --- a/pkg/config/config_factory.go +++ b/pkg/config/config_factory.go @@ -20,10 +20,14 @@ import ( "log" "os" + "github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/converter/expandconverter" "go.opentelemetry.io/collector/confmap/provider/envprovider" "go.opentelemetry.io/collector/confmap/provider/fileprovider" + "go.opentelemetry.io/collector/confmap/provider/httpprovider" + + // "go.opentelemetry.io/collector/confmap/provider/httpsprovider" "go.opentelemetry.io/collector/confmap/provider/yamlprovider" "go.opentelemetry.io/collector/otelcol" ) @@ -42,7 +46,13 @@ func GetConfigProvider(flags *flag.FlagSet) otelcol.ConfigProvider { } // generate the MapProviders for the Config Provider Settings - providers := []confmap.Provider{fileprovider.New(), envprovider.New(), yamlprovider.New()} + providers := []confmap.Provider{ + fileprovider.New(), + envprovider.New(), + yamlprovider.New(), + httpprovider.New(), + // httpsprovider.New(), + s3provider.New()} mapProviders := make(map[string]confmap.Provider, len(providers)) for _, provider := range providers { diff --git a/pkg/defaultcomponents/defaults.go b/pkg/defaultcomponents/defaults.go index 071e7e8069..4690fb9761 100644 --- a/pkg/defaultcomponents/defaults.go +++ b/pkg/defaultcomponents/defaults.go @@ -36,15 +36,18 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor" + "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor" + "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" @@ -90,6 +93,7 @@ func Components() (otelcol.Factories, error) { awsxrayreceiver.NewFactory(), statsdreceiver.NewFactory(), prometheusreceiver.NewFactory(), + hostmetricsreceiver.NewFactory(), kafkareceiver.NewFactory(), jaegerreceiver.NewFactory(), zipkinreceiver.NewFactory(), @@ -106,6 +110,8 @@ func Components() (otelcol.Factories, error) { probabilisticsamplerprocessor.NewFactory(), spanprocessor.NewFactory(), filterprocessor.NewFactory(), + groupbytraceprocessor.NewFactory(), + tailsamplingprocessor.NewFactory(), metricstransformprocessor.NewFactory(), resourcedetectionprocessor.NewFactory(), metricsgenerationprocessor.NewFactory(), From b13b80efa8617d7baf8e7ef91e74f9c070ada196 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Fri, 27 Jan 2023 19:33:40 +0000 Subject: [PATCH 34/45] Add the https confmap provider Signed-off-by: Raphael Silva --- cmd/awscollector/main.go | 10 ++++++++-- go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ pkg/config/config_factory.go | 4 ++-- 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/cmd/awscollector/main.go b/cmd/awscollector/main.go index 268295f9e2..aef28072e9 100644 --- a/cmd/awscollector/main.go +++ b/cmd/awscollector/main.go @@ -110,9 +110,15 @@ func newCommand(params otelcol.CollectorSettings) *cobra.Command { Version: params.BuildInfo.Version, SilenceUsage: true, RunE: func(cmd *cobra.Command, args []string) error { - if err := featuregate.GlobalRegistry().Apply(config.GetFeatureGatesFlag(flagSet)); err != nil { - return err + + flags := config.GetFeatureGatesFlag(flagSet) + + for featureKey, featureEnable := range flags { + if err := featuregate.GlobalRegistry().Set(featureKey, featureEnable); err != nil { + return err + } } + // Initialize provider after flags have been set params.ConfigProvider = config.GetConfigProvider(flagSet) col, err := otelcol.NewCollector(params) diff --git a/go.mod b/go.mod index 63c55171f0..74acc892e7 100644 --- a/go.mod +++ b/go.mod @@ -47,18 +47,18 @@ require ( github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.70.0 - go.opentelemetry.io/collector/component v0.70.0 - go.opentelemetry.io/collector/confmap v0.70.0 + go.opentelemetry.io/collector v0.70.1-0.20230125234100-6f1cbd851e62 + go.opentelemetry.io/collector/component v0.70.1-0.20230125234100-6f1cbd851e62 + go.opentelemetry.io/collector/confmap v0.70.1-0.20230125234100-6f1cbd851e62 go.opentelemetry.io/collector/exporter/loggingexporter v0.70.0 go.opentelemetry.io/collector/exporter/otlpexporter v0.70.0 go.opentelemetry.io/collector/exporter/otlphttpexporter v0.70.0 go.opentelemetry.io/collector/extension/ballastextension v0.70.0 go.opentelemetry.io/collector/extension/zpagesextension v0.70.0 - go.opentelemetry.io/collector/featuregate v0.70.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.70.0 + go.opentelemetry.io/collector/featuregate v0.70.1-0.20230125234100-6f1cbd851e62 + go.opentelemetry.io/collector/processor/batchprocessor v0.70.1-0.20230125234100-6f1cbd851e62 go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.70.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.70.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.70.1-0.20230125234100-6f1cbd851e62 go.uber.org/multierr v1.9.0 go.uber.org/zap v1.24.0 golang.org/x/sys v0.4.0 diff --git a/go.sum b/go.sum index ab4728bb52..b31caa7935 100644 --- a/go.sum +++ b/go.sum @@ -1846,12 +1846,12 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.52.0/go.mod h1:a9GvaOhyc0nVOUzqvdv5mxyWghCSso/WRO2GgRl4I1g= go.opentelemetry.io/collector v0.54.0/go.mod h1:FgNzyfb4sAGb5cqusB5znETJ8Pz4OQUBGbOeGIZ2rlQ= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= -go.opentelemetry.io/collector v0.70.0 h1:TScQZj/bCaLpDwDbNyhI6PGlh7WxntmAcI3z3hrGCqA= -go.opentelemetry.io/collector v0.70.0/go.mod h1:cNC9VPU99N8R+cBubX2B29a1y0Ji+Fi9tgAY1LwIMt0= -go.opentelemetry.io/collector/component v0.70.0 h1:4GrQKhXPFm1fl5rzTs2kIui4driRfUAmf9Tp7hUk8NE= -go.opentelemetry.io/collector/component v0.70.0/go.mod h1:oGcF4cJf1kSNe+heznP1s5JGZhhcE8CjaoJR6M2A0Rg= -go.opentelemetry.io/collector/confmap v0.70.0 h1:GJDaM7c3yFyT7Zv6l2/5ahwaqPCvtC92Ii8Bg2AVdjU= -go.opentelemetry.io/collector/confmap v0.70.0/go.mod h1:8//JWR2TMChLH35Az0mGFrCskEIP6POgZJK6iRRhzeM= +go.opentelemetry.io/collector v0.70.1-0.20230125234100-6f1cbd851e62 h1:SiUoAI1bHsw46jmmXdf76Gu54aGMFPRa+rXgXtqtyX8= +go.opentelemetry.io/collector v0.70.1-0.20230125234100-6f1cbd851e62/go.mod h1:cNC9VPU99N8R+cBubX2B29a1y0Ji+Fi9tgAY1LwIMt0= +go.opentelemetry.io/collector/component v0.70.1-0.20230125234100-6f1cbd851e62 h1:A1kULHMEojSKpbtGdxyFO/0YNl/R4eXHe3XrpEkDLEs= +go.opentelemetry.io/collector/component v0.70.1-0.20230125234100-6f1cbd851e62/go.mod h1:oGcF4cJf1kSNe+heznP1s5JGZhhcE8CjaoJR6M2A0Rg= +go.opentelemetry.io/collector/confmap v0.70.1-0.20230125234100-6f1cbd851e62 h1:NFQm5nA51/bka6wLLnt8k/ihSmJFFBsdRIA7j0s/SVc= +go.opentelemetry.io/collector/confmap v0.70.1-0.20230125234100-6f1cbd851e62/go.mod h1:8//JWR2TMChLH35Az0mGFrCskEIP6POgZJK6iRRhzeM= go.opentelemetry.io/collector/consumer v0.70.0 h1:Z103QX++5AOHqjhDTyx7ITOycQ26XnM0o6QuedOHx9U= go.opentelemetry.io/collector/consumer v0.70.0/go.mod h1:JfMJigmMJkAMWoL7fDNirOLY0QTE9wxcFccLyJZU7E0= go.opentelemetry.io/collector/exporter/loggingexporter v0.70.0 h1:PR01rOPeujJNWdSjMzITlHtFKQd6N8mSbwKJsFYt/r8= @@ -1864,8 +1864,8 @@ go.opentelemetry.io/collector/extension/ballastextension v0.70.0 h1:/o9XncugBomN go.opentelemetry.io/collector/extension/ballastextension v0.70.0/go.mod h1:5lNJXcoQ743wOxWEb6ncVE0HCi23p3TI/Jre5AxsnPc= go.opentelemetry.io/collector/extension/zpagesextension v0.70.0 h1:tRc2GYFZQKMgEajokb2mNiCh3cuO/PtKOtlxT3VKf+U= go.opentelemetry.io/collector/extension/zpagesextension v0.70.0/go.mod h1:JuIyTXNlXGHlSzVs6HK0NVQkFT/kGHfqn7HQI4rhnqY= -go.opentelemetry.io/collector/featuregate v0.70.0 h1:Xr6hrMT/++SjTm06nreex8WlpgFhYJ7S0yRVn1OvVf8= -go.opentelemetry.io/collector/featuregate v0.70.0/go.mod h1:ih+oCwrHW3bLac/qnPUzes28yDCDmh8WzsAKKauwCYI= +go.opentelemetry.io/collector/featuregate v0.70.1-0.20230125234100-6f1cbd851e62 h1:SOKtfNwEG9KoLmfpfjhzL5VL9aCfTz4LI6UQGhA3H/g= +go.opentelemetry.io/collector/featuregate v0.70.1-0.20230125234100-6f1cbd851e62/go.mod h1:ih+oCwrHW3bLac/qnPUzes28yDCDmh8WzsAKKauwCYI= go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw= go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY= go.opentelemetry.io/collector/pdata v0.52.0/go.mod h1:GJUTfTv8mlYpHRjcmHXVbvJr48EW/q/P/HuBvpXAE58= @@ -1874,12 +1874,12 @@ go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tm go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v1.0.0-rc4 h1:vIQHHiaDqvTM3I30j3PDo44ttkv9n8prroe4G+RsUe0= go.opentelemetry.io/collector/pdata v1.0.0-rc4/go.mod h1:ft/11i2R6Ld/DC543bAS4R30/W8heexIvNqtzmQpnLQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.70.0 h1:NsdvJNGzHDrM6uc9L+DMFhaBS8TfVJdSQ/oKfJt8EbM= -go.opentelemetry.io/collector/processor/batchprocessor v0.70.0/go.mod h1:nph333cNq6wz40bMtLvkPyv2HBL7Fw1sIvzGQhrLO4c= +go.opentelemetry.io/collector/processor/batchprocessor v0.70.1-0.20230125234100-6f1cbd851e62 h1:tGSNMZwfoCzjKMlHsyjjbGz60pon35nMMd1zikIzmYk= +go.opentelemetry.io/collector/processor/batchprocessor v0.70.1-0.20230125234100-6f1cbd851e62/go.mod h1:nph333cNq6wz40bMtLvkPyv2HBL7Fw1sIvzGQhrLO4c= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.70.0 h1:sGYFEMEdCotzjIzTHsexQOLSNm+HIz5tl10fzrhTHxM= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.70.0/go.mod h1:9kl+vykrb7a5nzN3bJX9Mbc3/YsyeHvrKTeG2Bs8UsU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.70.0 h1:sfcP6O30iB+rLNjsBokgR1nqhnoKIWyLWDH98eyrH2A= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.70.0/go.mod h1:vk/I0IW9OL996JGBYjdMrchfXne2Q3paVCM6MbItHR0= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.70.1-0.20230125234100-6f1cbd851e62 h1:a1MGY6Um7w3glzNA5+H77OzVrMDVQNys/zaWozuZyuE= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.70.1-0.20230125234100-6f1cbd851e62/go.mod h1:vk/I0IW9OL996JGBYjdMrchfXne2Q3paVCM6MbItHR0= go.opentelemetry.io/collector/semconv v0.52.0/go.mod h1:SxK0rUnUP7YeDakexzbE/vhimTOHwE6m/4aKKd9e27Q= go.opentelemetry.io/collector/semconv v0.54.0/go.mod h1:HAGkPKNMhc4kEHevEqVIEtUuvsRQMIbUWBb8yBrqEwk= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= diff --git a/pkg/config/config_factory.go b/pkg/config/config_factory.go index d9eb4c9325..ea90383f38 100644 --- a/pkg/config/config_factory.go +++ b/pkg/config/config_factory.go @@ -27,7 +27,7 @@ import ( "go.opentelemetry.io/collector/confmap/provider/fileprovider" "go.opentelemetry.io/collector/confmap/provider/httpprovider" - // "go.opentelemetry.io/collector/confmap/provider/httpsprovider" + "go.opentelemetry.io/collector/confmap/provider/httpsprovider" "go.opentelemetry.io/collector/confmap/provider/yamlprovider" "go.opentelemetry.io/collector/otelcol" ) @@ -51,7 +51,7 @@ func GetConfigProvider(flags *flag.FlagSet) otelcol.ConfigProvider { envprovider.New(), yamlprovider.New(), httpprovider.New(), - // httpsprovider.New(), + httpsprovider.New(), s3provider.New()} mapProviders := make(map[string]confmap.Provider, len(providers)) From 9b708150f3f01a0d46a973d704b27a788519ca21 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Fri, 27 Jan 2023 19:50:00 +0000 Subject: [PATCH 35/45] Update unit tests for new components Signed-off-by: Raphael Silva --- pkg/defaultcomponents/defaults_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/defaultcomponents/defaults_test.go b/pkg/defaultcomponents/defaults_test.go index 66e33e9e93..bd57be12d5 100644 --- a/pkg/defaultcomponents/defaults_test.go +++ b/pkg/defaultcomponents/defaults_test.go @@ -23,9 +23,9 @@ import ( const ( exportersCount = 14 - receiversCount = 9 + receiversCount = 10 extensionsCount = 7 - processorCount = 12 + processorCount = 14 ) func TestComponents(t *testing.T) { @@ -58,6 +58,7 @@ func TestComponents(t *testing.T) { assert.NotNil(t, receivers["awscontainerinsightreceiver"]) assert.NotNil(t, receivers["awsxray"]) assert.NotNil(t, receivers["statsd"]) + // core receivers assert.NotNil(t, receivers["otlp"]) // other receivers @@ -65,6 +66,7 @@ func TestComponents(t *testing.T) { assert.NotNil(t, receivers["zipkin"]) assert.NotNil(t, receivers["jaeger"]) assert.NotNil(t, receivers["kafka"]) + assert.NotNil(t, receivers["hostmetrics"]) extensions := factories.Extensions assert.Len(t, extensions, extensionsCount) @@ -96,4 +98,6 @@ func TestComponents(t *testing.T) { assert.NotNil(t, processors["resourcedetection"]) assert.NotNil(t, processors["cumulativetodelta"]) assert.NotNil(t, processors["deltatorate"]) + assert.NotNil(t, processors["tail_sampling"]) + assert.NotNil(t, processors["groupbytrace"]) } From 6c85a2e0e5c58434d420feff4c66afba228a0b3e Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Fri, 27 Jan 2023 12:25:33 -0800 Subject: [PATCH 36/45] fix formatting Co-authored-by: Anthony Mirabella --- pkg/config/config_factory.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/config/config_factory.go b/pkg/config/config_factory.go index ea90383f38..918d284347 100644 --- a/pkg/config/config_factory.go +++ b/pkg/config/config_factory.go @@ -26,7 +26,6 @@ import ( "go.opentelemetry.io/collector/confmap/provider/envprovider" "go.opentelemetry.io/collector/confmap/provider/fileprovider" "go.opentelemetry.io/collector/confmap/provider/httpprovider" - "go.opentelemetry.io/collector/confmap/provider/httpsprovider" "go.opentelemetry.io/collector/confmap/provider/yamlprovider" "go.opentelemetry.io/collector/otelcol" From 3ee7326558373a9689585d1962b8ad383dff45dc Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Fri, 27 Jan 2023 20:26:15 +0000 Subject: [PATCH 37/45] Fix formatting Signed-off-by: Raphael Silva --- pkg/config/config_factory.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/config/config_factory.go b/pkg/config/config_factory.go index 918d284347..d514c59c0f 100644 --- a/pkg/config/config_factory.go +++ b/pkg/config/config_factory.go @@ -51,7 +51,8 @@ func GetConfigProvider(flags *flag.FlagSet) otelcol.ConfigProvider { yamlprovider.New(), httpprovider.New(), httpsprovider.New(), - s3provider.New()} + s3provider.New(), + } mapProviders := make(map[string]confmap.Provider, len(providers)) for _, provider := range providers { From 745d133021ab249f25a5cb64144e153681cbcc51 Mon Sep 17 00:00:00 2001 From: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> Date: Tue, 7 Feb 2023 09:14:20 -0800 Subject: [PATCH 38/45] Update dev branch (#1826) * [chore]- Merge release/v0.25.0 branch to main v0.68.0 (#1792) * update allowlist to include operator version 0.68.0 (#1783) * update allowlist to include operator version 0.68.0 * Updating allowlist * Add ref for cache-from value (#1778) (#1787) Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> * Use us-west-2 region in prod (#1794) --------- Co-authored-by: Paurush Garg <62579325+PaurushGarg@users.noreply.github.com> Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> * Limit Cocurrent jobs to 4 (#1795) * Added retry wait time of 10 sec between failed jobs (#1796) * Login public ECR to increase rate limit (#1798) * Add PR build creds (#1803) * Remove wait duration and max concurrency (#1805) * Support version upgrade for MSI packages (#1808) * update windows package * add unique product ID * Linting * Add unique Product ID string * move major upgrade below package tag * Generate GUID using GUIDgen * Update tools/packaging/windows/aws-otel-collector.wxs Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> * Update sed search pattern * Update tools/release/bump-version-and-create-release-note.sh * Update tools/release/bump-version-and-create-release-note.sh Co-authored-by: Anthony Mirabella --------- Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> Co-authored-by: Anthony Mirabella * bump version to v0.26.0 (#1809) * Update Readme links for docs (#1812) Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> --------- Co-authored-by: Vasi Vasireddy <41936996+vasireddy99@users.noreply.github.com> Co-authored-by: Paurush Garg <62579325+PaurushGarg@users.noreply.github.com> Co-authored-by: Kausik Co-authored-by: Anthony Mirabella --- .github/workflows/CD-adot-operator.yml | 2 +- .github/workflows/PR-build.yml | 17 +++++++++++++++++ README.md | 4 ++-- VERSION | 2 +- docs/releases/v0.26.0.md | 12 ++++++++++++ tools/packaging/windows/aws-otel-collector.wxs | 12 ++++++++++-- .../adot-operator-images-mirror/config.yaml | 7 ++++++- .../bump-version-and-create-release-note.sh | 4 ++++ versions.yaml | 2 +- 9 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 docs/releases/v0.26.0.md diff --git a/.github/workflows/CD-adot-operator.yml b/.github/workflows/CD-adot-operator.yml index 9b86cb224a..2b2073ea83 100644 --- a/.github/workflows/CD-adot-operator.yml +++ b/.github/workflows/CD-adot-operator.yml @@ -39,7 +39,7 @@ jobs: uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ secrets.COLLECTOR_PROD_RELEASE_ROLE_ARN }} - aws-region: us-east-1 + aws-region: us-west-2 - name: Login to Public Release ECR uses: docker/login-action@v2 diff --git a/.github/workflows/PR-build.yml b/.github/workflows/PR-build.yml index c436e1ea20..2cd7826a3a 100644 --- a/.github/workflows/PR-build.yml +++ b/.github/workflows/PR-build.yml @@ -30,6 +30,10 @@ concurrency: group: pr-build-${{ github.event.pull_request.number }} cancel-in-progress: true +permissions: + id-token: write + contents: read + jobs: create-test-ref: runs-on: ubuntu-latest @@ -258,6 +262,19 @@ jobs: if: ${{ needs.changes.outputs.changed == 'true' }} run: cp -R build aws-otel-collector/build + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1-node16 + with: + role-to-assume: ${{ secrets.COLLECTOR_PR_BUILD_ROLE_ARN }} + aws-region: us-east-1 + + - name: Login to Public Integration Test ECR + uses: docker/login-action@v2 + with: + registry: public.ecr.aws + env: + AWS_REGION: us-east-1 + - name: Run test if: ${{ needs.changes.outputs.changed == 'true' }} uses: nick-invision/retry@v2 diff --git a/README.md b/README.md index 20b6c5f3f1..08e77d6bf7 100644 --- a/README.md +++ b/README.md @@ -70,8 +70,8 @@ so you can customize or port your OpenTelemetry Collector configuration files wh The ADOT Collector supports all AWS computing platforms and Docker/Kubernetes. Here are some examples on how to run the ADOT Collector to send telemetry data: * [Run it with Docker](docs/developers/docker-demo.md) -* [Run it with ECS](docs/developers/ecs-demo.md) -* [Run it with EKS](docs/developers/eks-demo.md) +* [Run it with ECS](https://aws-otel.github.io/docs/setup/ecs) +* [Run it with EKS](https://aws-otel.github.io/docs/setup/eks) * [Run it on EC2 (Amazon Linux 2)](docs/developers/linux-rpm-demo.md) * [Run it on EC2 (Windows)](docs/developers/windows-other-demo.md) * [Run it on EC2 (Debian)](docs/developers/debian-deb-demo.md) diff --git a/VERSION b/VERSION index 5bd9725a34..eaf8bae706 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.25.0 +v0.26.0 diff --git a/docs/releases/v0.26.0.md b/docs/releases/v0.26.0.md new file mode 100644 index 0000000000..54c7ff2752 --- /dev/null +++ b/docs/releases/v0.26.0.md @@ -0,0 +1,12 @@ +# Changelog + +## [v0.26.0](https://github.com/aws-observability/aws-otel-collector/tree/v0.26.0) (2023-02-02) + +[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.25.0...v0.26.0) + +**Merged pull requests:** + +- Update windows packaging to use fixed Product ID [\#1808](https://github.com/aws-observability/aws-otel-collector/pull/1808) ([Kausik-A](https://github.com/Kausik-A)) +- Update upstream dependencies to v0.70.0 [\#1775](https://github.com/aws-observability/aws-otel-collector/pull/1775) ([bryan-aguilar](https://github.com/bryan-aguilar)) + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* diff --git a/tools/packaging/windows/aws-otel-collector.wxs b/tools/packaging/windows/aws-otel-collector.wxs index 1b342a03b9..6056aac690 100644 --- a/tools/packaging/windows/aws-otel-collector.wxs +++ b/tools/packaging/windows/aws-otel-collector.wxs @@ -1,13 +1,15 @@ - + + + + + diff --git a/tools/release/adot-operator-images-mirror/config.yaml b/tools/release/adot-operator-images-mirror/config.yaml index 6a05831eed..e7f10efe5a 100644 --- a/tools/release/adot-operator-images-mirror/config.yaml +++ b/tools/release/adot-operator-images-mirror/config.yaml @@ -3,7 +3,8 @@ sourceRepos: - registry: open-telemetry/opentelemetry-operator name: opentelemetry-operator host: ghcr.io - allowed_tags: + allowed_tags: + - v0.68.0 - v0.66.0 - v0.62.1 - v0.61.0 @@ -28,6 +29,7 @@ sourceRepos: - 0.1.0 - 0.60.0 - 0.66.0 + - 0.68.0 - registry: open-telemetry/opentelemetry-operator name: autoinstrumentation-java host: ghcr.io @@ -36,12 +38,14 @@ sourceRepos: - 1.18.0 - 1.19.1 - 1.20.2 + - 1.22.1 - registry: open-telemetry/opentelemetry-operator name: autoinstrumentation-nodejs host: ghcr.io allowed_tags: - 0.27.0 - 0.31.0 + - 0.34.0 - registry: open-telemetry/opentelemetry-operator name: autoinstrumentation-python host: ghcr.io @@ -52,6 +56,7 @@ sourceRepos: - 0.33b0 - 0.34b0 - 0.35b0 + - 0.36b0 - registry: open-telemetry/opentelemetry-operator name: autoinstrumentation-dotnet host: ghcr.io diff --git a/tools/release/bump-version-and-create-release-note.sh b/tools/release/bump-version-and-create-release-note.sh index a4ace0a66e..74906c3b25 100755 --- a/tools/release/bump-version-and-create-release-note.sh +++ b/tools/release/bump-version-and-create-release-note.sh @@ -35,6 +35,10 @@ docker run --rm -it -v "$(pwd)":/usr/local/src/your-app ferrarimarco/github-chan # bump the version echo "${RELEASE_VERSION}" >VERSION +#Update aws-otel-collector wxs template file. +# Note: Only supports [0-9]*.[0-9]*.[0-9]* version pattern. If we decide to release with a full sem ver vX.XX.XX-prerelease then the .wxs file will need to be manually updated +sed -i '' "s/^Version\=\"[0-9]+.[0-9]+.[0-9]+\"/Version=\"${RELEASE_VERSION:1}\"/" tools/packaging/windows/aws-otel-collector.wxs + # git commit git add VERSION "docs/releases/${RELEASE_VERSION}.md" git commit -m "bump version to ${RELEASE_VERSION}" diff --git a/versions.yaml b/versions.yaml index ddeb3c7132..df3a385fc2 100644 --- a/versions.yaml +++ b/versions.yaml @@ -16,7 +16,7 @@ module-sets: #Github Repo for Go Multimod: https://github.com/open-telemetry/opentelemetry-go-build-tools/tree/main/multimod #Goals: Centralize all the module set into one files and use this version yaml to manage all the module set during the release. adot-base: - version: v0.25.0 + version: v0.26.0 modules: - github.com/aws-observability/aws-otel-collector - github.com/aws-observability/aws-otel-collector/pkg/lambdacomponents From 989d59a8b576c0556189554861e0dfa522b07db2 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 21 Feb 2023 01:18:46 +0000 Subject: [PATCH 39/45] Use dev branch of test framework --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a728f961ee..35b47808d3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -68,7 +68,7 @@ jobs: id: setRef run: | - if [[ ${{ github.ref_name }} == release/v* ]]; then + if [[ ${{ github.ref_name }} == release/v* || ${{ github.ref_name }} == dev ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT else echo "ref=terraform" >> $GITHUB_OUTPUT From 7040141edb0a258608a3c8257b9c54f0624d3e3f Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Wed, 15 Mar 2023 13:31:52 -0700 Subject: [PATCH 40/45] Add support to remote uris in service control scripts in Windows and Linux (#1846) * Add support to remote uris in the control scripts It is now possible to pass remote uris such as http, https and s3 to the control scripts in Windows an Linux. --------- Signed-off-by: Raphael Silva --- .env | 2 +- tools/ctl/linux/aws-otel-collector-ctl | 41 ++++++++++++++++-- tools/ctl/windows/aws-otel-collector-ctl.ps1 | 44 ++++++++++++++++---- 3 files changed, 74 insertions(+), 13 deletions(-) diff --git a/.env b/.env index 4871fce10f..4f9b8e5345 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -config=--config /opt/aws/aws-otel-collector/etc/config.yaml +config="--config /opt/aws/aws-otel-collector/etc/config.yaml" diff --git a/tools/ctl/linux/aws-otel-collector-ctl b/tools/ctl/linux/aws-otel-collector-ctl index 32f7dfc606..6cb6d5ca0f 100644 --- a/tools/ctl/linux/aws-otel-collector-ctl +++ b/tools/ctl/linux/aws-otel-collector-ctl @@ -19,16 +19,16 @@ set -u readonly AGENTDIR="/opt/aws/aws-otel-collector" readonly CMDDIR="${AGENTDIR}/bin" readonly CONFDIR="${AGENTDIR}/etc" +readonly ENV_FILE="${CONFDIR}/.env" readonly DFT_CONFDIR="${AGENTDIR}/var" readonly LOGDIR="${AGENTDIR}/logs" -readonly RESTART_FILE="${CONFDIR}/restart" readonly VERSION_FILE="${CMDDIR}/VERSION" SYSTEMD='false' UsageString=" - usage: aws-otel-collector-ctl -a stop|start|status| [-c file:] + usage: aws-otel-collector-ctl -a stop|start|status| [-c ] e.g. 1. start collector on onPermise host with a custom .yaml config file: @@ -44,13 +44,27 @@ UsageString=" status: get the status of the agent process. -c: configuration - file:: file path on the host + : - file path on the host. E.g.: /tmp/config.yaml or file:/tmp/config.yaml + - http uri. E.g.: http://example.com/config + - https uri. E.g.: https://example.com/config + - s3 uri. E.g.: s3://bucket/config " -aoc_start() { +aoc_config_remote_uri() { + config="${1:-}" + + echo "config=\"--config ${config}\"" > $ENV_FILE +} + +aoc_config_local_uri() { config="${1:-}" + # Strip the file scheme in case it is present + config="${config#file:}" + + echo "config=\"--config /opt/aws/aws-otel-collector/etc/config.yaml\"" > $ENV_FILE + if [ ! -z $config ] && [ -f $config ]; then cp $config $CONFDIR/config.yaml fi @@ -58,6 +72,25 @@ aoc_start() { if [ ! -f $CONFDIR/config.yaml ]; then cp $DFT_CONFDIR/.config.yaml $CONFDIR/config.yaml fi +} + +is_remote_uri() { + config="${1:-}" + + if [[ $config =~ ^[a-zA-Z0-9]+:// && ! $config =~ ^file: ]]; then + return 0; + fi + return 1 +} + +aoc_start() { + config="${1:-}" + + if is_remote_uri "$config"; then + aoc_config_remote_uri $config + else + aoc_config_local_uri $config + fi if [ "${SYSTEMD}" = 'true' ]; then systemctl daemon-reload diff --git a/tools/ctl/windows/aws-otel-collector-ctl.ps1 b/tools/ctl/windows/aws-otel-collector-ctl.ps1 index 93079ccd36..3826696d6a 100644 --- a/tools/ctl/windows/aws-otel-collector-ctl.ps1 +++ b/tools/ctl/windows/aws-otel-collector-ctl.ps1 @@ -47,8 +47,11 @@ $UsageString = @" start: start the agent process. status: get the status of the agent process. - -c: configuration - file:: file path on the host + -c: + - file path on the host. E.g.: c:\tmp\config.yaml or file:c:\tmp\config.yaml + - http uri. E.g.: http://example.com/config + - https uri. E.g.: https://example.com/config + - s3 uri. E.g.: s3://bucket/config "@ @@ -68,18 +71,43 @@ $AOCLogDirectory = "${AOCProgramData}\Logs" $VersionFile ="${AOCProgramFiles}\VERSION" # The windows service registration assumes exactly this .yaml file path and name -$ProgramFilesYAML="${Env:ProgramFiles}\${AOCDirectory}\config.yaml" +$ProgramFilesYAML="${Env:ProgramFiles}\${AOCDirectory}\config.yaml" $YAML="${AOCProgramData}\config.yaml" +Function Get-Service-Config-Uri() { + $service = Get-WmiObject win32_service -Filter "name=""${AOCServiceName}""" + $service.PathName -match "--config=""(.*)""" + + return $Matches.1 +} + +Function Set-Service-Config-Uri ([string]$uri) { + $aoc_cmd = "\""${AOCProgramFiles}\.aws-otel-collector.exe\"" --config=\""${uri}\""" + sc.exe config "${AOCServiceName}" binPath= "${aoc_cmd}" +} + +Function Test-Remote-Uri ([string]$uri) { + return $uri -match "^[a-zA-Z0-9]+://" -and $uri -notmatch "^file:" +} + Function AOCStart() { - if($ConfigLocation -and $ConfigLocation -ne 'default'){ - Copy-Item "${ConfigLocation}" -Destination ${ProgramFilesYAML} + + if($ConfigLocation -and $ConfigLocation -ne 'default') { + if (Test-Remote-Uri $ConfigLocation) { + Set-Service-Config-Uri ${ConfigLocation} + } else { + # Strip file scheme in case it is present + $ConfigLocation = "$ConfigLocation" -replace "^file:", "" + + Copy-Item "${ConfigLocation}" -Destination ${ProgramFilesYAML} + Set-Service-Config-Uri ${ProgramFilesYAML} + } } - if (!(Test-Path -LiteralPath "${ProgramFilesYAML}")) { + if (!(Test-Remote-Uri(Get-Service-Config-Uri)) -and !(Test-Path -LiteralPath "${ProgramFilesYAML}")) { Write-Output "Configuration not specified. Applying default configuration before starting it." - Copy-Item "${YAML}" -Destination ${ProgramFilesYAML} - } + Copy-Item "${YAML}" -Destination ${ProgramFilesYAML} + } $svc = Get-Service -Name "${AOCServiceName}" -ErrorAction SilentlyContinue if (!$svc) { From 28886e4029301195427fa3ee3e7ea6928380832d Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Wed, 29 Mar 2023 11:47:51 -0700 Subject: [PATCH 41/45] fix: make collector control script posix compliant (#1936) * Fix: make collector control script posix compliant * Add support to shellcheck. --------- Signed-off-by: Raphael Silva --- .github/workflows/CI.yml | 4 ++-- .github/workflows/PR-build.yml | 8 ++++---- Makefile | 10 ++++++++++ tools/ctl/linux/aws-otel-collector-ctl | 21 ++++++++++----------- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 35b47808d3..640bc86a3d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -156,9 +156,9 @@ jobs: path: build # Unit Test and attach test coverage badge - - name: Unit Test + - name: Linting && Unit Test if: steps.cached_binaries.outputs.cache-hit != 'true' - run: make gotest + run: make test-all - name: Upload Coverage report to CodeCov if: steps.cached_binaries.outputs.cache-hit != 'true' diff --git a/.github/workflows/PR-build.yml b/.github/workflows/PR-build.yml index 2cd7826a3a..4812705862 100644 --- a/.github/workflows/PR-build.yml +++ b/.github/workflows/PR-build.yml @@ -104,10 +104,10 @@ jobs: key: "cached_binaries_${{ github.run_id }}" path: build - # Unit Test and attach test coverage badge - - name: Unit Test + # Linting && Unit Test and attach test coverage badge + - name: Tests - Lint and unit test if: ${{ needs.changes.outputs.changed == 'true' && steps.cached_binaries.outputs.cache-hit != 'true' }} - run: make gotest + run: make test-all - name: Upload Coverage report to CodeCov if: ${{ needs.changes.outputs.changed == 'true' && steps.cached_binaries.outputs.cache-hit != 'true' }} @@ -287,4 +287,4 @@ jobs: on_retry_command: | cd testing-framework/terraform/mock && terraform destroy -auto-approve && sleep $((RANDOM % 10)) env: - DOCKER_BUILDKIT: 1 # Required for TARGETARCH to be populated with Docker compose. \ No newline at end of file + DOCKER_BUILDKIT: 1 # Required for TARGETARCH to be populated with Docker compose. diff --git a/Makefile b/Makefile index 2150da4ccc..547a44eab8 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,9 @@ ALL_SRC := $(shell find . -name '*.go' \ # ALL_MODULES includes ./* dirs (excludes . dir) ALL_MODULES := $(shell find . -type f -name "go.mod" -exec dirname {} \; | sort | egrep '^./' ) +# TODO: replace by a find command that looks for all the ".sh" files + other scripts +ALL_SHELL_SCRIPTS := "tools/ctl/linux/aws-otel-collector-ctl" + BUILD_INFO_IMPORT_PATH=$(AOC_IMPORT_PATH)/tools/version GOBUILD=GO111MODULE=on CGO_ENABLED=0 installsuffix=cgo go build -trimpath @@ -157,6 +160,13 @@ docker-stop: gotest: @$(MAKE) for-all-target TARGET="test" +.PHONY: lint-sh +lint-sh: + shellcheck ${ALL_SHELL_SCRIPTS} + +.PHONY: test-all +test-all: gotest lint-sh + .PHONY: gofmt gofmt: @$(MAKE) for-all-target TARGET="fmt" diff --git a/tools/ctl/linux/aws-otel-collector-ctl b/tools/ctl/linux/aws-otel-collector-ctl index 6cb6d5ca0f..061d165a5b 100644 --- a/tools/ctl/linux/aws-otel-collector-ctl +++ b/tools/ctl/linux/aws-otel-collector-ctl @@ -21,7 +21,6 @@ readonly CMDDIR="${AGENTDIR}/bin" readonly CONFDIR="${AGENTDIR}/etc" readonly ENV_FILE="${CONFDIR}/.env" readonly DFT_CONFDIR="${AGENTDIR}/var" -readonly LOGDIR="${AGENTDIR}/logs" readonly VERSION_FILE="${CMDDIR}/VERSION" SYSTEMD='false' @@ -57,6 +56,7 @@ aoc_config_remote_uri() { echo "config=\"--config ${config}\"" > $ENV_FILE } + aoc_config_local_uri() { config="${1:-}" @@ -65,8 +65,8 @@ aoc_config_local_uri() { echo "config=\"--config /opt/aws/aws-otel-collector/etc/config.yaml\"" > $ENV_FILE - if [ ! -z $config ] && [ -f $config ]; then - cp $config $CONFDIR/config.yaml + if [ -n "$config" ] && [ -f "$config" ]; then + cp "$config" $CONFDIR/config.yaml fi if [ ! -f $CONFDIR/config.yaml ]; then @@ -77,7 +77,8 @@ aoc_config_local_uri() { is_remote_uri() { config="${1:-}" - if [[ $config =~ ^[a-zA-Z0-9]+:// && ! $config =~ ^file: ]]; then + if echo "$config" | grep -E -q "^[a-zA-Z0-9]+://" && \ + ! echo "$config" | grep -E -q "^file:"; then return 0; fi return 1 @@ -87,9 +88,9 @@ aoc_start() { config="${1:-}" if is_remote_uri "$config"; then - aoc_config_remote_uri $config + aoc_config_remote_uri "$config" else - aoc_config_local_uri $config + aoc_config_local_uri "$config" fi if [ "${SYSTEMD}" = 'true' ]; then @@ -132,7 +133,7 @@ aoc_status() { fi starttime_fmt='' - if [ ${pid} ] && [ ${pid} -ne 0 ]; then + if [ -n "${pid}" ] && [ "${pid}" -ne "0" ]; then starttime="$(TZ=UTC ps -o lstart= "${pid}")" starttime_fmt="$(TZ=UTC date -Isec -d "${starttime}")" fi @@ -169,7 +170,6 @@ aoc_runstatus() { main() { action='' - restart='false' mode='ec2' config_location='' @@ -187,13 +187,12 @@ main() { fi OPTIND=1 - while getopts ":hsa:r:c:m:" opt; do + while getopts ":ha:c:m:" opt; do case "${opt}" in h) echo "${UsageString}" exit 0 ;; - s) restart='true' ;; a) action="${OPTARG}" ;; c) config_location="${OPTARG}" ;; m) mode="${OPTARG}" ;; @@ -206,7 +205,7 @@ main() { ;; esac done - shift "$((${OPTIND} - 1))" + shift "$(( OPTIND - 1))" case "${mode}" in ec2) ;; From 2c670c76dcef7b90b790a1e746b60ac533e6d62d Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 4 Apr 2023 22:38:57 +0000 Subject: [PATCH 42/45] Remove components that were not tested --- go.mod | 5 ----- go.sum | 9 --------- pkg/defaultcomponents/defaults.go | 6 ------ pkg/defaultcomponents/defaults_test.go | 7 ++----- 4 files changed, 2 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 7f2eac16e6..d56fd5fdf3 100644 --- a/go.mod +++ b/go.mod @@ -25,18 +25,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.74.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.74.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.74.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.74.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.74.0 @@ -219,7 +216,6 @@ require ( github.com/klauspost/compress v1.16.3 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect - github.com/leoluk/perflib_exporter v0.2.0 // indirect github.com/lightstep/go-expohisto v1.0.0 // indirect github.com/linode/linodego v1.12.0 // indirect github.com/lufia/plan9stats v0.0.0-20220517141722-cf486979b281 // indirect @@ -258,7 +254,6 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.74.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.74.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.74.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.74.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.74.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.74.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.74.0 // indirect diff --git a/go.sum b/go.sum index dbf62e4b75..f254b611b8 100644 --- a/go.sum +++ b/go.sum @@ -1068,7 +1068,6 @@ github.com/kulti/thelper v0.4.0/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5 github.com/kunwardeep/paralleltest v1.0.2/go.mod h1:ZPqNm1fVHPllh5LPVujzbVz1JN2GhLxSfY+oqUsvG30= github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= github.com/leoluk/perflib_exporter v0.2.0 h1:WJU7N3AIHxfc3CjoEJcBgG3i2ltF5Yz1ADVY9T6f1BY= -github.com/leoluk/perflib_exporter v0.2.0/go.mod h1:MinSWm88jguXFFrGsP56PtleUb4Qtm4tNRH/wXNXRTI= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= @@ -1338,8 +1337,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.74. github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.74.0/go.mod h1:nnGw/pkya09FC1vFq43qF4SJqKVWBtthWxnaUhpzKbc= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.74.0 h1:uXU/j2wlz48jdDSdP1JSQ5YvndOvTBxYMSrm9qVNbK8= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.74.0/go.mod h1:Mw25QbP/VYqzGcR0UCwRlUu4EJUO7EreoalM87KgXGk= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.74.0 h1:EVT7MQ6EEav+z9IH6ArRObk2c72jIFA6/xlaO7DxV4k= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.74.0/go.mod h1:EQPvJtjXZzwpqbW/JPIFqzXo0hnpvUadYE7MvGTwQyo= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.74.0 h1:ADJ6Lcfu2qfe5qEETxg3RvbwLa9/6l6oghEMxA7XAtc= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.74.0/go.mod h1:kLKdaPGMwQo/3UPB7xekmtzlk7sk2+DxIjxMn5vcUZk= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.74.0 h1:HUDDdk1cjAYu4unzCq3PC8j+zuOsBIkLMFXjuOW975Q= @@ -1372,8 +1369,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatoratep github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.74.0/go.mod h1:rpdAGbzbDqdUBp47kj+bWDK+07zP4UbsTfzl8ZZjeZY= github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.74.0 h1:11kk61GJqLQ9lsveDUBfvJ3aN/Eq3nkDZoE7fzjztDY= github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.74.0/go.mod h1:Yt0Ve0tOdKE30Qu6pHGRXYn3FgCKlqaY/lrbDb2j/+8= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.74.0 h1:bTX8DCkPIlrEMvHxZj+xcDbP81HWiKk/MqoDy2/DACs= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.74.0/go.mod h1:TRphwz90t2wMIhSXXZNktHSfMFktFC5qpmGdzQfUMlQ= github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.74.0 h1:BcNlPYa433bJiInu+mzBiLmolupkHYwcbvskb7oV0aE= github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.74.0 h1:QaFZHuIZPvn1+sbg/gjWxEya5kdrzSk/Ovy3dDjpdsA= github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.74.0/go.mod h1:7DNVKjh+gpIHIWcaaWyM+YGXwkgxNIuEcJCc3/u0cBE= @@ -1387,8 +1382,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceproc github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.74.0/go.mod h1:LISh6PelAL9fA7bw8dmuXT2BG8p9Pto3jJ22/ktuxqs= github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.74.0 h1:m/JCoPMp5mXVRaVTSdl9Gltq4VrwPqa8phpSTekwUic= github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.74.0/go.mod h1:t9nGHTsdvAWmR5eRWN4lg7G89YF+GvjZxMG5YYDmJVU= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.74.0 h1:zOyc8V0d4Ui2E0rRxgoMT6eREEvhVgaRFXBa+N/oBlY= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.74.0/go.mod h1:Q+jVTx0ndkhfqZO8LK8Yv2+jLn+t/w3g0FRrrvBtU3s= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.74.0 h1:13Hcb8qAo7vC1Jeegp3VCn7Gkb5s+5DX/CnHDsyjJK0= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.74.0/go.mod h1:G2aPqiW8+GzlZrenKPvcdFbXMpoHqEQI1z/KltIzxYA= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.74.0 h1:FGwk+ZEm/sIa1M+dlDCOR2QvPyDFUT+5HjKfgn+oKTo= @@ -1397,7 +1390,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiv github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.74.0/go.mod h1:sVDD4j8sHRKfboQnwm4lYywwZ3sBN6kJCXdo5+AMBsI= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.74.0 h1:vqWHz8qRGRhT/+j3Hb0VOzIXNZ6UK48Ne3opFdnNr3k= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.74.0 h1:v4Tm0q7+h7eabsoSZAi86KrnfDO0ZjdQmAwE20GaLzM= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.74.0/go.mod h1:HrdTLwp8GyGJKhhV4MEvk+IBNZ35a+mRssM60AFTQ0s= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.74.0 h1:pWNSPCKD+V4rC+MnZj8uErEbcsYUpEqU3InNYyafAPY= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.74.0/go.mod h1:0lXcDf6LUbtDxZZO3zDbRzMuL7gL1Q0FPOR8/3IBwaQ= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.74.0 h1:NWd9+rQTd6pELLf3copo7CEuNgKp90kgyhPozpwax2U= @@ -1535,7 +1527,6 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.34.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE= github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= diff --git a/pkg/defaultcomponents/defaults.go b/pkg/defaultcomponents/defaults.go index 4690fb9761..071e7e8069 100644 --- a/pkg/defaultcomponents/defaults.go +++ b/pkg/defaultcomponents/defaults.go @@ -36,18 +36,15 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor" - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor" - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" @@ -93,7 +90,6 @@ func Components() (otelcol.Factories, error) { awsxrayreceiver.NewFactory(), statsdreceiver.NewFactory(), prometheusreceiver.NewFactory(), - hostmetricsreceiver.NewFactory(), kafkareceiver.NewFactory(), jaegerreceiver.NewFactory(), zipkinreceiver.NewFactory(), @@ -110,8 +106,6 @@ func Components() (otelcol.Factories, error) { probabilisticsamplerprocessor.NewFactory(), spanprocessor.NewFactory(), filterprocessor.NewFactory(), - groupbytraceprocessor.NewFactory(), - tailsamplingprocessor.NewFactory(), metricstransformprocessor.NewFactory(), resourcedetectionprocessor.NewFactory(), metricsgenerationprocessor.NewFactory(), diff --git a/pkg/defaultcomponents/defaults_test.go b/pkg/defaultcomponents/defaults_test.go index bd57be12d5..33ddcf889a 100644 --- a/pkg/defaultcomponents/defaults_test.go +++ b/pkg/defaultcomponents/defaults_test.go @@ -23,9 +23,9 @@ import ( const ( exportersCount = 14 - receiversCount = 10 + receiversCount = 9 extensionsCount = 7 - processorCount = 14 + processorCount = 12 ) func TestComponents(t *testing.T) { @@ -66,7 +66,6 @@ func TestComponents(t *testing.T) { assert.NotNil(t, receivers["zipkin"]) assert.NotNil(t, receivers["jaeger"]) assert.NotNil(t, receivers["kafka"]) - assert.NotNil(t, receivers["hostmetrics"]) extensions := factories.Extensions assert.Len(t, extensions, extensionsCount) @@ -98,6 +97,4 @@ func TestComponents(t *testing.T) { assert.NotNil(t, processors["resourcedetection"]) assert.NotNil(t, processors["cumulativetodelta"]) assert.NotNil(t, processors["deltatorate"]) - assert.NotNil(t, processors["tail_sampling"]) - assert.NotNil(t, processors["groupbytrace"]) } From d3141c4f4e7672616df9c5dbaba807eb086e9346 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Tue, 4 Apr 2023 22:42:26 +0000 Subject: [PATCH 43/45] Use CI workflows from main branch Signed-off-by: Raphael Silva --- .github/workflows/CI-Operator.yml | 1 - .github/workflows/CI.yml | 51 ++++++++++++++++++++++++++----- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI-Operator.yml b/.github/workflows/CI-Operator.yml index 84b2a63932..1b68059ef1 100644 --- a/.github/workflows/CI-Operator.yml +++ b/.github/workflows/CI-Operator.yml @@ -52,7 +52,6 @@ jobs: - name: Set testRef output id: setRef run: | - if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT else diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 664a310acc..d8330fda78 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,9 +47,10 @@ env: GITHB_RUN_ID: ${{ github.run_id }} DDB_TABLE_NAME: BatchTestCache MAX_JOBS: 90 - BATCH_INCLUDED_SERVICES: EC2,ECS + BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE GO_VERSION: ~1.20.2 + concurrency: group: ci-batched${{ github.ref_name }} cancel-in-progress: true @@ -67,8 +68,7 @@ jobs: - name: Set testRef output id: setRef run: | - - if [[ ${{ github.ref_name }} == release/v* || ${{ github.ref_name }} == dev ]]; then + if [[ ${{ github.ref_name }} == release/v* ]]; then echo "ref=${{github.ref_name}}" >> $GITHUB_OUTPUT else echo "ref=terraform" >> $GITHUB_OUTPUT @@ -156,9 +156,9 @@ jobs: path: build # Unit Test and attach test coverage badge - - name: Linting && Unit Test + - name: Unit Test if: steps.cached_binaries.outputs.cache-hit != 'true' - run: make test-all + run: make gotest - name: Upload Coverage report to CodeCov if: steps.cached_binaries.outputs.cache-hit != 'true' @@ -730,9 +730,46 @@ jobs: cd testing-framework/terraform make checkCacheHits + release-candidate: + runs-on: ubuntu-latest + if: ${{ always() && needs.validate-all-tests-pass.result == 'success' }} + needs: validate-all-tests-pass + steps: + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1-node16 + with: + role-to-assume: ${{ secrets.COLLECTOR_ASSUMABLE_ROLE_ARN }} + aws-region: us-west-2 + + - name: restore cached packages + uses: actions/cache@v3 + with: + path: "${{ env.PACKAGING_ROOT }}" + key: "cached_packages_${{ github.run_id }}" + + - name: prepare production version + run: | + TESTING_VERSION=`cat $PACKAGING_ROOT/VERSION` + VERSION=`echo $TESTING_VERSION | awk -F "-" '{print $1}'` + echo $VERSION > $PACKAGING_ROOT/VERSION + echo $GITHUB_SHA > $PACKAGING_ROOT/GITHUB_SHA + echo $TESTING_VERSION > $PACKAGING_ROOT/TESTING_VERSION + + - name: upload packages as release candidate on s3 + run: | + tar czvf $GITHUB_SHA.tar.gz build + aws s3 cp $GITHUB_SHA.tar.gz s3://aws-otel-collector-release-candidate/$GITHUB_SHA.tar.gz + + - name: Trigger performance test + uses: peter-evans/repository-dispatch@v2 + with: + token: "${{ secrets.REPO_WRITE_ACCESS_TOKEN }}" + event-type: trigger-perf + client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}' + publish-ci-status: runs-on: ubuntu-latest - needs: [validate-all-tests-pass] + needs: [release-candidate] if: always() steps: - name: Configure AWS Credentials @@ -743,7 +780,7 @@ jobs: - name: Publish CI status run: | - if [ '${{ needs.validate-all-tests-pass.result }}' = 'success' ]; then + if [ '${{ needs.release-candidate.result }}' = 'success' ]; then aws cloudwatch put-metric-data --namespace 'ADOT/GitHubActions' \ --metric-name Success \ --dimensions repository=${{ github.repository }},branch=${{ github.ref_name }},workflow=CI \ From 6e565d7643aa4395d7f612f90dce863e08f34997 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Wed, 5 Apr 2023 00:07:29 +0000 Subject: [PATCH 44/45] Update README to add new components --- README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2f45967c9c..f4a89aa6d7 100644 --- a/README.md +++ b/README.md @@ -32,11 +32,23 @@ This table represents the supported components of the ADOT Collector. The highli | [zipkinreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/zipkinreceiver#zipkin-receiver) | [metricstransformprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/metricstransformprocessor#metrics-transform-processor) | [fileexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/fileexporter#file-exporter) | [ballastextention](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/ballastextension#memory-ballast) | | [jaegerreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jaegerreceiver#jaeger-receiver) | [spanprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/spanprocessor#span-processor) | [otlphttpexporter](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlphttpexporter#otlphttp-exporter) | [`sigv4authextension`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/sigv4authextension) | | [`awscontainerinsightreceiver`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/awscontainerinsightreceiver) | [filterprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/filterprocessor#filter-processor) | [prometheusexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/prometheusexporter#prometheus-exporter) | | -| | [resourcedetectionprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourcedetectionprocessor#resource-detection-processor) | [datadogexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/datadogexporter#datadog-exporter) | | +| [kafka](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/kafkareceiver) | [resourcedetectionprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourcedetectionprocessor#resource-detection-processor) | [datadogexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/datadogexporter#datadog-exporter) | | | | [metricsgenerationprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/metricsgenerationprocessor#metrics-generation-processor) | [dynatraceexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/dynatraceexporter#dynatrace-exporter) | | | | [cumulativetodeltaprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/cumulativetodeltaprocessor#cumulative-to-delta-processor) | [sapmexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sapmexporter#sapm-exporter) | | | | [deltatorateprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/deltatorateprocessor#delta-to-rate-processor) | [signalfxexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/signalfxexporter#signalfx-metrics-exporter) | | | | | [logzioexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/logzioexporter#logzio-exporter) | | +| | | [kafka](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/kafkaexporter)| | + +Besides the components that interact with telemetry signals directly from the previous table, there is also support to the following confmap providers: + +* file +* env +* YAML +* s3 +* http +* https + +More documentation for confmap providers can be found [here](aws-otel.github.io/docs/components/confmap-providers). ### Getting Started From b3c0e05bfaa7a620df506a2209d87d77f85efd43 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Wed, 5 Apr 2023 00:14:27 +0000 Subject: [PATCH 45/45] Fix readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f4a89aa6d7..f841546c50 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Besides the components that interact with telemetry signals directly from the pr * http * https -More documentation for confmap providers can be found [here](aws-otel.github.io/docs/components/confmap-providers). +More documentation for confmap providers can be found [here](https://aws-otel.github.io/docs/components/confmap-providers). ### Getting Started