update to go 1.18

GoogleCloudPlatform · Sep 27, 2022 · 11cfd29 · 11cfd29
1 parent 73fb994
commit 11cfd29
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.17
+      - image: cimg/go:1.18
 
     environment:
       TEST_RESULTS: /tmp/test-results # path to where test results will be saved

diff --git a/Makefile b/Makefile
@@ -139,9 +139,9 @@ lint: $(TOOLS_DIR)/golangci-lint $(TOOLS_DIR)/misspell
 	done
 	$(TOOLS_DIR)/misspell -w $(ALL_DOCS)
 	set -e; for dir in $(ALL_GO_MOD_DIRS) $(TOOLS_MOD_DIR); do \
-	  echo "go mod tidy -compat=1.17 in $${dir}"; \
+	  echo "go mod tidy -compat=1.18 in $${dir}"; \
 	  (cd "$${dir}" && \
-	    go mod tidy -compat=1.17); \
+	    go mod tidy -compat=1.18); \
 	done
 
 generate: $(TOOLS_DIR)/stringer $(TOOLS_DIR)/protoc
@@ -172,7 +172,7 @@ for-all-package:
 
 .PHONY: gotidy
 gotidy:
-	$(MAKE) for-all-mod CMD="go mod tidy -compat=1.17"
+	$(MAKE) for-all-mod CMD="go mod tidy -compat=1.18"
 
 .PHONY: update-dep
 update-dep:

diff --git a/cloudbuild-integration-tests.yaml b/cloudbuild-integration-tests.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 steps:
-  - name: golang:1.17
+  - name: golang:1.18
     env: ["SECOND_PROJECT_ID=opentelemetry-ops-e2e-2"]
     args: ["make", "integrationtest"]
 logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
diff --git a/detectors/gcp/go.mod b/detectors/gcp/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp
 
-go 1.17
+go 1.18
 
 require (
 	cloud.google.com/go/compute v1.6.1

diff --git a/e2e-test-server/Dockerfile b/e2e-test-server/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.17 as builder
+FROM golang:1.18 as builder
 
 WORKDIR /workspace/e2e-test-server/
 

diff --git a/e2e-test-server/go.mod b/e2e-test-server/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/opentelemetry-operations-go/e2e-test-server
 
-go 1.17
+go 1.18
 
 require (
 	cloud.google.com/go/iam v0.3.0 // indirect

diff --git a/example/metric/go.mod b/example/metric/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/opentelemetry-operations-go/example/metric
 
-go 1.17
+go 1.18
 
 replace github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric => ../../exporter/metric
 

diff --git a/example/trace/http/go.mod b/example/trace/http/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/opentelemetry-operations-go/example/trace/http
 
-go 1.17
+go 1.18
 
 replace github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace => ../../../exporter/trace
 

diff --git a/exporter/collector/go.mod b/exporter/collector/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector
 
-go 1.17
+go 1.18
 
 require (
 	cloud.google.com/go/logging v1.4.2

diff --git a/exporter/collector/googlemanagedprometheus/go.mod b/exporter/collector/googlemanagedprometheus/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus
 
-go 1.17
+go 1.18
 
 require (
 	github.com/stretchr/testify v1.8.0

diff --git a/exporter/collector/integrationtest/go.mod b/exporter/collector/integrationtest/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest
 
-go 1.17
+go 1.18
 
 require (
 	contrib.go.opencensus.io/exporter/stackdriver v0.13.11

diff --git a/exporter/trace/go.mod b/exporter/trace/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace
 
-go 1.17
+go 1.18
 
 require (
 	cloud.google.com/go/trace v1.2.0

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/opentelemetry-operations-go
 
-go 1.17
+go 1.18
 
 require (
 	github.com/google/go-cmp v0.5.8

diff --git a/internal/cloudmock/go.mod b/internal/cloudmock/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock
 
-go 1.17
+go 1.18
 
 require (
 	google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf

diff --git a/internal/resourcemapping/go.mod b/internal/resourcemapping/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping
 
-go 1.17
+go 1.18
 
 require go.opentelemetry.io/otel v1.10.0
 

diff --git a/tools/go.mod b/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/opentelemetry-operations-go/tools
 
-go 1.17
+go 1.18
 
 require (
 	github.com/client9/misspell v0.3.4