Skip to content

Commit

Permalink
[consumer] split consumer into its own module (open-telemetry#6557)
Browse files Browse the repository at this point in the history
This is part of open-telemetry#6186

Co-authored-by: Pablo Baeyens <[email protected]>
  • Loading branch information
Alex Boten and mx-psi authored Nov 16, 2022
1 parent 8dd8a57 commit 2454cfb
Show file tree
Hide file tree
Showing 18 changed files with 270 additions and 0 deletions.
18 changes: 18 additions & 0 deletions .chloggen/split-consumer.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: consumer

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Split consumer into its own package

# One or more tracking issues or pull requests related to the change
issues: [6186]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |-
The import path for the consumer module can now be accessed directly:
- `go.opentelemetry.io/collector/consumer
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ updates:
directory: "/component"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/consumer"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/loggingexporter"
schedule:
Expand Down
1 change: 1 addition & 0 deletions cmd/otelcorecol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ processors:
replaces:
- go.opentelemetry.io/collector => ../../
- go.opentelemetry.io/collector/component => ../../component
- go.opentelemetry.io/collector/consumer => ../../consumer
- go.opentelemetry.io/collector/exporter/loggingexporter => ../../exporter/loggingexporter
- go.opentelemetry.io/collector/exporter/otlpexporter => ../../exporter/otlpexporter
- go.opentelemetry.io/collector/exporter/otlphttpexporter => ../../exporter/otlphttpexporter
Expand Down
3 changes: 3 additions & 0 deletions cmd/otelcorecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ require (
github.com/tklauser/numcpus v0.4.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/consumer v0.0.0-00010101000000-000000000000 // indirect
go.opentelemetry.io/collector/pdata v0.64.1 // indirect
go.opentelemetry.io/collector/semconv v0.64.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect
Expand Down Expand Up @@ -91,6 +92,8 @@ replace go.opentelemetry.io/collector => ../../

replace go.opentelemetry.io/collector/component => ../../component

replace go.opentelemetry.io/collector/consumer => ../../consumer

replace go.opentelemetry.io/collector/exporter/loggingexporter => ../../exporter/loggingexporter

replace go.opentelemetry.io/collector/exporter/otlpexporter => ../../exporter/otlpexporter
Expand Down
3 changes: 3 additions & 0 deletions component/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ go 1.18
require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/consumer v0.0.0-00010101000000-000000000000
go.opentelemetry.io/collector/pdata v0.64.1
go.opentelemetry.io/otel/metric v0.33.0
go.opentelemetry.io/otel/trace v1.11.1
Expand Down Expand Up @@ -37,6 +38,8 @@ require (

replace go.opentelemetry.io/collector => ../

replace go.opentelemetry.io/collector/consumer => ../consumer

replace go.opentelemetry.io/collector/pdata => ../pdata

replace go.opentelemetry.io/collector/semconv => ../semconv
Expand Down
1 change: 1 addition & 0 deletions consumer/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../Makefile.Common
38 changes: 38 additions & 0 deletions consumer/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
module go.opentelemetry.io/collector/consumer

go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/pdata v0.64.1
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // 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.0 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/sys v0.2.0 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace go.opentelemetry.io/collector => ../

replace go.opentelemetry.io/collector/pdata => ../pdata

replace go.opentelemetry.io/collector/semconv => ../semconv

replace go.opentelemetry.io/collector/processor/batchprocessor => ../processor/batchprocessor

replace go.opentelemetry.io/collector/extension/zpagesextension => ../extension/zpagesextension

replace go.opentelemetry.io/collector/component => ../component
174 changes: 174 additions & 0 deletions consumer/go.sum

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions exporter/loggingexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/component v0.0.0-20221115212826-19db2f15c85c
go.opentelemetry.io/collector/consumer v0.0.0-00010101000000-000000000000
go.opentelemetry.io/collector/pdata v0.64.1
go.uber.org/zap v1.23.0
golang.org/x/sys v0.2.0
Expand Down Expand Up @@ -43,6 +44,8 @@ replace go.opentelemetry.io/collector => ../../

replace go.opentelemetry.io/collector/component => ../../component

replace go.opentelemetry.io/collector/consumer => ../../consumer

replace go.opentelemetry.io/collector/pdata => ../../pdata

replace go.opentelemetry.io/collector/semconv => ../../semconv
Expand Down
3 changes: 3 additions & 0 deletions exporter/otlpexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/component v0.0.0-20221115212826-19db2f15c85c
go.opentelemetry.io/collector/consumer v0.0.0-00010101000000-000000000000
go.opentelemetry.io/collector/pdata v0.64.1
go.uber.org/atomic v1.10.0
google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55
Expand Down Expand Up @@ -55,3 +56,5 @@ replace go.opentelemetry.io/collector/semconv => ../../semconv
replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension

replace go.opentelemetry.io/collector/processor/batchprocessor => ../../processor/batchprocessor

replace go.opentelemetry.io/collector/consumer => ../../consumer
3 changes: 3 additions & 0 deletions exporter/otlphttpexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/component v0.0.0-20221115212826-19db2f15c85c
go.opentelemetry.io/collector/consumer v0.0.0-00010101000000-000000000000
go.opentelemetry.io/collector/pdata v0.64.1
go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1
go.uber.org/zap v1.23.0
Expand Down Expand Up @@ -61,3 +62,5 @@ replace go.opentelemetry.io/collector/semconv => ../../semconv
replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension

replace go.opentelemetry.io/collector/processor/batchprocessor => ../../processor/batchprocessor

replace go.opentelemetry.io/collector/consumer => ../../consumer
3 changes: 3 additions & 0 deletions extension/ballastextension/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ require (
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/shirou/gopsutil/v3 v3.22.10 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opentelemetry.io/collector/consumer v0.0.0-00010101000000-000000000000 // indirect
go.opentelemetry.io/collector/pdata v0.64.1 // indirect
go.opentelemetry.io/otel v1.11.1 // indirect
go.opentelemetry.io/otel/metric v0.33.0 // indirect
Expand All @@ -52,3 +53,5 @@ replace go.opentelemetry.io/collector/semconv => ../../semconv
replace go.opentelemetry.io/collector/extension/zpagesextension => ../zpagesextension

replace go.opentelemetry.io/collector/processor/batchprocessor => ../../processor/batchprocessor

replace go.opentelemetry.io/collector/consumer => ../../consumer
3 changes: 3 additions & 0 deletions extension/zpagesextension/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ require (
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.0 // indirect
go.opentelemetry.io/collector/consumer v0.0.0-00010101000000-000000000000 // indirect
go.opentelemetry.io/collector/pdata v0.64.1 // indirect
go.opentelemetry.io/otel v1.11.1 // indirect
go.opentelemetry.io/otel/metric v0.33.0 // indirect
Expand All @@ -49,3 +50,5 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata
replace go.opentelemetry.io/collector/semconv => ../../semconv

replace go.opentelemetry.io/collector/processor/batchprocessor => ../../processor/batchprocessor

replace go.opentelemetry.io/collector/consumer => ../../consumer
3 changes: 3 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ require (
github.com/stretchr/testify v1.8.1
go.opencensus.io v0.24.0
go.opentelemetry.io/collector/component v0.0.0-20221115212826-19db2f15c85c
go.opentelemetry.io/collector/consumer v0.0.0-00010101000000-000000000000
go.opentelemetry.io/collector/extension/zpagesextension v0.64.1
go.opentelemetry.io/collector/pdata v0.64.1
go.opentelemetry.io/collector/processor/batchprocessor v0.64.1
Expand Down Expand Up @@ -82,6 +83,8 @@ require (

replace go.opentelemetry.io/collector/component => ./component

replace go.opentelemetry.io/collector/consumer => ./consumer

replace go.opentelemetry.io/collector/semconv => ./semconv

replace go.opentelemetry.io/collector/pdata => ./pdata
Expand Down
3 changes: 3 additions & 0 deletions processor/batchprocessor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
go.opencensus.io v0.24.0
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/component v0.0.0-20221115212826-19db2f15c85c
go.opentelemetry.io/collector/consumer v0.0.0-00010101000000-000000000000
go.opentelemetry.io/collector/pdata v0.64.1
go.uber.org/zap v1.23.0
)
Expand Down Expand Up @@ -46,3 +47,5 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata
replace go.opentelemetry.io/collector/semconv => ../../semconv

replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension

replace go.opentelemetry.io/collector/consumer => ../../consumer
3 changes: 3 additions & 0 deletions processor/memorylimiterprocessor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/component v0.0.0-20221115212826-19db2f15c85c
go.opentelemetry.io/collector/consumer v0.0.0-00010101000000-000000000000
go.opentelemetry.io/collector/pdata v0.64.1
go.uber.org/atomic v1.10.0
go.uber.org/zap v1.23.0
Expand Down Expand Up @@ -53,3 +54,5 @@ replace go.opentelemetry.io/collector/semconv => ../../semconv
replace go.opentelemetry.io/collector/processor/batchprocessor => ../batchprocessor

replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension

replace go.opentelemetry.io/collector/consumer => ../../consumer
3 changes: 3 additions & 0 deletions receiver/otlpreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/component v0.0.0-20221115212826-19db2f15c85c
go.opentelemetry.io/collector/consumer v0.0.0-00010101000000-000000000000
go.opentelemetry.io/collector/pdata v0.64.1
go.opentelemetry.io/collector/semconv v0.64.1
go.uber.org/zap v1.23.0
Expand Down Expand Up @@ -75,3 +76,5 @@ replace go.opentelemetry.io/collector/semconv => ../../semconv
replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension

replace go.opentelemetry.io/collector/processor/batchprocessor => ../../processor/batchprocessor

replace go.opentelemetry.io/collector/consumer => ../../consumer
1 change: 1 addition & 0 deletions versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module-sets:
modules:
- go.opentelemetry.io/collector
- go.opentelemetry.io/collector/component
- go.opentelemetry.io/collector/consumer
- go.opentelemetry.io/collector/cmd/builder
- go.opentelemetry.io/collector/exporter/loggingexporter
- go.opentelemetry.io/collector/exporter/otlpexporter
Expand Down

0 comments on commit 2454cfb

Please sign in to comment.