Skip to content

Commit a3750c9

Browse files
authored
Bump GCP dependencies to v0.35.1 and v1.11.1 (#18468)
Bump GCP dependencies to latest version. This is important to fix a bug that broke the GMP exporter. Our downstream tests had been inadvertently disabled which missed this.
1 parent fac9f8b commit a3750c9

File tree

15 files changed

+93
-77
lines changed

15 files changed

+93
-77
lines changed

.chloggen/gcp-0351-1111.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: bug_fix
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
5+
component: googlemanagedprometheusexporter
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Fixed broken export on target_info and scope_info metrics for GMP.
9+
10+
# One or more tracking issues related to the change
11+
issues: [18468]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

cmd/configschema/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ require (
8282
github.com/DataDog/sketches-go v1.4.1 // indirect
8383
github.com/DataDog/zstd v1.5.2 // indirect
8484
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
85-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.11.0 // indirect
86-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.35.0 // indirect
87-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.35.0 // indirect
88-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.0 // indirect
89-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0 // indirect
85+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.11.1 // indirect
86+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.35.1 // indirect
87+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.35.1 // indirect
88+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.1 // indirect
89+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.1 // indirect
9090
github.com/Microsoft/go-winio v0.5.2 // indirect
9191
github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect
9292
github.com/SAP/go-hdb v0.111.9 // indirect

cmd/configschema/go.sum

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcontribcol/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,11 @@ require (
229229
github.com/DataDog/sketches-go v1.4.1 // indirect
230230
github.com/DataDog/zstd v1.5.0 // indirect
231231
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
232-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.11.0 // indirect
233-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.35.0 // indirect
234-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.35.0 // indirect
235-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.0 // indirect
236-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0 // indirect
232+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.11.1 // indirect
233+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.35.1 // indirect
234+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.35.1 // indirect
235+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.1 // indirect
236+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.1 // indirect
237237
github.com/Microsoft/go-winio v0.5.2 // indirect
238238
github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect
239239
github.com/SAP/go-hdb v0.111.9 // indirect

cmd/otelcontribcol/go.sum

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/datadogexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/DataDog/datadog-api-client-go/v2 v2.7.0
1111
github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc
1212
github.com/DataDog/sketches-go v1.4.1
13-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.11.0
13+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.11.1
1414
github.com/aws/aws-sdk-go v1.44.196
1515
github.com/cenkalti/backoff/v4 v4.2.0
1616
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.71.0

exporter/datadogexporter/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/googlecloudexporter/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/google
33
go 1.18
44

55
require (
6-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.35.0
6+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.35.1
77
github.com/cenkalti/backoff/v4 v4.2.0
88
github.com/stretchr/testify v1.8.1
99
go.opentelemetry.io/collector v0.71.0
@@ -20,8 +20,8 @@ require (
2020
cloud.google.com/go/longrunning v0.3.0 // indirect
2121
cloud.google.com/go/monitoring v1.9.1 // indirect
2222
cloud.google.com/go/trace v1.8.0 // indirect
23-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.0 // indirect
24-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0 // indirect
23+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.1 // indirect
24+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.1 // indirect
2525
github.com/davecgh/go-spew v1.1.1 // indirect
2626
github.com/fsnotify/fsnotify v1.6.0 // indirect
2727
github.com/go-logr/logr v1.2.3 // indirect

exporter/googlecloudexporter/go.sum

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/googlemanagedprometheusexporter/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/google
33
go 1.18
44

55
require (
6-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.35.0
7-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.35.0
6+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.35.1
7+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.35.1
88
github.com/cenkalti/backoff/v4 v4.2.0
99
github.com/stretchr/testify v1.8.1
1010
go.opentelemetry.io/collector v0.71.0
@@ -20,8 +20,8 @@ require (
2020
cloud.google.com/go/monitoring v1.9.1 // indirect
2121
cloud.google.com/go/trace v1.8.0 // indirect
2222
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
23-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.0 // indirect
24-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0 // indirect
23+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.1 // indirect
24+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.1 // indirect
2525
github.com/beorn7/perks v1.0.1 // indirect
2626
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2727
github.com/davecgh/go-spew v1.1.1 // indirect

0 commit comments

Comments
 (0)