open-telemetry · JingboWangGoogle · Jun 17, 2020 · Jun 18, 2020 · Jun 18, 2020 · Jun 18, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,10 +1,10 @@
 version: 2.1
 parameters:
   run-build-publish:
-    type: boolean
-    default: true
+    type: boolean 
+    default: true 
   run-stability-tests:
-    type: boolean
+    type: boolean 
     default: false
   collector-sha:
     type: string
@@ -14,38 +14,8 @@ executors:
   golang:
     docker:
       - image: cimg/go:1.14
-  machine:
-    machine:
-      image: ubuntu-1604:201903-01
 
 commands:
-  setup:
-    steps:
-      - checkout
-      - restore_module_cache
-      - run:
-          name: Install deps
-          command: make -j8 for-all-target TARGET=dep
-      - run:
-          name: Install tools
-          command: make install-tools
-      - run:
-          name: Install testbed tools
-          command: make -C testbed install-tools
-      - save_module_cache
-
-  setup_go:
-    steps:
-      - run:
-          name: Install Go 1.14
-          command: |
-            sudo rm -rf /usr/local/go
-            curl -L https://dl.google.com/go/go1.14.4.linux-amd64.tar.gz | sudo tar xz -C /usr/local
-      - run:
-          name: Add ~/go/bin to PATH
-          command: |
-            echo 'export PATH=$HOME/go/bin:$PATH' >> $BASH_ENV
-
   restore_workspace:
     steps:
       - attach_to_workspace
@@ -111,7 +81,7 @@ workflows:
             - build
       - publish-dev:
           requires:
-            - run-stability-tests
+            - run-stability-tests 
 
   build-publish:
     when: << pipeline.parameters.run-build-publish >>
@@ -132,7 +102,7 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - build-examples:
+      - build-examples-tracing:
           requires:
             - setup
           filters:
@@ -150,7 +120,7 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - unit-tests:
+      - test:
           requires:
             - setup
           filters:
@@ -159,8 +129,7 @@ workflows:
       - publish-stable:
           requires:
             - lint
-            - unit-tests
-            - integration-tests
+            - test
             - build
             - cross-compile
           filters:
@@ -171,24 +140,30 @@ workflows:
       - spawn-stability-tests-job:
           requires:
             - lint
-            - unit-tests
-            - integration-tests
+            - test
             - build
           filters:
             branches:
               only: /master|release\/.+/
             tags:
               ignore: /.*/
-      - integration-tests:
-          filters:
-            tags:
-              only: /.*/
 
 jobs:
   setup:
     executor: golang
     steps:
-      - setup
+      - checkout
+      - restore_module_cache
+      - run:
+          name: Install deps
+          command: make -j8 for-all-target TARGET='dep'
+      - run:
+          name: Install tools
+          command: make install-tools
+      - run:
+          name: Install testbed tools
+          command: make -C testbed install-tools
+      - save_module_cache
       - persist_to_workspace:
           root: ~/
           paths:
@@ -200,7 +175,7 @@ jobs:
       - restore_workspace
       - run:
           name: Lint
-          command: make -j8 for-all-target TARGET=lint
+          command: make -j8 for-all-target TARGET="lint"
       - run:
           name: Checks
           command: make -j4 checklicense impi misspell
@@ -216,15 +191,15 @@ jobs:
           root: ~/
           paths: project/bin
 
-  build-examples:
+  build-examples-tracing:
     docker:
       - image: cimg/go:1.14
     steps:
       - restore_workspace
       - setup_remote_docker
       - run:
-          name: Build examples
-          command: make build-examples
+          name: Build trace example
+          command: docker-compose -f examples/tracing/docker-compose.yml build
 
   cross-compile:
     executor: golang
@@ -238,16 +213,16 @@ jobs:
           root: ~/
           paths: project/bin
 
-  unit-tests:
+  test:
     executor: golang
     steps:
       - restore_workspace
       - run:
-          name: Unit test coverage
-          command: make unit-tests-with-cover
+          name: Coverage tests
+          command: make test-with-cover
       - run:
