Skip to content

Commit

Permalink
rebase upstream
Browse files Browse the repository at this point in the history
Signed-off-by: Jared Tan <jian.tan@daocloud.io>

Signed-off-by: Jared Tan <jian.tan@daocloud.io>
  • Loading branch information
JaredTan95 committed Dec 27, 2024
1 parent aaaa9ea commit 9cad4c3
Show file tree
Hide file tree
Showing 2 changed files with 180 additions and 11 deletions.
20 changes: 15 additions & 5 deletions extension/encoding/skywalkingencodingextension/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,33 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/encod
go 1.22.0

require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.109.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/skywalking v0.116.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v0.116.1-0.20241220212031-7c2639723f67
go.opentelemetry.io/collector/component/componenttest v0.116.0
go.opentelemetry.io/collector/extension v0.116.1-0.20241220212031-7c2639723f67
go.opentelemetry.io/collector/extension/extensiontest v0.116.0
go.opentelemetry.io/collector/pdata v1.22.1-0.20241220212031-7c2639723f67
google.golang.org/protobuf v1.36.0
skywalking.apache.org/repo/goapi v0.0.0-20241129131257-944118bb91b8
)

require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20241220212031-7c2639723f67 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20241220212031-7c2639723f67 // indirect
go.opentelemetry.io/collector/semconv v0.116.0 // indirect
go.opentelemetry.io/otel v1.32.0 // indirect
go.opentelemetry.io/otel/metric v1.32.0 // indirect
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
go.opentelemetry.io/otel/trace v1.32.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
Expand All @@ -26,11 +38,9 @@ require (
golang.org/x/text v0.21.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
google.golang.org/grpc v1.69.0 // indirect
google.golang.org/protobuf v1.36.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../../internal/coreinternal

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding => ../

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding => ../
Loading

0 comments on commit 9cad4c3

Please sign in to comment.