Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

prepare for v1.24.0/v0.48.0 #858

Merged
merged 2 commits into from
Jun 6, 2024
Merged

prepare for v1.24.0/v0.48.0 #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb9f21e
Update CI go version to 1.22.4 (#859)
psx95 Jun 6, 2024
2553367
prepare for v1.24.0/v0.48.0
psx95 Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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.22.3"
DEFAULT_GO_VERSION: "1.22.4"
jobs:
lint:
runs-on: ubuntu-latest
Expand Down
8 changes: 4 additions & 4 deletions e2e-test-server/cloud_functions/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.22.0
require (
cloud.google.com/go/pubsub v1.33.0
github.com/GoogleCloudPlatform/functions-framework-go v1.6.1
github.com/GoogleCloudPlatform/opentelemetry-operations-go/e2e-test-server v0.47.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/e2e-test-server v0.48.0
github.com/cloudevents/sdk-go/v2 v2.15.2
)

Expand All @@ -18,9 +18,9 @@ require (
cloud.google.com/go/functions v1.15.1 // indirect
cloud.google.com/go/iam v1.1.1 // indirect
cloud.google.com/go/trace v1.10.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.23.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.23.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.47.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0 // indirect
github.com/go-logr/logr v1.4.1 // 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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ toolchain go1.22.0

require (
cloud.google.com/go/pubsub v1.33.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.23.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0
go.opentelemetry.io/contrib/detectors/gcp v1.25.0
go.opentelemetry.io/otel v1.25.0
go.opentelemetry.io/otel/sdk v1.25.0
Expand All @@ -20,8 +20,8 @@ require (
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.1 // indirect
cloud.google.com/go/trace v1.10.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.23.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.47.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0 // indirect
github.com/go-logr/logr v1.4.1 // 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/metric/exponential_histogram/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21
toolchain go1.22.0

require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.47.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.0
go.opentelemetry.io/contrib/detectors/gcp v1.25.0
go.opentelemetry.io/otel v1.25.0
go.opentelemetry.io/otel/metric v1.25.0
Expand All @@ -18,8 +18,8 @@ require (
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/monitoring v1.15.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.23.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.47.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand Down
2 changes: 1 addition & 1 deletion example/metric/otlpgrpc/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
require (
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.23.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand Down
6 changes: 3 additions & 3 deletions example/metric/sdk/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21
toolchain go1.22.0

require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.47.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.0
go.opentelemetry.io/contrib/detectors/gcp v1.25.0
go.opentelemetry.io/otel v1.25.0
go.opentelemetry.io/otel/metric v1.25.0
Expand All @@ -17,8 +17,8 @@ require (
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/monitoring v1.15.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.23.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.47.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0 // indirect
github.com/go-logr/logr v1.4.1 // 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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.21
toolchain go1.22.0

require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.23.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/propagator v0.47.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/propagator v0.48.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0
go.opentelemetry.io/otel v1.25.0
go.opentelemetry.io/otel/sdk v1.25.0
Expand All @@ -17,7 +17,7 @@ require (
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/trace v1.10.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.47.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/collector/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ require (
cloud.google.com/go/logging v1.9.0
cloud.google.com/go/monitoring v1.18.0
cloud.google.com/go/trace v1.10.5
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.23.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.47.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0
github.com/census-instrumentation/opencensus-proto v0.4.1
github.com/fsnotify/fsnotify v1.6.0
github.com/google/go-cmp v0.6.0
Expand Down
12 changes: 6 additions & 6 deletions exporter/collector/integrationtest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ require (
cloud.google.com/go/monitoring v1.18.0
cloud.google.com/go/trace v1.10.5
contrib.go.opencensus.io/exporter/stackdriver v0.13.14
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.47.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.47.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.47.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.47.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.47.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.48.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0
github.com/google/go-cmp v0.6.0
github.com/stretchr/testify v1.9.0
go.opencensus.io v0.24.0
Expand All @@ -37,7 +37,7 @@ require (
cloud.google.com/go/compute v1.24.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/longrunning v0.5.5 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.23.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0 // indirect
github.com/aws/aws-sdk-go v1.44.117 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
Expand Down
40 changes: 20 additions & 20 deletions exporter/collector/integrationtest/testdata/fixtures/traces/traces_basic_expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -228,7 +228,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -412,7 +412,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -596,7 +596,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -765,7 +765,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -895,7 +895,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -1025,7 +1025,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -1155,7 +1155,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -1271,7 +1271,7 @@
"attributeMap": {
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -1372,7 +1372,7 @@
"attributeMap": {
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -1473,7 +1473,7 @@
"attributeMap": {
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -1574,7 +1574,7 @@
"attributeMap": {
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -1704,7 +1704,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -1888,7 +1888,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -2072,7 +2072,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -2241,7 +2241,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -2376,7 +2376,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -2511,7 +2511,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -2646,7 +2646,7 @@
},
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down Expand Up @@ -2767,7 +2767,7 @@
"attributeMap": {
"g.co/agent": {
"stringValue": {
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.23.0"
"value": "opentelemetry-go 1.25.0; google-cloud-trace-exporter 1.24.0"
}
},
"g.co/r/generic_node/location": {
Expand Down
Loading
Loading