这是indexloc提供的服务，不要输入任何密码
Skip to content

[Testing] Switch integration tests to use gce_testing.go from its new location. #1936

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

Merged
merged 6 commits into from
Apr 29, 2025
Merged

[Testing] Switch integration tests to use gce_testing.go from its new location. #1936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e20dd91
Switch integration tests to use gce_testing.go from its new location.
martijnvans Apr 28, 2025
312d623
Merge branch 'master' into martijnvans-gce-testing-switch
martijnvans Apr 29, 2025
77d7dc2
simulacra and soak tests too, also delete gce_testing.go completely f…
martijnvans Apr 29, 2025
4c2746e
reduce future merge conflicts
martijnvans Apr 29, 2025
98d73d7
Merge branch 'master' into martijnvans-gce-testing-switch
martijnvans Apr 29, 2025
0b62082
Merge branch 'master' into martijnvans-gce-testing-switch
martijnvans Apr 29, 2025
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
4 changes: 2 additions & 2 deletions cmd/simulacra/simulacra.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import (
"path/filepath"
"strings"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/integration_test/gce-testing-internal/gce"
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/integration_test/gce-testing-internal/logging"
"github.com/GoogleCloudPlatform/ops-agent/apps"
"github.com/GoogleCloudPlatform/ops-agent/confgenerator"
"github.com/GoogleCloudPlatform/ops-agent/integration_test/agents"
"github.com/GoogleCloudPlatform/ops-agent/integration_test/gce"
"github.com/GoogleCloudPlatform/ops-agent/integration_test/logging"
"github.com/binxio/gcloudconfig"
"github.com/google/uuid"
"gopkg.in/yaml.v3"
Expand Down
99 changes: 51 additions & 48 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,66 @@
module github.com/GoogleCloudPlatform/ops-agent

go 1.23.0
go 1.24

require (
cloud.google.com/go/compute/metadata v0.5.2
cloud.google.com/go/logging v1.11.0
cloud.google.com/go/monitoring v1.21.0
cloud.google.com/go/storage v1.43.0
cloud.google.com/go/trace v1.11.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.3
cloud.google.com/go/compute/metadata v0.6.0
cloud.google.com/go/logging v1.13.0
cloud.google.com/go/monitoring v1.24.2
cloud.google.com/go/storage v1.52.0 // indirect
cloud.google.com/go/trace v1.11.6 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0
github.com/binxio/gcloudconfig v0.1.5
github.com/blang/semver v3.5.1+incompatible
github.com/cenkalti/backoff/v4 v4.3.0
github.com/go-playground/validator/v10 v10.11.1
github.com/goccy/go-yaml v1.14.1
github.com/google/go-cmp v0.6.0
github.com/google/go-cmp v0.7.0
github.com/google/uuid v1.6.0
github.com/googleapis/gax-go/v2 v2.13.0
github.com/googleapis/gax-go/v2 v2.14.1
github.com/hashicorp/go-multierror v1.1.1
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
github.com/mitchellh/mapstructure v1.5.0
github.com/prometheus/common v0.55.0
github.com/prometheus/prometheus v0.51.2-0.20240405174432-b4a973753c6e
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/smallnest/weighted v0.0.0-20230419055410-36b780e40a7a
go.opentelemetry.io/contrib/detectors/gcp v1.31.0
go.opentelemetry.io/otel v1.31.0
go.opentelemetry.io/otel/metric v1.31.0
go.opentelemetry.io/otel/sdk v1.31.0
go.opentelemetry.io/otel/sdk/metric v1.31.0
github.com/smallnest/weighted v0.0.0-20230419055410-36b780e40a7a // indirect
go.opentelemetry.io/contrib/detectors/gcp v1.35.0
go.opentelemetry.io/otel v1.35.0
go.opentelemetry.io/otel/metric v1.35.0
go.opentelemetry.io/otel/sdk v1.35.0
go.opentelemetry.io/otel/sdk/metric v1.35.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.24.0
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
golang.org/x/sys v0.30.0
golang.org/x/text v0.22.0
google.golang.org/api v0.195.0
google.golang.org/genproto v0.0.0-20240827150818-7e3bb234dfed // indirect
google.golang.org/grpc v1.66.0
google.golang.org/protobuf v1.36.0
golang.org/x/sys v0.32.0
golang.org/x/text v0.24.0 // indirect
google.golang.org/api v0.230.0
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
google.golang.org/grpc v1.72.0
google.golang.org/protobuf v1.36.6
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/yaml.v2 v2.4.0
gotest.tools/v3 v3.4.0
)

require (
buf.build/go/protoyaml v0.3.1
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.3
github.com/GoogleCloudPlatform/opentelemetry-operations-collector/integration_test/gce-testing-internal v0.0.0-20250425182937-7dbac7c04b01
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0
go.opentelemetry.io/collector/pdata v1.4.0
golang.org/x/sync v0.11.0
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed
golang.org/x/sync v0.13.0
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e
gopkg.in/yaml.v3 v3.0.1
)

require (
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.0-20241127180247-a33202765966.1 // indirect
cel.dev/expr v0.18.0 // indirect
cloud.google.com/go v0.115.1 // indirect
cloud.google.com/go/auth v0.9.1 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
cloud.google.com/go/iam v1.2.0 // indirect
cloud.google.com/go/longrunning v0.6.0 // indirect
cel.dev/expr v0.20.0 // indirect
cloud.google.com/go v0.120.0 // indirect
cloud.google.com/go/auth v0.16.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
cloud.google.com/go/iam v1.5.0 // indirect
cloud.google.com/go/longrunning v0.6.6 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
Expand All @@ -68,28 +69,29 @@ require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.3 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/aws/aws-sdk-go v1.54.19 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bufbuild/protovalidate-go v0.8.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b // indirect
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/digitalocean/godo v1.118.0 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/envoyproxy/go-control-plane v0.12.1-0.20240621013728-1eb8caab5155 // indirect
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
Expand All @@ -104,14 +106,13 @@ require (
github.com/go-zookeeper/zk v1.0.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cel-go v0.22.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.3 // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
github.com/gophercloud/gophercloud v1.13.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
Expand Down Expand Up @@ -159,24 +160,26 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/vultr/govultr/v2 v2.17.2 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
github.com/zeebo/errs v1.4.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/crypto v0.35.0 // indirect
golang.org/x/crypto v0.37.0 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/net v0.36.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/term v0.29.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/net v0.39.0 // indirect
golang.org/x/oauth2 v0.29.0 // indirect
golang.org/x/term v0.31.0 // indirect
golang.org/x/time v0.11.0 // indirect
golang.org/x/tools v0.23.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
k8s.io/api v0.29.3 // indirect
Expand Down
Loading
Loading