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

Update github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector to v0.30.1 #9944

Merged
merged 1 commit into from
May 11, 2022
Merged

Update github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector to v0.30.1 #9944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ require (

require (
bitbucket.org/atlassian/go-asap/v2 v2.6.0 // indirect
cloud.google.com/go v0.100.2 // indirect
cloud.google.com/go v0.101.1 // indirect
cloud.google.com/go/compute v1.6.1 // indirect
cloud.google.com/go/logging v1.4.2 // indirect
cloud.google.com/go/monitoring v1.4.0 // indirect
cloud.google.com/go/monitoring v1.5.0 // indirect
cloud.google.com/go/spanner v1.32.0 // indirect
cloud.google.com/go/trace v1.2.0 // indirect
code.cloudfoundry.org/clock v1.0.0 // indirect
Expand All @@ -45,9 +45,9 @@ require (
github.com/DataDog/datadog-go v4.8.2+incompatible // indirect
github.com/DataDog/sketches-go v1.4.1 // indirect
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.29.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.5.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.29.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.30.2-0.20220511202758-10aeded1f43e // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.1 // indirect
github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
Expand Down
26 changes: 17 additions & 9 deletions cmd/configschema/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions exporter/googlecloudexporter/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ func TestLoadConfig(t *testing.T) {

assert.Equal(t, len(cfg.Exporters), 2)

r0 := cfg.Exporters[config.NewComponentID(typeStr)]
assert.Equal(t, r0, factory.CreateDefaultConfig())
r0 := cfg.Exporters[config.NewComponentID(typeStr)].(*Config)
assert.Equal(t, sanitize(r0), sanitize(factory.CreateDefaultConfig().(*Config)))

r1 := cfg.Exporters[config.NewComponentIDWithName(typeStr, "customname")].(*Config)
assert.Equal(t, r1,
assert.Equal(t, sanitize(r1),
&Config{
ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "customname")),
TimeoutSettings: exporterhelper.TimeoutSettings{
Expand Down Expand Up @@ -98,3 +98,9 @@ func TestLoadConfig(t *testing.T) {
},
})
}

func sanitize(cfg *Config) *Config {
cfg.Config.MetricConfig.MapMonitoredResource = nil
cfg.Config.MetricConfig.GetMetricName = nil
return cfg
}
12 changes: 6 additions & 6 deletions exporter/googlecloudexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.17

require (
contrib.go.opencensus.io/exporter/stackdriver v0.13.11
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.29.1
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.30.2-0.20220511202758-10aeded1f43e
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.50.0
Expand All @@ -20,13 +20,13 @@ require (
)

require (
cloud.google.com/go v0.100.2 // indirect
cloud.google.com/go v0.101.1 // indirect
cloud.google.com/go/compute v1.6.1 // indirect
cloud.google.com/go/logging v1.4.2 // indirect
cloud.google.com/go/monitoring v1.4.0 // indirect
cloud.google.com/go/monitoring v1.5.0 // indirect
cloud.google.com/go/trace v1.2.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.5.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.29.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.1 // indirect
github.com/aws/aws-sdk-go v1.44.11 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand All @@ -44,7 +44,7 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/model v0.49.0 // indirect
go.opentelemetry.io/collector/model v0.50.0 // indirect
go.opentelemetry.io/otel v1.7.0 // indirect
go.opentelemetry.io/otel/metric v0.30.0 // indirect
go.opentelemetry.io/otel/sdk v1.7.0 // indirect
Expand Down
Loading