Merge branch 'main' into mvg/update-otel-1.6.0_0.28.0

open-telemetry · Mar 25, 2022 · 512baca · 512baca
2 parents a084adb + 200a922
commit 512baca
Show file tree

Hide file tree

Showing 159 changed files with 745 additions and 784 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,9 +38,9 @@ jobs:
         path: ~/.tools
         key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('./internal/tools/**') }}
     - name: Run linters
-      run: make dependabot-check license-check lint
+      run: make dependabot-check license-check lint vanity-import-check
     - name: Build
-      run: make generate build
+      run: make build
     - name: Check clean repository
       run: make check-clean-work-tree
 
@@ -65,7 +65,7 @@ jobs:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/go.sum') }}
     - name: Run tests with race detector
-      run: make test
+      run: make test-race
 
   test-coverage:
     runs-on: ubuntu-latest
@@ -89,9 +89,11 @@ jobs:
         key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/go.sum') }}
     - name: Run coverage tests
       run: |
-        make test-with-coverage
+        make test-coverage
         mkdir $TEST_RESULTS
-        cp coverage.{txt,html} $TEST_RESULTS
+        cp coverage.out $TEST_RESULTS
+        cp coverage.txt $TEST_RESULTS
+        cp coverage.html $TEST_RESULTS
     - name: Upload coverage report
       uses: codecov/codecov-action@v2.1.0
       with:
@@ -101,8 +103,8 @@ jobs:
     - name: Store coverage test output
       uses: actions/upload-artifact@v2
       with:
-          name: opentelemetry-go-test-output
-          path: ${{ env.TEST_RESULTS }}
+        name: opentelemetry-go-contrib-test-output
+        path: ${{ env.TEST_RESULTS }}
 
   compatibility-test:
     strategy:
@@ -187,5 +189,5 @@ jobs:
     - name: Store coverage test output
       uses: actions/upload-artifact@v2
       with:
-          name: opentelemetry-go-test-output
+          name: opentelemetry-go-contrib-test-output
           path: ${{ env.TEST_RESULTS }}