Skip to content

Commit

Permalink
Merge branch 'main' into update-release-note-urls
Browse files Browse the repository at this point in the history
  • Loading branch information
@bmorelli25
bmorelli25 authored Mar 19, 2024
2 parents d22f7a9 + 9b06eed commit 50064c5
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 35 deletions.
28 changes: 14 additions & 14 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2307,11 +2307,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/

--------------------------------------------------------------------------------
Dependency : github.com/go-sourcemap/sourcemap
Version: v2.1.3+incompatible
Version: v2.1.4+incompatible
Licence type (autodetected): BSD-2-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/go-sourcemap/[email protected].3+incompatible/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/go-sourcemap/[email protected].4+incompatible/LICENSE:

Copyright (c) 2016 The github.com/go-sourcemap/sourcemap Contributors.
All rights reserved.
Expand Down Expand Up @@ -4198,11 +4198,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmelasticsearch/v2
Version: v2.4.8
Version: v2.5.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.4.8/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.5.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -4409,11 +4409,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmgorilla/v2
Version: v2.4.8
Version: v2.5.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorilla/v2@v2.4.8/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorilla/v2@v2.5.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -4620,11 +4620,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorill

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmgrpc/v2
Version: v2.4.8
Version: v2.5.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/v2@v2.4.8/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/v2@v2.5.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -4831,11 +4831,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/v

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmhttp/v2
Version: v2.4.8
Version: v2.5.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.4.8/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.5.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -5042,11 +5042,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmotel/v2
Version: v2.4.8
Version: v2.5.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v2@v2.4.8/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v2@v2.5.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -5253,11 +5253,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/v2
Version: v2.4.8
Version: v2.5.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.4.8/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.5.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
14 changes: 7 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
github.com/elastic/go-elasticsearch/v8 v8.12.1
github.com/elastic/go-sysinfo v1.13.1
github.com/elastic/go-ucfg v0.8.8
github.com/go-sourcemap/sourcemap v2.1.3+incompatible
github.com/go-sourcemap/sourcemap v2.1.4+incompatible
github.com/gofrs/flock v0.8.1
github.com/gofrs/uuid v4.4.0+incompatible
github.com/gogo/protobuf v1.3.2
Expand All @@ -37,12 +37,12 @@ require (
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.8
go.elastic.co/apm/module/apmgorilla/v2 v2.4.8
go.elastic.co/apm/module/apmgrpc/v2 v2.4.8
go.elastic.co/apm/module/apmhttp/v2 v2.4.8
go.elastic.co/apm/module/apmotel/v2 v2.4.8
go.elastic.co/apm/v2 v2.4.8
go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0
go.elastic.co/apm/module/apmgorilla/v2 v2.5.0
go.elastic.co/apm/module/apmgrpc/v2 v2.5.0
go.elastic.co/apm/module/apmhttp/v2 v2.5.0
go.elastic.co/apm/module/apmotel/v2 v2.5.0
go.elastic.co/apm/v2 v2.5.0
go.elastic.co/fastjson v1.3.0
go.opentelemetry.io/collector/consumer v0.96.0
go.opentelemetry.io/collector/pdata v1.3.0
Expand Down
28 changes: 14 additions & 14 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZ
github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q=
github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
Expand Down Expand Up @@ -543,20 +543,20 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.8 h1:4j3wI1e+WV6u+9ZR7lorkJI2rnJfjOWtkMeZG08PbRI=
go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.8/go.mod h1:C9ajbSjZ3akTrFOjBr+pMq8bPVOH9vhIG+knZAuPW3s=
go.elastic.co/apm/module/apmgorilla/v2 v2.4.8 h1:Yulr18ASd4fK3nzQsCxGgFSE4bbS8nouQlS1/ZgmDRs=
go.elastic.co/apm/module/apmgorilla/v2 v2.4.8/go.mod h1:Ot65wffFOTJlXL6ugbCM7d81sxYVof1SiMj8kpNTYgk=
go.elastic.co/apm/module/apmgrpc/v2 v2.4.8 h1:V9WodJVrBsSP0zJ1NHuU3cyo0X8PSEOiFd6ZMNnUZBw=
go.elastic.co/apm/module/apmgrpc/v2 v2.4.8/go.mod h1:jw743gRa7FGsp7LITqx+lfj5qrEVc/m+4QbT9sOTx40=
go.elastic.co/apm/module/apmhttp/v2 v2.4.8 h1:C1piLq4wcFHFB7jpFW1WPEyEl6zbRpf9SAY8S8tX7Qk=
go.elastic.co/apm/module/apmhttp/v2 v2.4.8/go.mod h1:FzO5ptAs5oKB3xE1/hpxMA0a7mLIycp2RZdBtp4+uTA=
go.elastic.co/apm/module/apmotel/v2 v2.4.8 h1:XprKEoUFjcDFwWrmS56Go7D7Ndxa8uy+DVA4k1tItnY=
go.elastic.co/apm/module/apmotel/v2 v2.4.8/go.mod h1:NA3k4fTqsQhhZBlMOGJy8ol20tJKLafEDWAr5ELNpTg=
go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0 h1:0S5Vj5/L4EkXQS7YUr+1ylTuB3njTuBNzdmn3mjXAFI=
go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0/go.mod h1:zNEXwAPoThH/bAb3TWKD5Og0Zyk0OWURsEHAja1kra4=
go.elastic.co/apm/module/apmgorilla/v2 v2.5.0 h1:XeKkwqXWBEoU68AYPvFaOJYcs+c56S9sLV2wtRdwf3g=
go.elastic.co/apm/module/apmgorilla/v2 v2.5.0/go.mod h1:EORWcVUh8p3Z2d2GdoHMQs07fhkXRqV3lInehgMMnao=
go.elastic.co/apm/module/apmgrpc/v2 v2.5.0 h1:4wpg5I4KztfSFWw4pSU+EhpSeTdoZD3CPwfRmy62JKY=
go.elastic.co/apm/module/apmgrpc/v2 v2.5.0/go.mod h1:urZQQAB9p6J0uXmtK6YZE6nfmiY7JsxFbJXck495/Ls=
go.elastic.co/apm/module/apmhttp/v2 v2.5.0 h1:4AWlw8giL7hRYBQiwF1/Thm0GDsbQH/Ofe4eySAnURo=
go.elastic.co/apm/module/apmhttp/v2 v2.5.0/go.mod h1:ZP7gLEzY/OAPTqNZjp8AzA06HF82zfwXEpKI2sSVTgk=
go.elastic.co/apm/module/apmotel/v2 v2.5.0 h1:/U83qrMC7dEtByhrCNXqjLkwJ+krsp6bkLQEURJwYsI=
go.elastic.co/apm/module/apmotel/v2 v2.5.0/go.mod h1:v0m8Jq9VX5s9zasL35MGTVLMreT8BFOzEq+mTtHuF1I=
go.elastic.co/apm/module/apmzap/v2 v2.4.8 h1:bU1ESD6Pm2cx1Nmlos0YRQQrdQoFynbYP3imTfIxee4=
go.elastic.co/apm/module/apmzap/v2 v2.4.8/go.mod h1:+pWYgTIT9utt48DVOiBesXQZ3rOVERsE1cS+q0wUafo=
go.elastic.co/apm/v2 v2.4.8 h1:3RuqxDjhgumT1BYxJGnVPdGY12lCzF+KGyvtSTynCYo=
go.elastic.co/apm/v2 v2.4.8/go.mod h1:+CiBUdrrAGnGCL9TNx7tQz3BrfYV23L8Ljvotoc87so=
go.elastic.co/apm/v2 v2.5.0 h1:UYqdu/bjcubcP9BIy5+os2ExRzw03yOQFG+sRGGhVlQ=
go.elastic.co/apm/v2 v2.5.0/go.mod h1:+CiBUdrrAGnGCL9TNx7tQz3BrfYV23L8Ljvotoc87so=
go.elastic.co/ecszap v1.0.2 h1:iW5OGx8IiokiUzx/shD4AJCPFMC9uUtr7ycaiEIU++I=
go.elastic.co/ecszap v1.0.2/go.mod h1:dJkSlK3BTiwG/qXhCwe50Mz/jwu854vSip8sIeQhNZg=
go.elastic.co/fastjson v1.3.0 h1:hJO3OsYIhiqiT4Fgu0ZxAECnKASbwgiS+LMW5oCopKs=
Expand Down

0 comments on commit 50064c5

Please sign in to comment.