Skip to content

Commit

Permalink
Update DEFAULT_GO_VERSION to 1.20 and drop 1.18 on compatibility-test
Browse files Browse the repository at this point in the history
Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
  • Loading branch information
zchee committed Mar 19, 2023
1 parent 8aa0411 commit 77d320a
Show file tree
Hide file tree
Showing 19 changed files with 322 additions and 543 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
# Path to where test results will be saved.
TEST_RESULTS: /tmp/test-results
# Default minimum version of Go to support.
DEFAULT_GO_VERSION: 1.19
DEFAULT_GO_VERSION: "1.20"
jobs:
lint:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
compatibility-test:
strategy:
matrix:
go-version: [1.19, 1.18]
go-version: ["1.20", 1.19]
os: [ubuntu-latest, macos-latest, windows-latest]
arch: ["386", amd64]
exclude:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ for-all-package:

.PHONY: gotidy
gotidy:
$(MAKE) for-all-mod CMD="go mod tidy -compat=1.18"
$(MAKE) for-all-mod CMD="go mod tidy -compat=1.19"

.PHONY: update-dep
update-dep:
Expand Down
2 changes: 1 addition & 1 deletion detectors/gcp/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp

go 1.19
go 1.20

require (
cloud.google.com/go/compute v1.10.0
Expand Down
2 changes: 1 addition & 1 deletion e2e-test-server/cloud_functions/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/e2e-test-server/cloudfunctions

go 1.19
go 1.20

require (
cloud.google.com/go/pubsub v1.28.0
Expand Down
2 changes: 1 addition & 1 deletion e2e-test-server/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/e2e-test-server

go 1.19
go 1.20

require (
cloud.google.com/go/pubsub v1.27.1
Expand Down
7 changes: 3 additions & 4 deletions example/metric/example.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,13 @@ func main() {

// Add measurement once an every 10 second.
timer := time.NewTicker(10 * time.Second)
rng := rand.New(rand.NewSource(time.Now().UnixNano()))
for range timer.C {
rand.Seed(time.Now().UnixNano())

r := rand.Int63n(100)
r := rng.Int63n(100)
cv := 100 + r
counter.Add(ctx, cv, clabels...)

r2 := rand.Int63n(100)
r2 := rng.Int63n(100)
hv := float64(r2) / 20.0
histogram.Record(ctx, hv, clabels...)
ov := 12.34 + hv
Expand Down
2 changes: 1 addition & 1 deletion example/metric/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/example/metric

go 1.19
go 1.20

require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.36.0
Expand Down
2 changes: 1 addition & 1 deletion example/trace/http/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/example/trace/http

go 1.19
go 1.20

require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.12.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/collector/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector

go 1.19
go 1.20

require (
cloud.google.com/go/logging v1.6.1
Expand Down
2 changes: 1 addition & 1 deletion exporter/collector/googlemanagedprometheus/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus

go 1.19
go 1.20

require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.73.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/collector/integrationtest/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/internal/integrationtest

go 1.19
go 1.20

require (
cloud.google.com/go/logging v1.6.1
Expand Down
2 changes: 1 addition & 1 deletion exporter/metric/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric

go 1.19
go 1.20

require (
cloud.google.com/go/monitoring v1.12.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/trace/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace

go 1.19
go 1.20

require (
cloud.google.com/go/trace v1.8.0
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go

go 1.19
go 1.20

retract (
v1.8.0
Expand Down
2 changes: 1 addition & 1 deletion internal/cloudmock/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock

go 1.19
go 1.20

require (
google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55
Expand Down
2 changes: 1 addition & 1 deletion internal/resourcemapping/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping

go 1.19
go 1.20

require go.opentelemetry.io/otel v1.14.0
2 changes: 1 addition & 1 deletion propagator/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/propagator

go 1.19
go 1.20

require (
github.com/google/go-cmp v0.5.9
Expand Down
Loading

0 comments on commit 77d320a

Please sign in to comment.