[chore] add websocketprocessor to otelcontribcol (open-telemetry#23409)

fluxninja · Jun 15, 2023 · d98e12b · d98e12b
1 parent fd526ee
commit d98e12b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml
@@ -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
@@ -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

diff --git a/cmd/otelcontribcol/components.go b/cmd/otelcontribcol/components.go
diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod
@@ -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
@@ -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

diff --git a/cmd/otelcontribcol/processors_test.go b/cmd/otelcontribcol/processors_test.go
@@ -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) {
@@ -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