Skip to content

Commit 1875a5a

Browse files
bogdandrutubogdandrutu
committed
Move sharedcomponent to its own package
The goal is to remove from coreinternal everything that depends on the core (and not only on model), to ensure that packages like the translators do not depend on anything more than just model. Signed-off-by: Bogdan Drutu <[email protected]>
1 parent f166fb9 commit 1875a5a

File tree

16 files changed

+855
-16
lines changed

16 files changed

+855
-16
lines changed

‎cmd/configschema/go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/commo
387387

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

390+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent => ../../internal/sharedcomponent
391+
390392
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => ../../internal/splunk
391393

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

‎exporter/fileexporter/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"go.opentelemetry.io/collector/config"
2222
"go.opentelemetry.io/collector/exporter/exporterhelper"
2323

24-
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/sharedcomponent"
24+
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent"
2525
)
2626

2727
const (

‎exporter/fileexporter/go.mod

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ go 1.17
44

55
require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.37.1
7+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.37.1
78
github.com/stretchr/testify v1.7.0
89
go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058
910
go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058
@@ -40,3 +41,5 @@ require (
4041
)
4142

4243
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
44+
45+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent => ../../internal/sharedcomponent

‎exporter/opencensusexporter/go.mod

+3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ require (
2626
github.com/mitchellh/copystructure v1.2.0 // indirect
2727
github.com/mitchellh/mapstructure v1.4.2 // indirect
2828
github.com/mitchellh/reflectwalk v1.0.2 // indirect
29+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.37.1 // indirect
2930
github.com/pmezard/go-difflib v1.0.0 // indirect
3031
github.com/rs/cors v1.8.0 // indirect
3132
github.com/soheilhy/cmux v0.1.5 // indirect
@@ -49,6 +50,8 @@ require (
4950

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

53+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent => ../../internal/sharedcomponent
54+
5255
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus
5356

5457
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver => ../../receiver/opencensusreceiver

‎go.mod

+3
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ require (
265265
github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.37.1 // indirect
266266
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.37.1 // indirect
267267
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.37.1 // indirect
268+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.37.1 // indirect
268269
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.37.1 // indirect
269270
github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.37.1 // indirect
270271
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.37.1 // indirect
@@ -393,6 +394,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/commo
393394

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

397+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent => ./internal/sharedcomponent
398+
396399
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => ./internal/splunk
397400

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

‎internal/coreinternal/go.mod

-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ require (
2626
github.com/pkg/errors v0.9.1 // indirect
2727
github.com/pmezard/go-difflib v1.0.0 // indirect
2828
github.com/rogpeppe/go-internal v1.6.1 // indirect
29-
go.opentelemetry.io/otel v1.0.1 // indirect
30-
go.opentelemetry.io/otel/metric v0.24.0 // indirect
31-
go.opentelemetry.io/otel/trace v1.0.1 // indirect
3229
go.uber.org/atomic v1.9.0 // indirect
3330
go.uber.org/multierr v1.7.0 // indirect
3431
go.uber.org/zap v1.19.1 // indirect

‎internal/coreinternal/go.sum

-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/sharedcomponent/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include ../../Makefile.Common

‎internal/sharedcomponent/go.mod

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
module github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent
2+
3+
go 1.17
4+
5+
require (
6+
github.com/stretchr/testify v1.7.0
7+
go.opentelemetry.io/collector v0.37.1-0.20211015233822-bd87fb628058
8+
)
9+
10+
require (
11+
github.com/davecgh/go-spew v1.1.1 // indirect
12+
github.com/fsnotify/fsnotify v1.4.9 // indirect
13+
github.com/gogo/protobuf v1.3.2 // indirect
14+
github.com/golang/protobuf v1.5.2 // indirect
15+
github.com/knadh/koanf v1.2.4 // indirect
16+
github.com/mitchellh/copystructure v1.2.0 // indirect
17+
github.com/mitchellh/mapstructure v1.4.2 // indirect
18+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
19+
github.com/pelletier/go-toml v1.9.3 // indirect
20+
github.com/pkg/errors v0.9.1 // indirect
21+
github.com/pmezard/go-difflib v1.0.0 // indirect
22+
github.com/rogpeppe/go-internal v1.6.1 // indirect
23+
github.com/spf13/cast v1.4.1 // indirect
24+
go.opentelemetry.io/collector/model v0.37.1-0.20211015233822-bd87fb628058 // indirect
25+
go.opentelemetry.io/otel v1.0.1 // indirect
26+
go.opentelemetry.io/otel/metric v0.24.0 // indirect
27+
go.opentelemetry.io/otel/trace v1.0.1 // indirect
28+
go.uber.org/atomic v1.9.0 // indirect
29+
go.uber.org/multierr v1.7.0 // indirect
30+
go.uber.org/zap v1.19.1 // indirect
31+
golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
32+
golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71 // indirect
33+
golang.org/x/text v0.3.6 // indirect
34+
google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08 // indirect
35+
google.golang.org/grpc v1.41.0 // indirect
36+
google.golang.org/protobuf v1.27.1 // indirect
37+
gopkg.in/yaml.v2 v2.4.0 // indirect
38+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
39+
)

0 commit comments

Comments
 (0)