Skip to content

Commit

Permalink
split component into its own module (#6543)
Browse files Browse the repository at this point in the history
Fixes #6187
  • Loading branch information
Alex Boten authored Nov 15, 2022
1 parent a8d6280 commit 19db2f1
Show file tree
Hide file tree
Showing 18 changed files with 538 additions and 3 deletions.
18 changes: 18 additions & 0 deletions .chloggen/split-components.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: component

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

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

# (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 processor modules can now be access directly:
- `go.opentelemetry.io/collector/component`
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ updates:
directory: "/cmd/otelcorecol"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/component"
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 @@ -20,6 +20,7 @@ processors:

replaces:
- go.opentelemetry.io/collector => ../../
- go.opentelemetry.io/collector/component => ../../component
- 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 @@ -7,6 +7,7 @@ go 1.18
require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/component v0.64.1
go.opentelemetry.io/collector/exporter/loggingexporter v0.64.1
go.opentelemetry.io/collector/exporter/otlpexporter v0.64.1
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.1
Expand Down Expand Up @@ -88,6 +89,8 @@ require (

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

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

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

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

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
go.opentelemetry.io/otel/metric v0.33.0
go.opentelemetry.io/otel/trace v1.11.1
go.uber.org/multierr v1.8.0
go.uber.org/zap v1.23.0
)

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/knadh/koanf v1.4.4 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // 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
go.opentelemetry.io/otel v1.11.1 // indirect
go.uber.org/atomic v1.10.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
435 changes: 435 additions & 0 deletions component/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 @@ -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/component v0.64.1
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 @@ -40,6 +41,8 @@ require (

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

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

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 @@ -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/component v0.64.1
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 @@ -45,6 +46,8 @@ require (

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

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

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

replace go.opentelemetry.io/collector/semconv => ../../semconv
Expand Down
3 changes: 3 additions & 0 deletions exporter/otlphttpexporter/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/component v0.64.1
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 @@ -49,6 +50,8 @@ require (

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

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

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

replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver
Expand Down
3 changes: 3 additions & 0 deletions extension/ballastextension/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/component v0.64.1
go.uber.org/zap v1.23.0
)

Expand Down Expand Up @@ -42,6 +43,8 @@ require (

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

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

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

replace go.opentelemetry.io/collector/semconv => ../../semconv
Expand Down
3 changes: 3 additions & 0 deletions extension/zpagesextension/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/component v0.64.1
go.opentelemetry.io/contrib/zpages v0.36.4
go.opentelemetry.io/otel/sdk v1.11.1
go.opentelemetry.io/otel/trace v1.11.1
Expand Down Expand Up @@ -41,6 +42,8 @@ require (

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

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

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

replace go.opentelemetry.io/collector/semconv => ../../semconv
Expand Down
3 changes: 3 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ require (
github.com/spf13/cobra v1.6.1
github.com/stretchr/testify v1.8.1
go.opencensus.io v0.24.0
go.opentelemetry.io/collector/component v0.64.1
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 @@ -79,6 +80,8 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
)

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

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 @@ -6,6 +6,7 @@ require (
github.com/stretchr/testify v1.8.1
go.opencensus.io v0.24.0
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/component v0.64.1
go.opentelemetry.io/collector/pdata v0.64.1
go.uber.org/zap v1.23.0
)
Expand Down Expand Up @@ -38,6 +39,8 @@ require (

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

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

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

replace go.opentelemetry.io/collector/semconv => ../../semconv
Expand Down
3 changes: 3 additions & 0 deletions processor/memorylimiterprocessor/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/component v0.64.1
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 @@ -43,6 +44,8 @@ require (

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

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

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

replace go.opentelemetry.io/collector/semconv => ../../semconv
Expand Down
5 changes: 2 additions & 3 deletions receiver/otlpreceiver/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ import (

const (
// Protocol values.
protoGRPC = "protocols::grpc"
protoHTTP = "protocols::http"
protocolsFieldName = "protocols"
protoGRPC = "protocols::grpc"
protoHTTP = "protocols::http"
)

// Protocols is the configuration for the supported protocols.
Expand Down
3 changes: 3 additions & 0 deletions receiver/otlpreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/component v0.64.1
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 @@ -65,6 +66,8 @@ require (

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

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

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

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

0 comments on commit 19db2f1

Please sign in to comment.