Merge pull request #940 from rittneje/bugfix/remove-extraneous-versio…

…n-constraints remove all extraneous version constraints
newrelic · Aug 2, 2024 · 21bf8ad · 21bf8ad
2 parents 6110044 + 3dcea2b
commit 21bf8ad
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 22 deletions.
diff --git a/v3/go.mod b/v3/go.mod
@@ -3,7 +3,7 @@ module github.com/newrelic/go-agent/v3
 go 1.20
 
 require (
-	github.com/golang/protobuf v1.5.3
+	google.golang.org/protobuf v1.5.3
 	google.golang.org/grpc v1.56.3
 )
 

diff --git a/v3/integrations/nrmssql/nrmssql.go b/v3/integrations/nrmssql/nrmssql.go
@@ -1,9 +1,6 @@
 // Copyright 2020 New Relic Corporation. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build go1.10
-// +build go1.10
-
 // Package nrmssql instruments github.com/microsoft/go-mssqldb.
 //
 // Use this package to instrument your MSSQL calls without having to manually

diff --git a/v3/newrelic/sql_driver.go b/v3/newrelic/sql_driver.go
@@ -1,9 +1,6 @@
 // Copyright 2020 New Relic Corporation. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build go1.10
-// +build go1.10
-
 package newrelic
 
 import (

diff --git a/v3/newrelic/trace_observer.go b/v3/newrelic/trace_observer.go
@@ -1,11 +1,6 @@
 // Copyright 2020 New Relic Corporation. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build go1.9
-// +build go1.9
-
-// This build tag is necessary because GRPC/ProtoBuf libraries only support Go version 1.9 and up.
-
 package newrelic
 
 import (

diff --git a/v3/newrelic/trace_observer_impl_test.go b/v3/newrelic/trace_observer_impl_test.go
@@ -1,11 +1,6 @@
 // Copyright 2020 New Relic Corporation. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build go1.9
-// +build go1.9
-
-// This build tag is necessary because Infinite Tracing is only supported for Go version 1.9 and up
-
 package newrelic
 
 import (

diff --git a/v3/newrelic/trace_observer_test.go b/v3/newrelic/trace_observer_test.go
@@ -1,11 +1,6 @@
 // Copyright 2020 New Relic Corporation. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build go1.9
-// +build go1.9
-
-// This build tag is necessary because Infinite Tracing is only supported for Go version 1.9 and up
-
 package newrelic
 
 import (