Merge pull request #625 from iamemilio/EOL-v2-agent

EOL v2 agent

.github/workflows/ci.yaml

@@ -6,107 +6,6 @@ name: Go Agent CI
 on: pull_request
 
 jobs:
-  go-agent:
-    runs-on: ubuntu-18.04
-    env:
-      # Required when using older versions of Go that do not support gomod.
-      GOPATH: ${{ github.workspace }}
-
-    strategy:
-      # if one test fails, do not abort the rest
-      fail-fast: false
-      matrix:
-        include:
-
-          # v2 agent
-          # 1.3.x and 1.4.x are failing with a linker error, skip those for now
-          # - go-version: 1.3.x
-          #   dirs: .
-          # - go-version: 1.4.x
-          #   dirs: .
-          - go-version: 1.5.x
-            dirs: .
-          - go-version: 1.6.x
-            dirs: .
-          - go-version: 1.7.x
-            dirs: .
-          - go-version: 1.8.x
-            dirs: .
-          - go-version: 1.9.x
-            dirs: .
-          - go-version: 1.10.x
-            dirs: .
-          - go-version: 1.11.x
-            dirs: .
-          - go-version: 1.12.x
-            dirs: .
-          - go-version: 1.13.x
-            dirs: .
-
-          # v2 integrations
-          - go-version: 1.13.x
-            # only versions up to 0.24.0 of awssdkv2 are supported by this code
-            pin: github.com/aws/[email protected]
-            dirs: _integrations/nrawssdk
-          - go-version: 1.13.x
-            dirs: _integrations/nrecho
-            pin: github.com/labstack/[email protected]
-          - go-version: 1.13.x
-            dirs: _integrations/nrgorilla/v1
-          - go-version: 1.13.x
-            dirs: _integrations/nrlogrus
-          - go-version: 1.13.x
-            dirs: _integrations/nrlogxi/v1
-          - go-version: 1.13.x
-            dirs: _integrations/nrpkgerrors
-          - go-version: 1.13.x
-            dirs: _integrations/nrlambda
-          - go-version: 1.13.x
-            dirs: _integrations/nrmysql
-          - go-version: 1.13.x
-            dirs: _integrations/nrpq
-          - go-version: 1.13.x
-            dirs: _integrations/nrsqlite3
-          - go-version: 1.13.x
-            dirs: _integrations/nrgrpc
-          # As of October 2019, errors result from go get -u github.com/micro/go-micro
-          # As of June 2020, confirmed errors still result
-          # - go-version: 1.13.x
-          #   dirs: _integrations/nrmicro
-          # As of Jul 2022, we have depreciated the legacy nrnats,nrmssql, nrzap, and nrstan integrations tests.
-          # These tests still exist under the v3 versions of the integrations.
-          - go-version: 1.13.x
-            dirs: _integrations/logcontext
-          - go-version: 1.13.x
-            dirs: _integrations/nrhttprouter
-          - go-version: 1.13.x
-            dirs: _integrations/nrb3
-          - go-version: 1.13.x
-            dirs: _integrations/nrmongo
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: ${{ matrix.go-version }}
-
-    - name: Checkout Code
-      uses: actions/checkout@v1
-      with:
-        # Required when using older versions of Go that do not support gomod.
-        # Note the required presence of the /go-agent/ directory at the
-        # beginning of this path.  It is required in order to match the
-        # ${{ github.workspace }} used by the GOPATH env var.  pwd when cloning
-        # the repo is <something>/go-agent/ whereas ${{ github.workspace }}
-        # returns <something/go-agent/go-agent/.
-        path: ./go-agent/src/github.com/newrelic/go-agent
-
-    - name: Run Tests
-      run: bash build-script.sh
-      env:
-        DIRS: ${{ matrix.dirs }}
-        EXTRATESTING: ${{ matrix.extratesting }}
-        PIN: ${{ matrix.pin }}
-
   go-agent-v3:
     runs-on: ubuntu-18.04
     env:
@@ -198,7 +97,6 @@ jobs:
             extratesting: go get -u github.com/mattn/go-sqlite3@master
           - go-version: 1.17.x
             dirs: v3/integrations/nrsnowflake
-            extratesting: go get -u github.com/snowflakedb/gosnowflake@master
           - go-version: 1.17.x
             dirs: v3/integrations/nrgrpc
             extratesting: go get -u google.golang.org/grpc@master

v3/integrations/nrsnowflake/go.mod

@@ -1,10 +1,8 @@
 module github.com/newrelic/go-agent/v3/integrations/nrsnowflake
 
-// snowflakedb/gosnowflake says it requires 1.12 but builds on 1.10
-go 1.10
+go 1.17
 
 require (
-	// v3.3.0 includes the new location of ParseQuery
-	github.com/newrelic/go-agent/v3 v3.3.0
-	github.com/snowflakedb/gosnowflake v1.3.4
+	github.com/newrelic/go-agent/v3 v3.20.2
+	github.com/snowflakedb/gosnowflake v1.6.16
 )

v3/integrations/nrsnowflake/nrsnowflake.go

@@ -1,8 +1,6 @@
 // Copyright 2020 New Relic Corporation. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// +build go1.10
-
 // Package nrsnowflake instruments github.com/snowflakedb/gosnowflake
 //
 // Use this package to instrument your Snowflake calls without having to manually