Skip to content

Commit

Permalink
Merge branch 'main' into renovate/github.com-tencentcloud-tencentclou…
Browse files Browse the repository at this point in the history 
…d-sdk-go-tencentcloud-common-1.x
  • Loading branch information
@codeboten
codeboten authored Sep 24, 2024
2 parents 50a17e5 + 37cfec6 commit 9343938
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion cmd/otelcontribcol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ require (
github.com/apache/arrow/go/v16 v16.1.0 // indirect
github.com/apache/arrow/go/v17 v17.0.0 // indirect
github.com/apache/pulsar-client-go v0.13.1 // indirect
github.com/apache/thrift v0.20.0 // indirect
github.com/apache/thrift v0.21.0 // indirect
github.com/ardielle/ardielle-go v1.5.2 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/armon/go-radix v1.0.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions cmd/otelcontribcol/go.sum
View file

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.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/alecthomas/participle/v2 v2.1.1 // indirect
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
github.com/apache/thrift v0.20.0 // indirect
github.com/apache/thrift v0.21.0 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/aws/aws-sdk-go v1.54.19 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions cmd/oteltestbedcol/go.sum
View file

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

2 changes: 1 addition & 1 deletion exporter/elasticsearchexporter/integrationtest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (

require (
github.com/alecthomas/participle/v2 v2.1.1 // indirect
github.com/apache/thrift v0.20.0 // indirect
github.com/apache/thrift v0.21.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/elasticsearchexporter/integrationtest/go.sum
View file

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

2 changes: 1 addition & 1 deletion extension/opampextension/opamp_agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"go.opentelemetry.io/collector/component/componentstatus"
"go.opentelemetry.io/collector/confmap"
"go.opentelemetry.io/collector/extension"
semconv "go.opentelemetry.io/collector/semconv/v1.18.0"
semconv "go.opentelemetry.io/collector/semconv/v1.27.0"
"go.uber.org/zap"
"golang.org/x/exp/maps"
"gopkg.in/yaml.v3"
Expand Down
2 changes: 1 addition & 1 deletion extension/opampextension/opamp_agent_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.opentelemetry.io/collector/extension/extensiontest"
semconv "go.opentelemetry.io/collector/semconv/v1.18.0"
semconv "go.opentelemetry.io/collector/semconv/v1.27.0"
)

func TestNewOpampAgent(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion receiver/jaegerreceiver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaeger
go 1.22.0

require (
github.com/apache/thrift v0.20.0
github.com/apache/thrift v0.21.0
github.com/gorilla/mux v1.8.1
github.com/jaegertracing/jaeger v1.60.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.110.0
Expand Down
4 changes: 2 additions & 2 deletions receiver/jaegerreceiver/go.sum
View file

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

2 changes: 1 addition & 1 deletion receiver/kafkareceiver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.0

require (
github.com/IBM/sarama v1.43.3
github.com/apache/thrift v0.20.0
github.com/apache/thrift v0.21.0
github.com/gogo/protobuf v1.3.2
github.com/jaegertracing/jaeger v1.60.0
github.com/json-iterator/go v1.1.12
Expand Down
4 changes: 2 additions & 2 deletions receiver/kafkareceiver/go.sum
View file

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

2 changes: 1 addition & 1 deletion receiver/pulsarreceiver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.0

require (
github.com/apache/pulsar-client-go v0.13.1
github.com/apache/thrift v0.20.0
github.com/apache/thrift v0.21.0
github.com/gogo/protobuf v1.3.2
github.com/jaegertracing/jaeger v1.60.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.110.0
Expand Down
4 changes: 2 additions & 2 deletions receiver/pulsarreceiver/go.sum
View file

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

2 changes: 1 addition & 1 deletion testbed/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/alecthomas/participle/v2 v2.1.1 // indirect
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
github.com/apache/thrift v0.20.0 // indirect
github.com/apache/thrift v0.21.0 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/aws/aws-sdk-go v1.54.19 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions testbed/go.sum
View file

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

0 comments on commit 9343938

Please sign in to comment.