Skip to content
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

build(deps): bump the otel group across 1 directory with 4 updates #14681

Merged
merged 6 commits into from
Nov 26, 2024
Merged

build(deps): bump the otel group across 1 directory with 4 updates #14681

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56f8b01
build(deps): bump the otel group across 1 directory with 4 updates
dependabot[bot] Nov 26, 2024
a153053
Update NOTICE.txt
github-actions[bot] Nov 26, 2024
66cea62
fix: update ristretto replace directive
kruskall Nov 26, 2024
83f7d16
fix: resolve compile error
kruskall Nov 26, 2024
36c6df9
Update NOTICE.txt
github-actions[bot] Nov 26, 2024
2a5e08a
Merge branch 'main' into dependabot/go_modules/otel-881476ebc5
kruskall Nov 26, 2024
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
44 changes: 22 additions & 22 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2866,11 +2866,11 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice

--------------------------------------------------------------------------------
Dependency : github.com/jaegertracing/jaeger
Version: v1.62.0
Version: v1.63.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/jaegertracing/jaeger@v1.62.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/jaegertracing/jaeger@v1.63.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -3341,11 +3341,11 @@ Contents of probable licence file $GOMODCACHE/github.com/modern-go/[email protected]

--------------------------------------------------------------------------------
Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger
Version: v0.111.0
Version: v0.112.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.111.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.112.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -5166,11 +5166,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/consumer
Version: v0.111.0
Version: v0.112.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.111.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.112.0/LICENSE:


Apache License
Expand Down Expand Up @@ -5378,11 +5378,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/pdata
Version: v1.17.0
Version: v1.18.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.17.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.18.0/LICENSE:


Apache License
Expand Down Expand Up @@ -8395,11 +8395,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/dgraph-io/ristretto
Version: v0.2.0
Version: v1.0.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/dgraph-io/ristretto@v0.2.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/dgraph-io/ristretto@v1.0.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -13590,11 +13590,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal
Version: v0.111.0
Version: v0.112.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.111.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.112.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -13916,11 +13916,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : github.com/prometheus/client_golang
Version: v1.20.4
Version: v1.20.5
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

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

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -14338,11 +14338,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model

--------------------------------------------------------------------------------
Dependency : github.com/prometheus/common
Version: v0.60.0
Version: v0.60.1
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

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

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -14799,11 +14799,11 @@ official policies, either expressed or implied, of Richard Crowley.

--------------------------------------------------------------------------------
Dependency : github.com/rogpeppe/go-internal
Version: v1.12.0
Version: v1.13.1
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/rogpeppe/go-internal@v1.12.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/rogpeppe/go-internal@v1.13.1/LICENSE:

Copyright (c) 2018 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -16164,11 +16164,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/[email protected]/LICENS

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/semconv
Version: v0.111.0
Version: v0.112.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.111.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.112.0/LICENSE:


Apache License
Expand Down Expand Up @@ -16975,11 +16975,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : google.golang.org/genproto/googleapis/rpc
Version: v0.0.0-20240903143218-8af14fe29dc1
Version: v0.0.0-20241007155032-5fefd90f89a9
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/[email protected]20240903143218-8af14fe29dc1/LICENSE:
Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/[email protected]20241007155032-5fefd90f89a9/LICENSE:


Apache License
Expand Down
24 changes: 12 additions & 12 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ require (
github.com/google/go-cmp v0.6.0
github.com/gorilla/mux v1.8.1
github.com/hashicorp/golang-lru v1.0.2
github.com/jaegertracing/jaeger v1.62.0
github.com/jaegertracing/jaeger v1.63.0
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901
github.com/libp2p/go-reuseport v0.4.0
github.com/modern-go/reflect2 v1.0.2
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.111.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.112.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/ryanuber/go-glob v1.0.0
Expand All @@ -42,8 +42,8 @@ require (
go.elastic.co/apm/module/apmotel/v2 v2.6.2
go.elastic.co/apm/v2 v2.6.2
go.elastic.co/fastjson v1.4.0
go.opentelemetry.io/collector/consumer v0.111.0
go.opentelemetry.io/collector/pdata v1.17.0
go.opentelemetry.io/collector/consumer v0.112.0
go.opentelemetry.io/collector/pdata v1.18.0
go.opentelemetry.io/otel v1.32.0
go.opentelemetry.io/otel/metric v1.32.0
go.opentelemetry.io/otel/sdk/metric v1.32.0
Expand Down Expand Up @@ -75,7 +75,7 @@ require (
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgraph-io/ristretto v0.1.2-0.20240116140435-c67e07994f91 // indirect
github.com/dgraph-io/ristretto v1.0.0 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
github.com/dlclark/regexp2 v1.8.1 // indirect
Expand Down Expand Up @@ -122,18 +122,18 @@ require (
github.com/mitchellh/hashstructure v1.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.112.0 // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pierrec/lz4/v4 v4.1.21 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/prometheus/client_golang v1.20.4 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.60.0 // indirect
github.com/prometheus/common v0.60.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
github.com/shirou/gopsutil/v4 v4.24.9 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
Expand All @@ -144,15 +144,15 @@ require (
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.elastic.co/apm/module/apmzap/v2 v2.6.2 // indirect
go.elastic.co/ecszap v1.0.2 // indirect
go.opentelemetry.io/collector/semconv v0.111.0 // indirect
go.opentelemetry.io/collector/semconv v0.112.0 // indirect
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
go.opentelemetry.io/otel/trace v1.32.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.29.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect
gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect
gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect
Expand All @@ -173,4 +173,4 @@ replace (
github.com/golang/glog => ./internal/glog
)

replace github.com/dgraph-io/ristretto v0.1.2-0.20240116140435-c67e07994f91 => github.com/dgraph-io/ristretto v0.2.0
replace github.com/dgraph-io/ristretto v1.0.0 => github.com/dgraph-io/ristretto v0.2.0
Loading
Loading