Skip to content

Commit

Permalink
Merge branch 'main' into fixing_synck8s
Browse files Browse the repository at this point in the history
  • Loading branch information
@gizas
gizas authored Jul 17, 2024
2 parents 66506a5 + c61a6b6 commit 04671d1
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 50 deletions.
40 changes: 20 additions & 20 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13079,11 +13079,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/exte

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/featuregate
Version: v1.11.0
Version: v1.12.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/featuregate@v1.11.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/featuregate@v1.12.0/LICENSE:


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

--------------------------------------------------------------------------------
Dependency : google.golang.org/grpc
Version: v1.64.0
Version: v1.65.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.64.0/LICENSE:
Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.65.0/LICENSE:


Apache License
Expand Down Expand Up @@ -34480,11 +34480,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele

--------------------------------------------------------------------------------
Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/common
Version: v0.104.0
Version: v0.105.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/common@v0.104.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/common@v0.105.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -35113,11 +35113,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele

--------------------------------------------------------------------------------
Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig
Version: v0.104.0
Version: v0.105.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig@v0.104.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig@v0.105.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -35535,11 +35535,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele

--------------------------------------------------------------------------------
Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet
Version: v0.104.0
Version: v0.105.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet@v0.104.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet@v0.105.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -36379,11 +36379,11 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele

--------------------------------------------------------------------------------
Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata
Version: v0.104.0
Version: v0.105.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata@v0.104.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata@v0.105.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -43275,11 +43275,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/conf

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/config/configopaque
Version: v1.11.0
Version: v1.12.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/config/configopaque@v1.11.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/config/configopaque@v1.12.0/LICENSE:


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

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/config/configtls
Version: v0.104.0
Version: v1.12.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/config/configtls@v0.104.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/config/configtls@v1.12.0/LICENSE:


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

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

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


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

--------------------------------------------------------------------------------
Dependency : google.golang.org/genproto/googleapis/api
Version: v0.0.0-20240520151616-dc85e6b867a5
Version: v0.0.0-20240528184218-531527333157
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/[email protected]20240520151616-dc85e6b867a5/LICENSE:
Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/[email protected]20240528184218-531527333157/LICENSE:


Apache License
Expand Down
20 changes: 10 additions & 10 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ require (
golang.org/x/time v0.5.0
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
golang.org/x/tools/go/vcs v0.1.0-deprecated
google.golang.org/grpc v1.64.0
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.34.2
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v2 v2.4.0
Expand Down Expand Up @@ -119,7 +119,7 @@ require (
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.104.0
go.opentelemetry.io/collector/extension v0.104.0
go.opentelemetry.io/collector/extension/memorylimiterextension v0.104.0
go.opentelemetry.io/collector/featuregate v1.11.0
go.opentelemetry.io/collector/featuregate v1.12.0
go.opentelemetry.io/collector/otelcol v0.104.0
go.opentelemetry.io/collector/processor v0.104.0
go.opentelemetry.io/collector/processor/batchprocessor v0.104.0
Expand Down Expand Up @@ -228,15 +228,15 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.105.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.105.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.105.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.105.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.104.0 // indirect
Expand Down Expand Up @@ -275,15 +275,15 @@ require (
go.opentelemetry.io/collector/config/configgrpc v0.104.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.104.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.104.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.11.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.12.0 // indirect
go.opentelemetry.io/collector/config/configretry v1.11.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
go.opentelemetry.io/collector/config/configtls v0.104.0 // indirect
go.opentelemetry.io/collector/config/configtls v1.12.0 // indirect
go.opentelemetry.io/collector/config/internal v0.104.0 // indirect
go.opentelemetry.io/collector/consumer v0.104.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect
go.opentelemetry.io/collector/filter v0.104.0 // indirect
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
go.opentelemetry.io/collector/pdata v1.12.0 // indirect
go.opentelemetry.io/collector/semconv v0.104.0 // indirect
go.opentelemetry.io/collector/service v0.104.0 // indirect
go.opentelemetry.io/contrib/config v0.7.0 // indirect
Expand Down Expand Up @@ -312,7 +312,7 @@ require (
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.20.0 // indirect
gonum.org/v1/gonum v0.15.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
Expand Down
Loading

0 comments on commit 04671d1

Please sign in to comment.