Skip to content

Commit

Permalink
Prepare release v1.11.0 and v0.35.0 (#577)
Browse files Browse the repository at this point in the history 
* Update versions to 1.11.0 and 0.35.0

* Add e2e-test-server to release.go

* make prepare-release

* make fixtures
  • Loading branch information
@damemi
damemi committed Jan 30, 2023
1 parent c6c6d07 commit e169468
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 48 deletions.
8 changes: 4 additions & 4 deletions e2e-test-server/cloud_functions/go.mod
View file
Expand Up @@ -5,7 +5,7 @@ go 1.18
require (
cloud.google.com/go/pubsub v1.28.0
github.com/GoogleCloudPlatform/functions-framework-go v1.6.1
github.com/GoogleCloudPlatform/opentelemetry-operations-go/e2e-test-server v0.0.0-00010101000000-000000000000
github.com/GoogleCloudPlatform/opentelemetry-operations-go/e2e-test-server v0.35.0
github.com/cloudevents/sdk-go/v2 v2.13.0
)

Expand All @@ -16,9 +16,9 @@ require (
cloud.google.com/go/functions v1.9.0 // indirect
cloud.google.com/go/iam v0.8.0 // indirect
cloud.google.com/go/trace v1.8.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.2 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.11.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand Down
6 changes: 3 additions & 3 deletions e2e-test-server/go.mod
View file
Expand Up @@ -5,7 +5,7 @@ go 1.18
require (
cloud.google.com/go/iam v0.8.0 // indirect
cloud.google.com/go/pubsub v1.27.1
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.0
go.opentelemetry.io/otel v1.11.2
go.opentelemetry.io/otel/sdk v1.11.2
go.opentelemetry.io/otel/trace v1.11.2
Expand All @@ -19,8 +19,8 @@ require (
cloud.google.com/go/compute v1.14.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/trace v1.8.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.34.2 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.2 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.11.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand Down
4 changes: 2 additions & 2 deletions example/metric/go.mod
View file
Expand Up @@ -9,7 +9,7 @@ replace github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/clou
replace github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping => ../../internal/resourcemapping

require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.34.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.35.0
go.opentelemetry.io/otel v1.11.2
go.opentelemetry.io/otel/metric v0.34.0
go.opentelemetry.io/otel/sdk/metric v0.34.0
Expand All @@ -19,7 +19,7 @@ require (
cloud.google.com/go/compute v1.14.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/monitoring v1.12.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.2 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand Down
6 changes: 3 additions & 3 deletions example/trace/http/go.mod
View file
Expand Up @@ -13,8 +13,8 @@ replace github.com/GoogleCloudPlatform/opentelemetry-operations-go/propagator =>
replace github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock => ../../../internal/cloudmock

require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/propagator v0.34.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/propagator v0.35.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4
go.opentelemetry.io/otel v1.11.2
go.opentelemetry.io/otel/sdk v1.11.2
Expand All @@ -25,7 +25,7 @@ require (
cloud.google.com/go/compute v1.14.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/trace v1.8.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.2 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/collector/go.mod
View file
Expand Up @@ -6,8 +6,8 @@ require (
cloud.google.com/go/logging v1.6.1
cloud.google.com/go/monitoring v1.8.0
cloud.google.com/go/trace v1.8.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0
github.com/census-instrumentation/opencensus-proto v0.4.1
github.com/google/go-cmp v0.5.9
github.com/googleapis/gax-go/v2 v2.7.0
Expand Down
12 changes: 6 additions & 6 deletions exporter/collector/integrationtest/go.mod
View file
Expand Up @@ -7,11 +7,11 @@ require (
cloud.google.com/go/monitoring v1.12.0
cloud.google.com/go/trace v1.8.0
contrib.go.opencensus.io/exporter/stackdriver v0.13.14
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.34.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.34.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.35.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.35.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.35.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.35.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0
github.com/google/go-cmp v0.5.9
github.com/stretchr/testify v1.8.1
go.opencensus.io v0.24.0
Expand All @@ -35,7 +35,7 @@ require (
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/longrunning v0.3.0 // indirect
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.10.2 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.0 // indirect
github.com/aws/aws-sdk-go v1.44.117 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
Expand Down
40 changes: 20 additions & 20 deletions exporter/collector/integrationtest/testdata/fixtures/traces/traces_basic_expected.json
View file
Expand Up @@ -44,7 +44,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -223,7 +223,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -402,7 +402,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -581,7 +581,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -745,7 +745,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -875,7 +875,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -1005,7 +1005,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -1135,7 +1135,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -1251,7 +1251,7 @@
"attributeMap": {
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -1347,7 +1347,7 @@
"attributeMap": {
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -1443,7 +1443,7 @@
"attributeMap": {
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -1539,7 +1539,7 @@
"attributeMap": {
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -1664,7 +1664,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -1843,7 +1843,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -2022,7 +2022,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -2186,7 +2186,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -2316,7 +2316,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -2446,7 +2446,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -2576,7 +2576,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down Expand Up @@ -2692,7 +2692,7 @@
"attributeMap": {
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.10.2"
"value": "opentelemetry-go 1.11.2; google-cloud-trace-exporter 1.11.0"
}
},
"g.co/gae/app/module": {
Expand Down
4 changes: 2 additions & 2 deletions exporter/metric/go.mod
View file
Expand Up @@ -19,8 +19,8 @@ require (
)

require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.34.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.35.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0
github.com/googleapis/gax-go/v2 v2.7.0
github.com/stretchr/testify v1.8.1
go.uber.org/multierr v1.8.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/metric/version.go
View file
Expand Up @@ -17,5 +17,5 @@ package metric
// Version is the current release version of the OpenTelemetry
// Operations Metric Exporter in use.
func Version() string {
return "0.34.2"
return "0.35.0"
}
4 changes: 2 additions & 2 deletions exporter/trace/go.mod
View file
Expand Up @@ -20,8 +20,8 @@ require (
)

require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.34.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.34.2
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.35.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0
go.uber.org/multierr v1.8.0
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/trace/version.go
View file
Expand Up @@ -17,5 +17,5 @@ package trace
// Version is the current release version of the OpenTelemetry
// Operations Trace Exporter in use.
func Version() string {
return "1.10.2"
return "1.11.0"
}
6 changes: 4 additions & 2 deletions tools/release.go
View file
Expand Up @@ -29,8 +29,8 @@ import (
const (
prefix = "github.com/GoogleCloudPlatform/opentelemetry-operations-go"

stable = "1.10.2"
unstable = "0.34.2"
stable = "1.11.0"
unstable = "0.35.0"
)

var versions = map[string]string{
Expand All @@ -50,6 +50,8 @@ var versions = map[string]string{
"detectors/gcp/": stable,

"propagator/": unstable,

"e2e-test-server/": unstable,
}

type module string
Expand Down

0 comments on commit e169468

Please sign in to comment.