Skip to content

Commit

Permalink
fix(deps): update module github.com/testcontainers/testcontainers-go …
Browse files Browse the repository at this point in the history
…to v0.27.0 - abandoned (open-telemetry#30218)

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/testcontainers/testcontainers-go](https://togithub.com/testcontainers/testcontainers-go)
| `v0.26.0` -> `v0.27.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2ftestcontainers%2ftestcontainers-go/v0.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2ftestcontainers%2ftestcontainers-go/v0.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2ftestcontainers%2ftestcontainers-go/v0.26.0/v0.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2ftestcontainers%2ftestcontainers-go/v0.26.0/v0.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>testcontainers/testcontainers-go
(github.com/testcontainers/testcontainers-go)</summary>

###
[`v0.27.0`](https://togithub.com/testcontainers/testcontainers-go/releases/tag/v0.27.0)

[Compare
Source](https://togithub.com/testcontainers/testcontainers-go/compare/v0.26.0...v0.27.0)

### What's Changed

#### ⚠️ Breaking Changes

##### Building images with FromDockerfile

The `ImageBuildInfo` interface now includes a new method:
`BuildOptions`, which is used to configure the build process.
This method returns the image build options when building a Docker image
from a Dockerfile,
and it will apply some defaults and finally call the new
`BuildOptionsModifier` method from the FromDockerfile struct, if set.
This way it's possible to access Docker's `types.ImageBuildOptions` type
and modify it before the build process starts.

- feat: support customizing the Docker build command
([#&open-telemetry#8203;1931](https://togithub.com/testcontainers/testcontainers-go/issues/1931))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)

##### Executing commands using the Executable interface

It now includes an `Options` method that needs to be implemented. This
method will allow configuring the exec options added in this PR for the
`WithStartupCommand` functional option.
If your code is implementing `Executable`, you can embed the
`ExecOptions` struct in your own struct in order to satisfy the
interface.
Please take a look at the [`RabbitMQ` test
types](https://togithub.com/testcontainers/testcontainers-go/pull/1914/files#diff-9cbf181bab5500bd9f371233f75239d5ffdb13b93c77ee276200cbcc85f726bcR216)
to see examples on how to do it.

- feat: support for executing commands in a container with user, workDir
and env
([#&open-telemetry#8203;1914](https://togithub.com/testcontainers/testcontainers-go/issues/1914))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)

#### 🔒 Security

- chore(deps): bump golang.org/x/crypto to 0.17.0 in /modules
([#&open-telemetry#8203;2006](https://togithub.com/testcontainers/testcontainers-go/issues/2006))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)

#### 🚀 Features

- Add neo4j license agreement customization options
([#&open-telemetry#8203;2036](https://togithub.com/testcontainers/testcontainers-go/issues/2036))
[@&open-telemetry#8203;danielorbach](https://togithub.com/danielorbach)
- feat: support configuring Ryuk verbose mode at config level
([#&open-telemetry#8203;2038](https://togithub.com/testcontainers/testcontainers-go/issues/2038))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- feat: create networks with random names
([#&open-telemetry#8203;1993](https://togithub.com/testcontainers/testcontainers-go/issues/1993))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- feat: add module to support Microsoft SQL Server
([#&open-telemetry#8203;1969](https://togithub.com/testcontainers/testcontainers-go/issues/1969))
[@&open-telemetry#8203;agosmou](https://togithub.com/agosmou)
- feat: exec multiplexed to return stderr
([#&open-telemetry#8203;1933](https://togithub.com/testcontainers/testcontainers-go/issues/1933))
[@&open-telemetry#8203;gutocondela](https://togithub.com/gutocondela)
- feat: support for custom registry prefixes at the configuration level
([#&open-telemetry#8203;1928](https://togithub.com/testcontainers/testcontainers-go/issues/1928))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- Add username and password functions to mongodb
([#&open-telemetry#8203;1910](https://togithub.com/testcontainers/testcontainers-go/issues/1910))
[@&open-telemetry#8203;ugrkm](https://togithub.com/ugrkm)
- feat: Allow the container working directory to be specified
([#&open-telemetry#8203;1899](https://togithub.com/testcontainers/testcontainers-go/issues/1899))
[@&open-telemetry#8203;fhke](https://togithub.com/fhke)
- feat: expose a WithNetwork functional option
([#&open-telemetry#8203;1887](https://togithub.com/testcontainers/testcontainers-go/issues/1887))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)

#### 🐛 Bug Fixes

- fix: remove docker.io from Ryuk image name
([#&open-telemetry#8203;2046](https://togithub.com/testcontainers/testcontainers-go/issues/2046))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- fix: fallback matching of registry authentication config
([#&open-telemetry#8203;1927](https://togithub.com/testcontainers/testcontainers-go/issues/1927))
[@&open-telemetry#8203;sermio-te](https://togithub.com/sermio-te)
- fix(modules.kafka): Switch to MaxInt for 32-bit support
([#&open-telemetry#8203;1923](https://togithub.com/testcontainers/testcontainers-go/issues/1923))
[@&open-telemetry#8203;powersj](https://togithub.com/powersj)
- fix(reaper): fix race condition when reusing reapers
([#&open-telemetry#8203;1904](https://togithub.com/testcontainers/testcontainers-go/issues/1904))
[@&open-telemetry#8203;lefinal](https://togithub.com/lefinal)
- Fix - respect ContainerCustomizer in neo4j module
([#&open-telemetry#8203;1903](https://togithub.com/testcontainers/testcontainers-go/issues/1903))
[@&open-telemetry#8203;fhke](https://togithub.com/fhke)

#### 📖 Documentation

- Add more content on how to use Exec function
([#&open-telemetry#8203;1970](https://togithub.com/testcontainers/testcontainers-go/issues/1970))
[@&open-telemetry#8203;danvergara](https://togithub.com/danvergara)
- docs: include MongoDB's username and password options into the docs
([#&open-telemetry#8203;1930](https://togithub.com/testcontainers/testcontainers-go/issues/1930))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- docs: add some Vault module examples
([#&open-telemetry#8203;1825](https://togithub.com/testcontainers/testcontainers-go/issues/1825))
[@&open-telemetry#8203;kuisathaverat](https://togithub.com/kuisathaverat)
- docs: fix code snippet for image substitution
([#&open-telemetry#8203;1918](https://togithub.com/testcontainers/testcontainers-go/issues/1918))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- Add database driver note to SQL Wait strategy docs
([#&open-telemetry#8203;1916](https://togithub.com/testcontainers/testcontainers-go/issues/1916))
[@&open-telemetry#8203;mihaitodor](https://togithub.com/mihaitodor)

#### 🧹 Housekeeping

- chore: do not read config but instead pass the hub prefix to the
prependHub modifier
([#&open-telemetry#8203;2047](https://togithub.com/testcontainers/testcontainers-go/issues/2047))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- adds gotestsum to install tools
([#&open-telemetry#8203;2043](https://togithub.com/testcontainers/testcontainers-go/issues/2043))
[@&open-telemetry#8203;hughesjj](https://togithub.com/hughesjj)
- chore: lookup exposed ports in the image from Config, not from
ContainerConfig
([#&open-telemetry#8203;2039](https://togithub.com/testcontainers/testcontainers-go/issues/2039))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore: skip TestContainerLogWithErrClosed as flaky on rootless docker
([#&open-telemetry#8203;1925](https://togithub.com/testcontainers/testcontainers-go/issues/1925))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- Reduce flakiness in ClickHouse tests
([#&open-telemetry#8203;1902](https://togithub.com/testcontainers/testcontainers-go/issues/1902))
[@&open-telemetry#8203;rafiramadhana](https://togithub.com/rafiramadhana)
- lint: enable nonamedreturns
([#&open-telemetry#8203;1909](https://togithub.com/testcontainers/testcontainers-go/issues/1909))
[@&open-telemetry#8203;mmorel-35](https://togithub.com/mmorel-35)
- chore: deprecate BindMount APIs
([#&open-telemetry#8203;1907](https://togithub.com/testcontainers/testcontainers-go/issues/1907))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore: make rabbitmq examples more readable
([#&open-telemetry#8203;1905](https://togithub.com/testcontainers/testcontainers-go/issues/1905))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore: add tests for withNetwork option
([#&open-telemetry#8203;1894](https://togithub.com/testcontainers/testcontainers-go/issues/1894))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- fix(redpanda): add wait for listening port condition on startup
([#&open-telemetry#8203;1828](https://togithub.com/testcontainers/testcontainers-go/issues/1828))
[@&open-telemetry#8203;sbuliarca](https://togithub.com/sbuliarca)

#### 📦 Dependency updates

- chore: bump Ryuk to 0.6.0
([#&open-telemetry#8203;2040](https://togithub.com/testcontainers/testcontainers-go/issues/2040))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump github.com/containerd/containerd from 1.7.7 to
1.7.11
([#&open-telemetry#8203;2011](https://togithub.com/testcontainers/testcontainers-go/issues/2011))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump golang.org/x/crypto to 0.17.0 in /modules
([#&open-telemetry#8203;2006](https://togithub.com/testcontainers/testcontainers-go/issues/2006))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump github.com/ClickHouse/clickhouse-go/v2 from 2.15.0
to 2.16.0 in /modules/clickhouse
([#&open-telemetry#8203;1982](https://togithub.com/testcontainers/testcontainers-go/issues/1982))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/twmb/franz-go from 1.15.2 to 1.15.3 in
/modules/redpanda
([#&open-telemetry#8203;1973](https://togithub.com/testcontainers/testcontainers-go/issues/1973))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump google.golang.org/api from 0.152.0 to 0.153.0,
cloud.google.com/go/bigtable from 1.20.0 to 1.21.0 and
cloud.google.com/go/spanner from 1.53.0 to 1.53.1 in /modules/gcloud
([#&open-telemetry#8203;1983](https://togithub.com/testcontainers/testcontainers-go/issues/1983))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump github.com/aws/aws-sdk-go and
github.com/aws/aws-sdk-go-v2 in /modules/localstack
([#&open-telemetry#8203;1981](https://togithub.com/testcontainers/testcontainers-go/issues/1981))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump mkdocs-include-markdown-plugin from 6.0.1 to 6.0.4
([#&open-telemetry#8203;1974](https://togithub.com/testcontainers/testcontainers-go/issues/1974))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/shirou/gopsutil/v3 from 3.23.10 to
3.23.11
([#&open-telemetry#8203;1943](https://togithub.com/testcontainers/testcontainers-go/issues/1943))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump golang.org/x/mod from 0.13.0 to 0.14.0 in
/modules/kafka
([#&open-telemetry#8203;1956](https://togithub.com/testcontainers/testcontainers-go/issues/1956))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump golang.org/x/sys from 0.13.0 to 0.15.0
([#&open-telemetry#8203;1944](https://togithub.com/testcontainers/testcontainers-go/issues/1944))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump golang.org/x/text and golang.org/x/mod from 0.13.0
to 0.14.0 in /modulegen
([#&open-telemetry#8203;1968](https://togithub.com/testcontainers/testcontainers-go/issues/1968))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump go.mongodb.org/mongo-driver from 1.12.1 to 1.13.0 in
/modules/mongodb
([#&open-telemetry#8203;1960](https://togithub.com/testcontainers/testcontainers-go/issues/1960))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/couchbase/gocb/v2 from 2.6.5 to 2.7.0 in
/modules/couchbase
([#&open-telemetry#8203;1952](https://togithub.com/testcontainers/testcontainers-go/issues/1952))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.10.1
to 8.11.1 and golang.org/x/mod from 0.13.0 to 0.14.0 in
/modules/elasticsearch
([#&open-telemetry#8203;1967](https://togithub.com/testcontainers/testcontainers-go/issues/1967))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump github.com/aws/aws-sdk-go and
github.com/aws/aws-sdk-go-v2 in /modules/localstack
([#&open-telemetry#8203;1953](https://togithub.com/testcontainers/testcontainers-go/issues/1953))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump actions/github-script from 6.4.1 to 7.0.1
([#&open-telemetry#8203;1949](https://togithub.com/testcontainers/testcontainers-go/issues/1949))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/IBM/sarama from 1.41.3 to 1.42.1 in
/modules/kafka
([#&open-telemetry#8203;1955](https://togithub.com/testcontainers/testcontainers-go/issues/1955))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/neo4j/neo4j-go-driver/v5 from 5.14.0 to
5.15.0 in /modules/neo4j
([#&open-telemetry#8203;1961](https://togithub.com/testcontainers/testcontainers-go/issues/1961))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/compose-spec/compose-go from 1.20.0 to
1.20.2 and github.com/docker/compose/v2 from 2.23.0 to 2.23.3 in
/modules/compose
([#&open-telemetry#8203;1966](https://togithub.com/testcontainers/testcontainers-go/issues/1966))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump google.golang.org/api from 0.143.0 to 0.152.0 and
cloud.google.com/go/spanner from 1.50.0 to 1.53.0 in /modules/gcloud
([#&open-telemetry#8203;1965](https://togithub.com/testcontainers/testcontainers-go/issues/1965))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump mkdocs-include-markdown-plugin from 6.0.1 to 6.0.4
([#&open-telemetry#8203;1934](https://togithub.com/testcontainers/testcontainers-go/issues/1934))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/twmb/franz-go from 1.15.1 to 1.15.2 in
/modules/redpanda
([#&open-telemetry#8203;1935](https://togithub.com/testcontainers/testcontainers-go/issues/1935))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump k8s.io from 0.28.3 to 0.28.4 in /modules/k3s
([#&open-telemetry#8203;1954](https://togithub.com/testcontainers/testcontainers-go/issues/1954))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump github.com/spf13/cobra from 1.7.0 to 1.8.0 in
/modulegen
([#&open-telemetry#8203;1958](https://togithub.com/testcontainers/testcontainers-go/issues/1958))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/twmb/franz-go and
github.com/twmb/franz-go/pkg/kadm in /modules/redpanda
([#&open-telemetry#8203;1896](https://togithub.com/testcontainers/testcontainers-go/issues/1896))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump github.com/nats-io/nkeys and
github.com/nats-io/nats.go in /modules/nats
([#&open-telemetry#8203;1897](https://togithub.com/testcontainers/testcontainers-go/issues/1897))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump google.golang.org/grpc and
cloud.google.com/go/firestore in /modules/gcloud
([#&open-telemetry#8203;1891](https://togithub.com/testcontainers/testcontainers-go/issues/1891))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump github.com/aws/aws-sdk-go and
github.com/aws/aws-sdk-go-v2/config in /modules/localstack
([#&open-telemetry#8203;1892](https://togithub.com/testcontainers/testcontainers-go/issues/1892))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump Github actions
([#&open-telemetry#8203;1890](https://togithub.com/testcontainers/testcontainers-go/issues/1890))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump github.com/shirou/gopsutil/v3 from 3.23.9 to 3.23.10
([#&open-telemetry#8203;1858](https://togithub.com/testcontainers/testcontainers-go/issues/1858))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/hashicorp/consul/api from 1.24.0 to
1.26.1 in /examples/consul
([#&open-telemetry#8203;1863](https://togithub.com/testcontainers/testcontainers-go/issues/1863))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/IBM/sarama from 1.41.2 to 1.41.3 in
/modules/kafka
([#&open-telemetry#8203;1874](https://togithub.com/testcontainers/testcontainers-go/issues/1874))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/couchbase/gocb/v2 from 2.6.4 to 2.6.5 in
/modules/couchbase
([#&open-telemetry#8203;1861](https://togithub.com/testcontainers/testcontainers-go/issues/1861))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/ClickHouse/clickhouse-go/v2 from 2.14.2
to 2.15.0 in /modules/clickhouse
([#&open-telemetry#8203;1867](https://togithub.com/testcontainers/testcontainers-go/issues/1867))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/neo4j/neo4j-go-driver/v5 from 5.13.0 to
5.14.0 in /modules/neo4j
([#&open-telemetry#8203;1869](https://togithub.com/testcontainers/testcontainers-go/issues/1869))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/Shopify/toxiproxy/v2 from 2.6.0 to 2.7.0
in /examples/toxiproxy
([#&open-telemetry#8203;1882](https://togithub.com/testcontainers/testcontainers-go/issues/1882))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.10.0
to 8.10.1 in /modules/elasticsearch
([#&open-telemetry#8203;1864](https://togithub.com/testcontainers/testcontainers-go/issues/1864))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump mkdocs-include-markdown-plugin from 6.0.1 to 6.0.3
([#&open-telemetry#8203;1860](https://togithub.com/testcontainers/testcontainers-go/issues/1860))
[@&open-telemetry#8203;dependabot](https://togithub.com/dependabot)
- chore(deps): bump k8s.io/client-go from 0.28.2 to 0.28.3 in
/modules/k3s
([#&open-telemetry#8203;1889](https://togithub.com/testcontainers/testcontainers-go/issues/1889))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump github.com/google/uuid from 1.3.1 to 1.4.0
([#&open-telemetry#8203;1888](https://togithub.com/testcontainers/testcontainers-go/issues/1888))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)
- chore(deps): bump github.com/docker/docker from 24.0.6+incompatible to
24.0.7+incompatible
([#&open-telemetry#8203;1886](https://togithub.com/testcontainers/testcontainers-go/issues/1886))
[@&open-telemetry#8203;mdelapenya](https://togithub.com/mdelapenya)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any
time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xMDMuMSIsInVwZGF0ZWRJblZlciI6IjM3LjEwMy4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Dan Jaglowski <[email protected]>
  • Loading branch information
renovate[bot] and djaglowski committed Jan 9, 2024
1 parent 8249950 commit e7bb7d7
Show file tree
Hide file tree
Showing 62 changed files with 91 additions and 634 deletions.
2 changes: 1 addition & 1 deletion cmd/configschema/go.sum

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

2 changes: 1 addition & 1 deletion cmd/otelcontribcol/go.sum

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

2 changes: 1 addition & 1 deletion cmd/oteltestbedcol/go.sum

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

2 changes: 1 addition & 1 deletion exporter/datadogexporter/go.sum

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

2 changes: 1 addition & 1 deletion exporter/splunkhecexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.91.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.91.0
github.com/stretchr/testify v1.8.4
github.com/testcontainers/testcontainers-go v0.26.0
github.com/testcontainers/testcontainers-go v0.27.0
go.opencensus.io v0.24.0
go.opentelemetry.io/collector/component v0.91.0
go.opentelemetry.io/collector/config/confighttp v0.91.0
Expand Down
4 changes: 2 additions & 2 deletions exporter/splunkhecexporter/go.sum

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

6 changes: 3 additions & 3 deletions extension/observer/dockerobserver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.91.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.91.0
github.com/stretchr/testify v1.8.4
github.com/testcontainers/testcontainers-go v0.26.0
github.com/testcontainers/testcontainers-go v0.27.0
go.opentelemetry.io/collector/component v0.91.0
go.opentelemetry.io/collector/confmap v0.91.0
go.opentelemetry.io/collector/extension v0.91.0
Expand Down Expand Up @@ -55,7 +55,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/shirou/gopsutil/v3 v3.23.10 // indirect
github.com/shirou/gopsutil/v3 v3.23.11 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
Expand All @@ -70,7 +70,7 @@ require (
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.15.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
Expand Down
13 changes: 6 additions & 7 deletions extension/observer/dockerobserver/go.sum

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

2 changes: 1 addition & 1 deletion go.sum

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

2 changes: 1 addition & 1 deletion internal/coreinternal/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.91.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.91.0
github.com/stretchr/testify v1.8.4
github.com/testcontainers/testcontainers-go v0.26.0
github.com/testcontainers/testcontainers-go v0.27.0
go.opentelemetry.io/collector v0.91.0
go.opentelemetry.io/collector/component v0.91.0
go.opentelemetry.io/collector/consumer v0.91.0
Expand Down
4 changes: 2 additions & 2 deletions internal/coreinternal/go.sum

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

35 changes: 0 additions & 35 deletions internal/coreinternal/scraperinttest/scraperint.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ func NewIntegrationTest(f receiver.Factory, opts ...TestOption) *IntegrationTest
}

type IntegrationTest struct {
networkRequest *testcontainers.NetworkRequest
containerRequests []testcontainers.ContainerRequest
allowHardcodedHostPort bool
createContainerTimeout time.Duration
Expand All @@ -65,14 +64,6 @@ type IntegrationTest struct {

func (it *IntegrationTest) Run(t *testing.T) {
it.validate(t)

if it.networkRequest != nil {
network := it.createNetwork(t)
defer func() {
require.NoError(t, network.Remove(context.Background()))
}()
}

ci := it.createContainers(t)
defer ci.terminate(t)

Expand Down Expand Up @@ -142,26 +133,6 @@ func (it *IntegrationTest) Run(t *testing.T) {
it.compareTimeout, it.compareTimeout/20)
}

func (it *IntegrationTest) createNetwork(t *testing.T) testcontainers.Network {
var errs error

var network testcontainers.Network
var err error
require.Eventuallyf(t, func() bool {
network, err = testcontainers.GenericNetwork(
context.Background(),
testcontainers.GenericNetworkRequest{
NetworkRequest: *it.networkRequest,
})
if err != nil {
errs = multierr.Append(errs, err)
return false
}
return true
}, it.createContainerTimeout, time.Second, "create network timeout: %v", errs)
return network
}

func (it *IntegrationTest) createContainers(t *testing.T) *ContainerInfo {
var wg sync.WaitGroup
ci := &ContainerInfo{
Expand Down Expand Up @@ -211,12 +182,6 @@ func (it *IntegrationTest) validate(t *testing.T) {

type TestOption func(*IntegrationTest)

func WithNetworkRequest(nr testcontainers.NetworkRequest) TestOption {
return func(it *IntegrationTest) {
it.networkRequest = &nr
}
}

func WithContainerRequest(cr testcontainers.ContainerRequest) TestOption {
return func(it *IntegrationTest) {
it.containerRequests = append(it.containerRequests, cr)
Expand Down
2 changes: 1 addition & 1 deletion receiver/aerospikereceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.91.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.91.0
github.com/stretchr/testify v1.8.4
github.com/testcontainers/testcontainers-go v0.26.0
github.com/testcontainers/testcontainers-go v0.27.0
go.opentelemetry.io/collector/component v0.91.0
go.opentelemetry.io/collector/config/configopaque v0.91.0
go.opentelemetry.io/collector/config/configtls v0.91.0
Expand Down
4 changes: 2 additions & 2 deletions receiver/aerospikereceiver/go.sum

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

2 changes: 1 addition & 1 deletion receiver/apachereceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.91.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.91.0
github.com/stretchr/testify v1.8.4
github.com/testcontainers/testcontainers-go v0.26.0
github.com/testcontainers/testcontainers-go v0.27.0
go.opentelemetry.io/collector/component v0.91.0
go.opentelemetry.io/collector/config/confighttp v0.91.0
go.opentelemetry.io/collector/config/configtls v0.91.0
Expand Down
4 changes: 2 additions & 2 deletions receiver/apachereceiver/go.sum

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

2 changes: 1 addition & 1 deletion receiver/apachesparkreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.91.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.91.0
github.com/stretchr/testify v1.8.4
github.com/testcontainers/testcontainers-go v0.26.0
github.com/testcontainers/testcontainers-go v0.27.0
go.opentelemetry.io/collector/component v0.91.0
go.opentelemetry.io/collector/config/confighttp v0.91.0
go.opentelemetry.io/collector/confmap v0.91.0
Expand Down
4 changes: 2 additions & 2 deletions receiver/apachesparkreceiver/go.sum

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

2 changes: 1 addition & 1 deletion receiver/bigipreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ require (
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/testcontainers/testcontainers-go v0.26.0 // indirect
github.com/testcontainers/testcontainers-go v0.27.0 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
Expand Down
4 changes: 2 additions & 2 deletions receiver/bigipreceiver/go.sum

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

Loading

0 comments on commit e7bb7d7

Please sign in to comment.