Skip to content

Commit

Permalink
Rename websocketprocessor to remoteobserverprocessor
Browse files Browse the repository at this point in the history
  • Loading branch information
atoulme committed Jun 30, 2023
1 parent 2192899 commit 6184076
Show file tree
Hide file tree
Showing 26 changed files with 54 additions and 34 deletions.
20 changes: 20 additions & 0 deletions .chloggen/rename-websocket-remoteobserver.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Use this changelog template to create an entry for release notes.
# If your change doesn't affect end users, such as a test fix or a tooling change,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

# 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. filelogreceiver)
component: websocketprocessor

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Rename websocketprocessor to remoteobserverprocessor

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [23856]

# (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:
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,14 @@ processor/resourceprocessor/ @open-telemetry/collect
processor/resourcedetectionprocessor/internal/azure/ @open-telemetry/collector-contrib-approvers @mx-psi
processor/resourcedetectionprocessor/internal/heroku/ @open-telemetry/collector-contrib-approvers @atoulme
processor/resourcedetectionprocessor/internal/openshift/ @open-telemetry/collector-contrib-approvers @frzifus
processor/remoteobserverprocessor/ @open-telemetry/collector-contrib-approvers @pmcollins
processor/routingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling @kovrus
processor/schemaprocessor/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy
processor/servicegraphprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling @mapno
processor/spanmetricsprocessor/ @open-telemetry/collector-contrib-approvers @albertteoh
processor/spanprocessor/ @open-telemetry/collector-contrib-approvers @boostchicken
processor/tailsamplingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling
processor/transformprocessor/ @open-telemetry/collector-contrib-approvers @TylerHelmuth @kentquirk @bogdandrutu @evan-bradley
processor/websocketprocessor/ @open-telemetry/collector-contrib-approvers @pmcollins

receiver/azureeventhubreceiver/ @open-telemetry/collector-contrib-approvers @atoulme @djaglowski
receiver/activedirectorydsreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @binaryfissiongames
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ body:
- processor/metricstransform
- processor/probabilisticsampler
- processor/redaction
- processor/remoteobserver
- processor/resource
- processor/resourcedetection
- processor/resourcedetection/internal/azure
Expand All @@ -147,7 +148,6 @@ body:
- processor/spanmetrics
- processor/tailsampling
- processor/transform
- processor/websocket
- receiver/activedirectoryds
- receiver/aerospike
- receiver/apache
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ body:
- processor/metricstransform
- processor/probabilisticsampler
- processor/redaction
- processor/remoteobserver
- processor/resource
- processor/resourcedetection
- processor/resourcedetection/internal/azure
Expand All @@ -141,7 +142,6 @@ body:
- processor/spanmetrics
- processor/tailsampling
- processor/transform
- processor/websocket
- receiver/activedirectoryds
- receiver/aerospike
- receiver/apache
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ body:
- processor/metricstransform
- processor/probabilisticsampler
- processor/redaction
- processor/remoteobserver
- processor/resource
- processor/resourcedetection
- processor/resourcedetection/internal/azure
Expand All @@ -141,7 +142,6 @@ body:
- processor/spanmetrics
- processor/tailsampling
- processor/transform
- processor/websocket
- receiver/activedirectoryds
- receiver/aerospike
- receiver/apache
Expand Down
10 changes: 5 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,11 @@ updates:
schedule:
interval: "weekly"
day: "wednesday"
- package-ecosystem: "gomod"
directory: "/processor/remoteobserverprocessor"
schedule:
interval: "weekly"
day: "wednesday"
- package-ecosystem: "gomod"
directory: "/processor/resourcedetectionprocessor"
schedule:
Expand Down Expand Up @@ -687,11 +692,6 @@ updates:
schedule:
interval: "weekly"
day: "wednesday"
- package-ecosystem: "gomod"
directory: "/processor/websocketprocessor"
schedule:
interval: "weekly"
day: "wednesday"
- package-ecosystem: "gomod"
directory: "/receiver/activedirectorydsreceiver"
schedule:
Expand Down
4 changes: 2 additions & 2 deletions cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.80.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.80.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.80.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor v0.80.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remoteobserverprocessor v0.80.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.80.1-0.20230629144634-c3f70bd1f8ea
Expand Down Expand Up @@ -405,7 +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
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/remoteobserverprocessor => ../../processor/remoteobserverprocessor
# 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
4 changes: 2 additions & 2 deletions cmd/otelcontribcol/components.go

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

4 changes: 2 additions & 2 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.80.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.80.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.80.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/remoteobserverprocessor v0.80.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.80.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.80.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.80.0
Expand All @@ -94,7 +95,6 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.80.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.80.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.80.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor v0.80.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.80.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.80.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.80.0
Expand Down Expand Up @@ -1097,7 +1097,7 @@ 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/open-telemetry/opentelemetry-collector-contrib/processor/remoteobserverprocessor => ../../processor/remoteobserverprocessor

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

Expand Down
6 changes: 3 additions & 3 deletions cmd/otelcontribcol/processors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/attraction"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor"
remoteobserverprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/remoteobserverprocessor"
"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 @@ -138,9 +138,9 @@ func TestDefaultProcessors(t *testing.T) {
processor: "redaction",
},
{
processor: "websocket",
processor: "remoteobserver",
getConfigFn: func() component.Config {
cfg := procFactories["websocket"].CreateDefaultConfig().(*websocketprocessor.Config)
cfg := procFactories["remoteobserver"].CreateDefaultConfig().(*remoteobserverprocessor.Config)
cfg.Endpoint = "localhost:0"
return cfg
},
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package websocketprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor"
package remoteobserverprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/remoteobserverprocessor"

import "sync"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package websocketprocessor
package remoteobserverprocessor

import (
"testing"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package websocketprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor"
package remoteobserverprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/remoteobserverprocessor"

import (
"go.opentelemetry.io/collector/component"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package websocketprocessor
package remoteobserverprocessor

import (
"testing"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

//go:generate mdatagen metadata.yaml

// Package websocketprocessor can be positioned anywhere in a pipeline, allowing
// Package remoteobserverprocessor can be positioned anywhere in a pipeline, allowing
// data to pass through to the next component. Simultaneously, it makes a portion
// of the data accessible to WebSocket clients connecting on a configurable port.
package websocketprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor"
package remoteobserverprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/remoteobserverprocessor"
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package websocketprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor"
package remoteobserverprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/remoteobserverprocessor"

import (
"context"
Expand All @@ -12,7 +12,7 @@ import (
"go.opentelemetry.io/collector/processor/processorhelper"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor/internal/metadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/remoteobserverprocessor/internal/metadata"
)

var processors = sharedcomponent.NewSharedComponents()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package websocketprocessor
package remoteobserverprocessor

import (
"testing"
Expand All @@ -11,7 +11,7 @@ import (

func TestNewFactory(t *testing.T) {
factory := NewFactory()
assert.EqualValues(t, "websocket", factory.Type())
assert.EqualValues(t, "remoteobserver", factory.Type())
config := factory.CreateDefaultConfig()
assert.NotNil(t, config)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor
module github.com/open-telemetry/opentelemetry-collector-contrib/processor/remoteobserverprocessor

go 1.19

Expand Down
File renamed without changes.

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

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: websocket
type: remoteobserver

status:
class: processor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package websocketprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor"
package remoteobserverprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/remoteobserverprocessor"

import (
"context"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package websocketprocessor
package remoteobserverprocessor

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ module-sets:
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/websocketprocessor
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/remoteobserverprocessor
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver
Expand Down

0 comments on commit 6184076

Please sign in to comment.