-          name: Upload unit test coverage
-          command: bash <(curl -s https://codecov.io/bash) -F unit
+          name: Code coverage
+          command: bash <(curl -s https://codecov.io/bash)
 
   loadtest:
     executor: golang
@@ -256,7 +231,7 @@ jobs:
       - restore_workspace
       - run:
           name: Loadtest
-          command: make e2e-test
+          command: make -C testbed runtests
       - store_artifacts:
           path: testbed/tests/results
       - store_test_results:
@@ -272,7 +247,7 @@ jobs:
           repo: opentelemetry-collector-contrib
           tag: ${CIRCLE_TAG:1}
       - run:
-          name: Calculate checksums
+          name: Calculate checksums 
           command: cd bin && shasum -a 256 * > checksums.txt
       - run:
           name: Create Github release and upload artifacts
@@ -281,7 +256,7 @@ jobs:
   publish-dev:
     executor: golang
     steps:
-      - restore_workspace
+      - restore_workspace 
       - setup_remote_docker
       - publish_docker_images:
           repo: opentelemetry-collector-contrib-dev
@@ -309,33 +284,12 @@ jobs:
             git status
 
   run-stability-tests:
-    parameters:
-      # 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 
-        default: 9
     executor: golang
-    resource_class: medium+
-    parallelism: << parameters.runners-number >>
     steps:
-      - restore_workspace
+      - restore_workspace 
       - run:
-          no_output_timeout: 70m
           name: Run stability tests
-          command: |
-            export TESTS=$(make -C testbed -s list-stability-tests)
-            export TEST_NUM=$(echo ${TESTS} | wc -w | tr -d '[:space:]')
-            if [ "${TEST_NUM}" -ne "<< parameters.runners-number >>" ]; then \
-              echo "ERROR: Number of stability tests must match number of CircleCI runners. Update runners-number parameter"; exit 2; \
-            fi
-            export TEST_NAME=$(echo ${TESTS} | sed 's/ /\n/g' | circleci tests split --total=${TEST_NUM})
-            echo "Running ${TEST_NAME}..."
-            TEST_ARGS="-test.run=${TEST_NAME}" make stability-tests
-      - store_artifacts:
-          path: testbed/stabilitytests/results
-      - store_test_results:
-          path: testbed/stabilitytests/results/junit
+          command: make stability-tests
       - run:
           name: Run on fail status
           command: |
@@ -348,24 +302,3 @@ jobs:
                 "body": "Link to failed job: '"${CIRCLE_BUILD_URL}"'."
                 }'
           when: on_fail
-
-  integration-tests:
-    executor: machine
-    environment:
-      GOPATH: /home/circleci/go
-    steps:
-      - setup_go
-      - setup
-      - run:
-          name: Integration tests with coverage
-          command: |
-            mkdir -p test-results/junit
-            trap "go-junit-report -set-exit-code < test-results/go-integration-tests.out > test-results/junit/results.xml" EXIT
-            make integration-tests-with-cover | tee test-results/go-integration-tests.out
-      - run:
-          name: Upload integration test coverage
-          command: bash <(curl -s https://codecov.io/bash) -F integration
-      - store_test_results:
-          path: test-results/junit
-      - store_artifacts:
-          path: test-results
diff --git a/.codecov.yml b/.codecov.yml
@@ -1,8 +1,6 @@
 codecov:
   notify:
     require_ci_to_pass: yes
-    # wait for unit and integration test builds.
-    after_n_builds: 2
   strict_yaml_branch: master  # only use the latest copy on master branch
 
 coverage:
@@ -17,4 +15,4 @@ coverage:
     patch:
       default:
         enabled: yes
-        target: 95%
+        target: 95%
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,4 @@ bin/
 
 # Coverage
 coverage.txt
-integration-coverage.txt
 coverage.html
-integration-coverage.html
diff --git a/Makefile b/Makefile
@@ -9,41 +9,40 @@ BUILD_X1=-X $(BUILD_INFO_IMPORT_PATH).GitHash=$(GIT_SHA)
 ifdef VERSION
 BUILD_X2=-X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION)
 endif
-BUILD_X3=-X go.opentelemetry.io/collector/internal/version.BuildType=$(BUILD_TYPE)
+BUILD_X3=-X github.com/open-telemetry/opentelemetry-collector/internal/version.BuildType=$(BUILD_TYPE)
 BUILD_INFO=-ldflags "${BUILD_X1} ${BUILD_X2} ${BUILD_X3}"
 STATIC_CHECK=staticcheck
 OTEL_VERSION=master
 
-# Modules to run integration tests on.
-# XXX: Find a way to automatically populate this. Too slow to run across all modules when there are just a few.
-INTEGRATION_TEST_MODULES := \
-	receiver/redisreceiver \
-	internal/common
-
 .DEFAULT_GOAL := all
 
 .PHONY: all
 all: common otelcontribcol
 
 .PHONY: e2e-test
 e2e-test: otelcontribcol
-	$(MAKE) -C testbed run-tests
+	$(MAKE) -C testbed runtests
+
+.PHONY: precommit
+precommit:
+	$(MAKE) gotidy
+	$(MAKE) ci
 
 .PHONY: test-with-cover
-unit-tests-with-cover:
+test-with-cover:
 	@echo Verifying that all packages have test files to count in coverage
 	@scripts/check-test-files.sh $(subst github.com/open-telemetry/opentelemetry-collector-contrib/,./,$(ALL_PKGS))
-	@$(MAKE) for-all CMD="make do-unit-tests-with-cover"
-
-.PHONY: integration-tests-with-cover
-integration-tests-with-cover:
-	@echo $(INTEGRATION_TEST_MODULES)
-	@$(MAKE) for-all CMD="make do-integration-tests-with-cover" ALL_MODULES="$(INTEGRATION_TEST_MODULES)"
+	@echo pre-compiling tests
+	set -e; for dir in $(ALL_MODULES); do \
+	  echo "go test ./... + coverage in $${dir}"; \
+	  (cd "$${dir}" && \
+	    $(GOTEST) $(GOTEST_OPT_WITH_COVERAGE) ./... && \
+	 	go tool cover -html=coverage.txt -o coverage.html ); \
+	done
 
-# Long-running e2e tests
 .PHONY: stability-tests
-stability-tests: otelcontribcol
-	$(MAKE) -C testbed run-stability-tests
+stability-tests:
+	@echo Stability tests have not been implemented yet 
 
 .PHONY: gotidy
 gotidy:
@@ -85,19 +84,18 @@ GOMODULES = $(ALL_MODULES) $(PWD)
 .PHONY: $(GOMODULES)
 MODULEDIRS = $(GOMODULES:%=for-all-target-%)
 for-all-target: $(MODULEDIRS)
-$(MODULEDIRS):
-	$(MAKE) -C $(@:for-all-target-%=%) $(TARGET)
+$(MODULEDIRS): 
+	$(MAKE) -C $(@:for-all-target-%=%) $(TARGET) 
 .PHONY: for-all-target
 
 .PHONY: install-tools
 install-tools:
 	go install github.com/client9/misspell/cmd/misspell
 	go install github.com/golangci/golangci-lint/cmd/golangci-lint
 	go install github.com/google/addlicense
-	go install github.com/jstemmer/go-junit-report
+	go install honnef.co/go/tools/cmd/staticcheck
 	go install github.com/pavius/impi/cmd/impi
 	go install github.com/tcnksm/ghr
-	go install honnef.co/go/tools/cmd/staticcheck
 
 .PHONY: run
 run:
@@ -170,8 +168,3 @@ otel-from-tree:
 otel-from-lib:
 	# Sets opentelemetry core to be not be pulled from local source tree. (Undoes otel-from-tree.)
 	$(MAKE) for-all CMD="go mod edit -dropreplace go.opentelemetry.io/collector"
-
-.PHONY: build-examples
-build-examples:
-	docker-compose -f examples/tracing/docker-compose.yml build
-	docker-compose -f exporter/splunkhecexporter/example/docker-compose.yml build