Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG-developer.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ The list below covers the major changes between 7.0.0-rc2 and main only.
- Fix IIS module logging errors in case application pool PDH counter is not found. {pull}42274[42274]
- Removed direct dependency on Azure/go-autorest/autorest/adal, which is deprecated. {issue}41463[41463] {pull}42959[42959]
- Fixed flaky zookeeper integration tests. {pull}43638[43638]
- Fixed Fileebat GCP Pub/Sub input integration tests. {pull}45150[45150]

==== Added

Expand Down
2 changes: 2 additions & 0 deletions dev-tools/mage/integtest_docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ func WithGoIntegTestHostEnv(env map[string]string) map[string]string {
// images for the next release after a feature freeze, which causes temporary test failures.
env["TESTING_FILEBEAT_ALLOW_OLDER"] = "1"

env["PUBSUB_EMULATOR_HOST"] = "localhost:8432"

return env
}

Expand Down
10 changes: 10 additions & 0 deletions x-pack/agentbeat/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ services:
ports:
- 9200:9200

googlepubsub:
image: docker.elastic.co/integrations-ci/beats-googlepubsub:emulator-${SDK_VERSION:-398.0.0-0}-1
build:
context: ${ES_BEATS}/testing/environments/docker/googlepubsub
args:
SDK_VERSION: ${SDK_VERSION:-398.0.0-0}
hostname: googlepubsub
ports:
- 8432:8432

cometd:
build: ${ES_BEATS}/testing/environments/docker/cometd
hostname: cometd
Expand Down
10 changes: 10 additions & 0 deletions x-pack/filebeat/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ services:
ports:
- 9200:9200

googlepubsub:
image: docker.elastic.co/integrations-ci/beats-googlepubsub:emulator-${SDK_VERSION:-398.0.0-0}-1
build:
context: ${ES_BEATS}/testing/environments/docker/googlepubsub
args:
SDK_VERSION: ${SDK_VERSION:-398.0.0-0}
hostname: googlepubsub
ports:
- 8432:8432

cometd:
build: ${ES_BEATS}/testing/environments/docker/cometd
hostname: cometd
Expand Down
11 changes: 0 additions & 11 deletions x-pack/filebeat/input/gcppubsub/docker-compose.yml

This file was deleted.

2 changes: 2 additions & 0 deletions x-pack/filebeat/input/gcppubsub/pubsub_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ func runTestWithACKer(t *testing.T, cfg *conf.C, onEvent eventHandler, run func(
}
//nolint:errcheck // ignore
pubsubInput := in.(*pubsubInput)
// Initialize metrics explicitly for tests
pubsubInput.metrics = newInputMetrics("", nil)
defer pubsubInput.Stop()

run(client, pubsubInput, eventOutlet, t)
Expand Down
Loading