Skip to content

Commit

Permalink
feat: bump mock-es dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
@kruskall
kruskall committed Nov 1, 2024
1 parent d39b248 commit 35fe4da
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 48 deletions.
82 changes: 41 additions & 41 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2766,11 +2766,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/

--------------------------------------------------------------------------------
Dependency : github.com/elastic/mock-es
Version: v0.0.0-20240712014503-e5b47ece0015
Version: v0.0.0-20241101195702-0a41fa3d30d9
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]20240712014503-e5b47ece0015/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]20241101195702-0a41fa3d30d9/LICENSE:

Copyright 2024 Elasticsearch B.V.

Expand Down Expand Up @@ -9262,45 +9262,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.


--------------------------------------------------------------------------------
Dependency : github.com/rcrowley/go-metrics
Version: v0.0.0-20201227073835-cf1acfcdf475
Licence type (autodetected): BSD-2-Clause-FreeBSD
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/rcrowley/[email protected]/LICENSE:

Copyright 2012 Richard Crowley. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.

THIS SOFTWARE IS PROVIDED BY RICHARD CROWLEY ``AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL RICHARD CROWLEY OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.

The views and conclusions contained in the software and documentation
are those of the authors and should not be interpreted as representing
official policies, either expressed or implied, of Richard Crowley.


--------------------------------------------------------------------------------
Dependency : github.com/rednafi/link-patrol
Version: v0.0.0-20240826150821-057643e74d4d
Expand Down Expand Up @@ -73971,6 +73932,45 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/prometheus@v
limitations under the License.


--------------------------------------------------------------------------------
Dependency : github.com/rcrowley/go-metrics
Version: v0.0.0-20201227073835-cf1acfcdf475
Licence type (autodetected): BSD-2-Clause-FreeBSD
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/rcrowley/[email protected]/LICENSE:

Copyright 2012 Richard Crowley. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.

THIS SOFTWARE IS PROVIDED BY RICHARD CROWLEY ``AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL RICHARD CROWLEY OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.

The views and conclusions contained in the software and documentation
are those of the authors and should not be interpreted as representing
official policies, either expressed or implied, of Richard Crowley.


--------------------------------------------------------------------------------
Dependency : github.com/rivo/uniseg
Version: v0.4.4
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/elastic/go-licenser v0.4.2
github.com/elastic/go-sysinfo v1.15.0
github.com/elastic/go-ucfg v0.8.8
github.com/elastic/mock-es v0.0.0-20240712014503-e5b47ece0015
github.com/elastic/mock-es v0.0.0-20241101195702-0a41fa3d30d9
github.com/elastic/opentelemetry-collector-components/connector/signaltometricsconnector v0.3.0
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.13.0
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.3.0
Expand All @@ -48,7 +48,6 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.112.0
github.com/otiai10/copy v1.14.0
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
github.com/rednafi/link-patrol v0.0.0-20240826150821-057643e74d4d
github.com/rs/zerolog v1.27.0
github.com/sajari/regression v1.0.1
Expand Down Expand Up @@ -454,6 +453,7 @@ require (
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/prometheus/prometheus v0.54.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
github.com/rs/cors v1.11.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,8 +478,8 @@ github.com/elastic/lunes v0.1.0 h1:amRtLPjwkWtzDF/RKzcEPMvSsSseLDLW+bnhfNSLRe4=
github.com/elastic/lunes v0.1.0/go.mod h1:xGphYIt3XdZRtyWosHQTErsQTd4OP1p9wsbVoHelrd4=
github.com/elastic/mito v1.15.0 h1:MicOxLSVkgU2Aonbh3i+++66Wl5wvD8y9gALK8PQDYs=
github.com/elastic/mito v1.15.0/go.mod h1:J+wCf4HccW2YoSFmZMGu+d06gN+WmnIlj5ehBqine74=
github.com/elastic/mock-es v0.0.0-20240712014503-e5b47ece0015 h1:z8cC8GASpPo8yKlbnXI36HQ/BM9wYjhBPNbDjAWm0VU=
github.com/elastic/mock-es v0.0.0-20240712014503-e5b47ece0015/go.mod h1:qH9DX/Dmflz6EAtaks/+2SsdQzecVAKE174Zl66hk7E=
github.com/elastic/mock-es v0.0.0-20241101195702-0a41fa3d30d9 h1:wXto1Zck/WqoXIoxEI8+nqoSSohPGp5dWV5zLskldYU=
github.com/elastic/mock-es v0.0.0-20241101195702-0a41fa3d30d9/go.mod h1:cXqWcLnmu5y4QveTb2hjk7rgzkHMuZsqeXtbJpNAcu0=
github.com/elastic/opentelemetry-collector-components/connector/signaltometricsconnector v0.3.0 h1:5bEQRB73ZYYdZ1cRntygO8uAPajWLZCs1FOqWfq8JYg=
github.com/elastic/opentelemetry-collector-components/connector/signaltometricsconnector v0.3.0/go.mod h1:6HKwtIQ7G+Vjotgnh18dpaD0YqSi87Zbsu21w5dxxXE=
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.13.0 h1:Y8DWrxdpNMscYXTN3EoK509vqf+0aD1RfNZF5wOtsQs=
Expand Down
4 changes: 1 addition & 3 deletions testing/integration/logs_ingestion_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import (
"github.com/elastic/elastic-agent/testing/installtest"
"github.com/elastic/elastic-transport-go/v8/elastictransport"

"github.com/rcrowley/go-metrics"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand Down Expand Up @@ -121,15 +120,14 @@ func TestLogIngestionFleetManaged(t *testing.T) {
}

func startMockES(t *testing.T) string {
registry := metrics.NewRegistry()
uid := uuid.Must(uuid.NewV4())
clusterUUID := uuid.Must(uuid.NewV4()).String()

mux := http.NewServeMux()
mux.Handle("/", mockes.NewAPIHandler(
uid,
clusterUUID,
registry,
nil,
time.Now().Add(time.Hour), 0, 0, 0, 100, 0))

s := httptest.NewServer(mux)
Expand Down

0 comments on commit 35fe4da

Please sign in to comment.