Skip to content

Commit 9cad4c3

Browse files
committed
rebase upstream
Signed-off-by: Jared Tan <[email protected]> Signed-off-by: Jared Tan <[email protected]>
1 parent aaaa9ea commit 9cad4c3

File tree

2 files changed

+180
-11
lines changed

2 files changed

+180
-11
lines changed

extension/encoding/skywalkingencodingextension/go.mod

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,33 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/encod
33
go 1.22.0
44

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

1217
require (
18+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
19+
github.com/go-logr/logr v1.4.2 // indirect
20+
github.com/go-logr/stdr v1.2.2 // indirect
1321
github.com/gogo/protobuf v1.3.2 // indirect
22+
github.com/google/uuid v1.6.0 // indirect
1423
github.com/json-iterator/go v1.1.12 // indirect
1524
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
1625
github.com/modern-go/reflect2 v1.0.2 // indirect
26+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
1727
go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20241220212031-7c2639723f67 // indirect
18-
go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20241220212031-7c2639723f67 // indirect
28+
go.opentelemetry.io/collector/semconv v0.116.0 // indirect
1929
go.opentelemetry.io/otel v1.32.0 // indirect
2030
go.opentelemetry.io/otel/metric v1.32.0 // indirect
31+
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
32+
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
2133
go.opentelemetry.io/otel/trace v1.32.0 // indirect
2234
go.uber.org/multierr v1.11.0 // indirect
2335
go.uber.org/zap v1.27.0 // indirect
@@ -26,11 +38,9 @@ require (
2638
golang.org/x/text v0.21.0 // indirect
2739
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
2840
google.golang.org/grpc v1.69.0 // indirect
29-
google.golang.org/protobuf v1.36.0 // indirect
41+
gopkg.in/yaml.v3 v3.0.1 // indirect
3042
)
3143

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

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

0 commit comments

Comments
 (0)