Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): Bump go.opentelemetry.io/collector from 0.21.0 to 0.22.0 in /receiver/receivercreator #987

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
180d3dc
Merge Sumo Logic updates to OTC
pmm-sumo Nov 4, 2020
b23ed3b
Merge Sumo tail-sampling extensions
pmm-sumo Nov 4, 2020
648b1a7
Update source processor to new API
pmm-sumo Nov 4, 2020
11d8151
Fix imports order
pmm-sumo Nov 4, 2020
9039315
Update deps for OTC v0.14.0
pmm-sumo Nov 9, 2020
ad2794f
Expose tailsamplingprocessor metrics
pmm-sumo Nov 9, 2020
19dc41c
Config update (#289)
mat-rumian Nov 19, 2020
0404f15
Tail sampling processor - update to v0.16
pmm-sumo Dec 2, 2020
69cb427
Source processor - update to v0.16
pmm-sumo Dec 2, 2020
80f5e8a
Tailsampling processor order fix
pmm-sumo Dec 2, 2020
e8f5e1f
Introduce cascading filter processor (#359)
pmm-sumo Dec 4, 2020
215a277
Switch to AWS ECR (#409)
mat-rumian Dec 17, 2020
d570625
Investigate issue with image tagging (#410)
mat-rumian Dec 21, 2020
82ed607
Update README.md
pmm-sumo Jan 5, 2021
21d6b4d
Provide invert (like grep -v) match capability (#509)
pmm-sumo Jan 7, 2021
f4a6d42
Bump OTC-Sumo version
pmm-sumo Jan 11, 2021
14c4c21
Add Sumo examples (#681)
pmm-sumo Jan 25, 2021
3a943bb
Update README.md
pmm-sumo Jan 28, 2021
ef5759e
Update base dependency to v0.19.0-sumo
pmm-sumo Feb 2, 2021
0e65cd0
Remove uneccesary return values per linter
pmm-sumo Feb 3, 2021
cc4db92
Switch master -> main
pmm-sumo Feb 4, 2021
985c429
Address linter errors in sourceprocessor
pmm-sumo Feb 4, 2021
ae4789a
Use cloud.namespace on AWS resourcedetection
pmm-sumo Feb 4, 2021
76c16cd
Update ec2.go
piotr-sumo Feb 15, 2021
f42d164
TRACING-1684 | Test fix
piotr-sumo Feb 15, 2021
7ddb194
Switch examples to use OTLP/HTTP (#864)
pmm-sumo Feb 18, 2021
72156d5
Bump SumoLogic OTC base version
pmm-sumo Feb 25, 2021
48a761e
Fix cascadingfilterprocessor unit test
pmm-sumo Feb 25, 2021
2b8f3cf
Introduce telegrafreceiver (#935)
pmalek-sumo Mar 3, 2021
c048f00
Increase testbed memory limits
pmm-sumo Mar 4, 2021
2e5aa48
build(deps): Bump go.opentelemetry.io/collector
dependabot[bot] Mar 15, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 72 additions & 60 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ parameters:

orbs:
win: circleci/windows@2.4.0
aws-cli: circleci/aws-cli@1.3.1

executors:
golang:
Expand All @@ -28,18 +29,18 @@ commands:
files:
type: string
default: |
bin/otelcontribcol_darwin_amd64
bin/otelcontribcol_linux_arm64
bin/otelcontribcol_linux_amd64
bin/otelcontribcol_windows_amd64.exe
dist/otel-contrib-collector-*.arm64.rpm
dist/otel-contrib-collector_*_amd64.deb
dist/otel-contrib-collector-*.x86_64.rpm
dist/otel-contrib-collector_*_arm64.deb
dist/otel-contrib-collector-*amd64.msi
bin/otelcontribcol_darwin_amd64
bin/otelcontribcol_linux_arm64
bin/otelcontribcol_linux_amd64
bin/otelcontribcol_windows_amd64.exe
dist/otel-contrib-collector-*.arm64.rpm
dist/otel-contrib-collector_*_amd64.deb
dist/otel-contrib-collector-*.x86_64.rpm
dist/otel-contrib-collector_*_arm64.deb
dist/otel-contrib-collector-*amd64.msi
steps:
- run:
name: Check if files exist
name: Check if distribution files exist
command: |
files="<< parameters.files >>"
for f in $files; do
Expand All @@ -50,6 +51,7 @@ commands:
fi
done


setup:
steps:
- checkout
Expand Down Expand Up @@ -90,7 +92,7 @@ commands:
save_module_cache:
steps:
- save_cache:
key: cimg-go-pkg-mod-{{ arch }}-{{ checksum "go.sum" }}
key: cimg-go-pkg-mod-{{ arch }}-{{ checksum "go.sum" }}-v4
paths:
- "/home/circleci/go/pkg/mod"

Expand All @@ -101,7 +103,7 @@ commands:
command: mkdir -p ~/go/pkg/mod
- restore_cache: # restores saved cache if no changes are detected since last run
keys:
- cimg-go-pkg-mod-{{ arch }}-{{ checksum "go.sum" }}
- cimg-go-pkg-mod-{{ arch }}-{{ checksum "go.sum" }}-v4

publish_docker_images:
parameters:
Expand All @@ -110,31 +112,28 @@ commands:
tag:
type: string
steps:
- run:
name: Setup Environment Variables
command: |
echo "export REGISTRY=public.ecr.aws/sumologic" >> $BASH_ENV
echo "export TAG_URL=public.ecr.aws/sumologic/<< parameters.repo >>:<< parameters.tag >>" >> $BASH_ENV
echo "export LATEST_URL=public.ecr.aws/sumologic/<< parameters.repo >>:latest" >> $BASH_ENV
- run:
name: Build image
command: |
make docker-otelcontribcol
docker tag otelcontribcol:latest otel/<< parameters.repo >>:<< parameters.tag >>
docker tag otelcontribcol:latest otel/<< parameters.repo >>:latest
docker tag otelcontribcol:latest ${TAG_URL}
docker tag otelcontribcol:latest ${LATEST_URL}
- aws-cli/install
- run:
name: Login to Docker Hub
command: docker login -u $DOCKER_HUB_USERNAME -p $DOCKER_HUB_PASSWORD
name: Login to AWS ECR
command: aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin ${REGISTRY}
- run:
name: Push image
command: |
docker push otel/<< parameters.repo >>:<< parameters.tag >>
docker push otel/<< parameters.repo >>:latest
docker push ${TAG_URL}
docker push ${LATEST_URL}

github_issue_generator:
steps:
- when:
condition:
equal: [main, << pipeline.git.branch >>]
steps:
- run:
name: Generate GitHub Issue
command: issuegenerator ${TEST_RESULTS}
when: on_fail

workflows:
version: 2
Expand All @@ -150,7 +149,7 @@ workflows:
- setup
- run-stability-tests:
requires:
- cross-compile
- cross-compile
- publish-dev:
requires:
- run-stability-tests
Expand All @@ -161,47 +160,47 @@ workflows:
- windows-test:
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
only: /.*/
- setup:
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
only: /.*/
- lint:
requires:
- setup
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
only: /.*/
- build-examples:
requires:
- setup
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
only: /.*/
- cross-compile:
requires:
- setup
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
only: /.*/
- loadtest:
requires:
- cross-compile
- cross-compile
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
only: /.*/
- unit-tests:
requires:
- setup
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
only: /.*/
- windows-msi:
requires:
- cross-compile
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
only: /.*/
- publish-check:
requires:
- lint
Expand All @@ -228,7 +227,7 @@ workflows:
branches:
ignore: /.*/
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
only: /.*/
- spawn-stability-tests-job:
requires:
- lint
Expand All @@ -245,23 +244,24 @@ workflows:
- integration-tests:
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
only: /.*/
- build-package:
name: deb-package
package_type: deb
requires:
- cross-compile
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
only: /.*/
- build-package:
name: rpm-package
package_type: rpm
requires:
- cross-compile
filters:
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+.*/
only: /.*/


jobs:
setup:
Expand All @@ -283,11 +283,6 @@ jobs:
- run:
name: Checks
command: make -j4 checklicense impi misspell
- run:
name: Codegen
command: |
make generate
git diff --exit-code ':!*go.sum' || (echo 'Generated code is out of date, please run "make generate" and commit the changes in this PR.' && exit 1)

build-examples:
docker:
Expand Down Expand Up @@ -336,7 +331,6 @@ jobs:
path: testbed/tests/results
- store_test_results:
path: testbed/tests/results/junit
- github_issue_generator

windows-test:
executor:
Expand All @@ -356,7 +350,6 @@ jobs:
name: Unit tests
command: (Get-Childitem -Include go.mod -Recurse) | ForEach-Object { cd (Split-Path $_ -Parent); go test ./...; if ($LastExitCode -gt 0) { exit $LastExitCode } }
- save_module_cache
- github_issue_generator

windows-msi:
executor:
Expand Down Expand Up @@ -405,18 +398,14 @@ jobs:
- verify_dist_files_exist
- setup_remote_docker
- publish_docker_images:
repo: opentelemetry-collector-contrib
repo: opentelemetry-collector
tag: ${CIRCLE_TAG:1}
- run:
name: Prepare release artifacts
command: |
cp bin/* dist/
- run:
name: Calculate checksums
command: cd dist && shasum -a 256 * > checksums.txt
command: cd bin && shasum -a 256 * > checksums.txt
- run:
name: Create Github release and upload artifacts
command: ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME --replace $CIRCLE_TAG dist/
command: ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME --replace $CIRCLE_TAG bin/

publish-dev:
executor: golang
Expand All @@ -430,7 +419,7 @@ jobs:
bin/otelcontribcol_windows_amd64.exe
- setup_remote_docker
- publish_docker_images:
repo: opentelemetry-collector-contrib-dev
repo: opentelemetry-collector-dev
tag: ${CIRCLE_SHA1}

spawn-stability-tests-job:
Expand All @@ -439,7 +428,7 @@ jobs:
- run:
name: Trigger stability tests job
command: |
curl -f -X POST "https://circleci.com/api/v2/project/github/open-telemetry/${CIRCLE_PROJECT_REPONAME}/pipeline?circle-token=${CIRCLE_API_TOKEN}" \
curl -f -X POST "https://circleci.com/api/v2/project/github/SumoLogic/${CIRCLE_PROJECT_REPONAME}/pipeline?circle-token=${CIRCLE_API_TOKEN}" \
-H 'Content-Type: application/json' \
-H 'Accept: application/json' \
-d '{"parameters": {"run-build-publish": false, "run-stability-tests": true, "collector-sha": "'"${CIRCLE_SHA1}"'"}, "branch": "'"${CIRCLE_BRANCH}"'"}'
Expand All @@ -459,7 +448,7 @@ jobs:
# Number of runners must be always in sync with number of stability tests,
# so every node runs exactly one stability test.
runners-number:
type: integer
type: integer
default: 9
executor: golang
resource_class: medium+
Expand All @@ -484,7 +473,18 @@ jobs:
path: testbed/stabilitytests/results
- store_test_results:
path: testbed/stabilitytests/results/junit
- github_issue_generator
- run:
name: Run on fail status
command: |
curl --request POST \
--url https://api.github.com/repos/SumoLogic/opentelemetry-collector-contrib/issues \
--header "authorization: Bearer ${GITHUB_TOKEN}" \
--header "content-type: application/json" \
--data '{
"title": "Stability tests failed in branch '"${CIRCLE_BRANCH}"' for commit << pipeline.parameters.collector-sha >>",
"body": "Link to failed job: '"${CIRCLE_BUILD_URL}"'."
}'
when: on_fail

integration-tests:
executor: machine
Expand All @@ -506,6 +506,18 @@ jobs:
path: test-results/junit
- store_artifacts:
path: test-results
- run:
name: Run on fail status
command: |
curl --request POST \
--url https://api.github.com/repos/SumoLogic/opentelemetry-collector-contrib/issues \
--header "authorization: Bearer ${GITHUB_TOKEN}" \
--header "content-type: application/json" \
--data '{
"title": "Stability tests failed in branch '"${CIRCLE_BRANCH}"' for commit << pipeline.parameters.collector-sha >>",
"body": "Link to failed job: '"${CIRCLE_BUILD_URL}"'."
}'
when: on_fail

build-package:
machine:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ integration-coverage.txt
coverage.html
integration-coverage.html

# vagrant
.vagrant
ubuntu-bionic-18.04-cloudimg-console.log

# Wix
*.wixobj
*.wixpdb
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ run:
docker-component: check-component
GOOS=linux GOARCH=amd64 $(MAKE) $(COMPONENT)
cp ./bin/$(COMPONENT)_linux_amd64 ./cmd/$(COMPONENT)/$(COMPONENT)
docker build -t $(COMPONENT) ./cmd/$(COMPONENT)/
docker build -t $(COMPONENT) -f ./cmd/$(COMPONENT)/Dockerfile .
rm ./cmd/$(COMPONENT)/$(COMPONENT)

.PHONY: check-component
Expand Down
Loading