Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore] add websocketprocessor to otelcontribcol #23409

Merged
merged 1 commit into from
Jun 15, 2023
Merged

[chore] add websocketprocessor to otelcontribcol #23409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmd/otelcontribcol/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.79.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.79.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.79.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor v0.79.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.79.1-0.20230609201858-ed8547a8e5d6
Expand Down Expand Up @@ -404,6 +405,7 @@ replaces:
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver => ../../receiver/windowseventlogreceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/webhookeventreceiver => ../../receiver/webhookeventreceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver => ../../extension/observer/ecsobserver
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor => ../../processor/websocketprocessor
# see https://github.com/mattn/go-ieproxy/issues/45
- github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1
- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest
Expand Down
2 changes: 2 additions & 0 deletions cmd/otelcontribcol/components.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cmd/otelcontribcol/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.79.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.79.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.79.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor v0.79.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.79.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.79.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.79.0
Expand Down Expand Up @@ -1085,6 +1086,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/webho

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

replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor => ../../processor/websocketprocessor

replace github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest
Expand Down
9 changes: 9 additions & 0 deletions cmd/otelcontribcol/processors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor"
)

func TestDefaultProcessors(t *testing.T) {
Expand Down Expand Up @@ -136,6 +137,14 @@ func TestDefaultProcessors(t *testing.T) {
{
processor: "redaction",
},
{
processor: "websocket",
getConfigFn: func() component.Config {
cfg := procFactories["websocket"].CreateDefaultConfig().(*websocketprocessor.Config)
cfg.Endpoint = "localhost:0"
return cfg
},
},
}

processorCount := 0
Expand Down