Merge pull request #146 from instana/reduce_min_go_version_for_gcs

Require go1.11 and cloud.google.com/go/[email protected] for GCS instrumentation
instana · Aug 31, 2020 · 3be80d1 · 3be80d1
2 parents 04e9285 + f0af29d
commit 3be80d1
Show file tree

Hide file tree

Showing 17 changed files with 76 additions and 48 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,13 @@ matrix:
   include:
     - go: tip
     - go: 1.9.x
-      env: VENDOR_DEPS=yes
+      env:
+        - VENDOR_DEPS=yes
+        - EXCLUDE_DIRS=./instrumentation/cloud.google.com/go
     - go: 1.10.x
-      env: VENDOR_DEPS=yes
+      env:
+        - VENDOR_DEPS=yes
+        - EXCLUDE_DIRS=./instrumentation/cloud.google.com/go
     - go: 1.11.x
       env: GO111MODULE=on
     - go: 1.12.x

diff --git a/instrumentation/cloud.google.com/go/README.md b/instrumentation/cloud.google.com/go/README.md
@@ -8,6 +8,8 @@ This module contains instrumentation code for Google Cloud Platform clients that
 Installation
 ------------
 
+Unlike the Instana Go sensor, this instrumentation module requires Go v1.11+ which is the minimal version for `cloud.google.com/go`.
+
 To add the module to your `go.mod` file run the following command in your project directory:
 
 ```bash

diff --git a/instrumentation/cloud.google.com/go/go.mod b/instrumentation/cloud.google.com/go/go.mod
@@ -1,11 +1,23 @@
 module github.com/instana/go-sensor/instrumentation/cloud.google.com/go
 
-go 1.14
+go 1.11
 
 require (
-	cloud.google.com/go v0.64.0
-	cloud.google.com/go/storage v1.10.0
+	cloud.google.com/go v0.56.0
+	cloud.google.com/go/storage v1.7.0
+	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/google/go-cmp v0.5.1 // indirect
 	github.com/instana/go-sensor v1.17.0
 	github.com/opentracing/opentracing-go v1.2.0
-	google.golang.org/api v0.30.0
+	go.opencensus.io v0.22.4 // indirect
+	golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc // indirect
+	golang.org/x/sys v0.0.0-20200803210538-64077c9b5642 // indirect
+	golang.org/x/text v0.3.3 // indirect
+	golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/api v0.22.0
+	google.golang.org/genproto v0.0.0-20200815001618-f69a88009b70 // indirect
+	google.golang.org/grpc v1.31.0 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
+	honnef.co/go/tools v0.0.1-2020.1.4 // indirect
 )
diff --git a/instrumentation/cloud.google.com/go/go.sum b/instrumentation/cloud.google.com/go/go.sum
diff --git a/instrumentation/cloud.google.com/go/iam/doc.go b/instrumentation/cloud.google.com/go/iam/doc.go
@@ -0,0 +1,3 @@
+// Package iam provides Instana tracing instrumentation for for Google Cloud IAM clients that use cloud.google.com/go/iam
+
+package iam
diff --git a/instrumentation/cloud.google.com/go/iam/iam.go b/instrumentation/cloud.google.com/go/iam/iam.go
@@ -1,4 +1,5 @@
-// Package iam provides Instana tracing instrumentation for for Google Cloud IAM clients that use cloud.google.com/go/iam
+// +build go1.11
+
 package iam
 
 import (

diff --git a/instrumentation/cloud.google.com/go/internal/trace.go b/instrumentation/cloud.google.com/go/internal/trace.go
@@ -1,3 +1,5 @@
+// +build go1.11
+
 package internal
 
 import (

diff --git a/instrumentation/cloud.google.com/go/storage/README.md b/instrumentation/cloud.google.com/go/storage/README.md
@@ -1,7 +1,7 @@
 Instana instrumentation for Google Cloud Storage
 ================================================
 
-This module contains instrumentation code for Google Cloud Storage clients that use `cloud.google.com/go/storage` library.
+This module contains instrumentation code for Google Cloud Storage clients that use `cloud.google.com/go/storage` library starting from `v1.7.0` and above.
 
 [![GoDoc](https://img.shields.io/static/v1?label=godoc&message=reference&color=blue)][godoc]
 

diff --git a/instrumentation/cloud.google.com/go/storage/acl.go b/instrumentation/cloud.google.com/go/storage/acl.go
@@ -1,3 +1,5 @@
+// +build go1.11
+
 package storage
 
 import (

diff --git a/instrumentation/cloud.google.com/go/storage/bucket.go b/instrumentation/cloud.google.com/go/storage/bucket.go
@@ -1,3 +1,5 @@
+// +build go1.11
+
 package storage
 
 import (

diff --git a/instrumentation/cloud.google.com/go/storage/copy.go b/instrumentation/cloud.google.com/go/storage/copy.go
@@ -1,3 +1,5 @@
+// +build go1.11
+
 package storage
 
 import (

diff --git a/instrumentation/cloud.google.com/go/storage/doc.go b/instrumentation/cloud.google.com/go/storage/doc.go
@@ -0,0 +1,3 @@
+// Package storage provides Instana tracing instrumentation for Google Cloud Storage clients that use cloud.google.com/go/storage
+
+package storage
diff --git a/instrumentation/cloud.google.com/go/storage/hmac.go b/instrumentation/cloud.google.com/go/storage/hmac.go
@@ -1,3 +1,5 @@
+// +build go1.11
+
 package storage
 
 import (

diff --git a/instrumentation/cloud.google.com/go/storage/iam.go b/instrumentation/cloud.google.com/go/storage/iam.go
@@ -1,3 +1,5 @@
+// +build go1.11
+
 package storage
 
 import (

diff --git a/instrumentation/cloud.google.com/go/storage/reader.go b/instrumentation/cloud.google.com/go/storage/reader.go
@@ -1,3 +1,5 @@
+// +build go1.11
+
 package storage
 
 import (

diff --git a/instrumentation/cloud.google.com/go/storage/storage.go b/instrumentation/cloud.google.com/go/storage/storage.go
@@ -1,4 +1,5 @@
-// Package storage provides Instana tracing instrumentation for Google Cloud Storage clients that use cloud.google.com/go/storage
+// +build go1.11
+
 package storage
 
 import (

diff --git a/instrumentation/cloud.google.com/go/storage/writer.go b/instrumentation/cloud.google.com/go/storage/writer.go
@@ -1,3 +1,5 @@
+// +build go1.11
+
 package storage
 
 import (
-Original file line number
+Diff line change
@@ Expand Up @@
     Installation
     ------------
+    Unlike the Instana Go sensor, this instrumentation module requires Go v1.11+ which is the minimal version for `cloud.google.com/go`.
     To add the module to your `go.mod` file run the following command in your project directory:
     ```bash
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		// Package iam provides Instana tracing instrumentation for for Google Cloud IAM clients that use cloud.google.com/go/iam

		package iam
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		// Package storage provides Instana tracing instrumentation for Google Cloud Storage clients that use cloud.google.com/go/storage

		package storage