Merge branch 'main' into andrew.glaude/pocStats

open-telemetry · Feb 13, 2024 · bdfba65 · bdfba65
2 parents df1c58e + 2315186
commit bdfba65
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 30 deletions.
diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml
@@ -50,7 +50,7 @@ jobs:
         run: Install-WindowsFeature -name Web-Server -IncludeManagementTools
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-mod-cache

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -88,7 +88,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -154,7 +154,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -177,7 +177,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -237,7 +237,7 @@ jobs:
   unittest-matrix:
     strategy:
       matrix:
-        go-version: ["~1.22", "~1.21.5"] # 1.20 is interpreted as 1.2 without quotes
+        go-version: ["1.22.0", "1.21.7"] # 1.20 is interpreted as 1.2 without quotes
         group:
           - receiver-0
           - receiver-1
@@ -282,13 +282,13 @@ jobs:
           path: ~/.cache/go-build
           key: go-test-build-${{ runner.os }}-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
       - name: Run Unit Tests
-        if: startsWith( matrix.go-version, '~1.21' ) != true
+        if: startsWith( matrix.go-version, '1.21' ) != true
         run: make gotest GROUP=${{ matrix.group }}
       - name: Run Unit Tests With Coverage
-        if: startsWith( matrix.go-version, '~1.21' ) # only run coverage on one version
+        if: startsWith( matrix.go-version, '1.21' ) # only run coverage on one version
         run: make gotest-with-cover GROUP=${{ matrix.group }}
       - uses: actions/upload-artifact@v3
-        if: startsWith( matrix.go-version, '~1.21' ) # only upload artifact for one version
+        if: startsWith( matrix.go-version, '1.21' ) # only upload artifact for one version
         with:
           name: coverage-artifacts
           path: ${{ matrix.group }}-coverage.txt
@@ -349,7 +349,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -387,7 +387,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -413,7 +413,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -482,7 +482,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -615,7 +615,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Mkdir bin and dist
         run: |

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -34,7 +34,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
 
       # Initializes the CodeQL tools for scanning.

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -49,7 +49,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -81,7 +81,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -128,7 +128,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache

diff --git a/.github/workflows/load-tests.yml b/.github/workflows/load-tests.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -26,7 +26,7 @@ jobs:
           path: opentelemetry-collector-contrib
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Prepare release for contrib
         working-directory: opentelemetry-collector-contrib

diff --git a/.github/workflows/prometheus-compliance-tests.yml b/.github/workflows/prometheus-compliance-tests.yml
@@ -26,7 +26,7 @@ jobs:
           path: opentelemetry-collector-contrib
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache

diff --git a/.github/workflows/telemetrygen.yml b/.github/workflows/telemetrygen.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -63,7 +63,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -108,7 +108,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache

diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml
@@ -21,7 +21,7 @@ jobs:
           ref: ${{ github.head_ref }}
       - uses: actions/setup-go@v5
         with:
-          go-version: ~1.21.5
+          go-version: "1.21.7"
           cache: false
       - name: Cache Go
         id: go-cache

diff --git a/exporter/cassandraexporter/go.mod b/exporter/cassandraexporter/go.mod
@@ -2,8 +2,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassan
 
 go 1.21
 
-toolchain go1.21.6
-
 require (
 	github.com/gocql/gocql v1.6.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.94.0