diff --git a/.chloggen/internal_model_solacereceiver.yaml b/.chloggen/internal_model_solacereceiver.yaml new file mode 100644 index 000000000000..ee0869f4e701 --- /dev/null +++ b/.chloggen/internal_model_solacereceiver.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: solacereceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Move model package to the internal package + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24890] + +# (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: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/receiver/solacereceiver/model/README.md b/receiver/solacereceiver/internal/model/README.md similarity index 100% rename from receiver/solacereceiver/model/README.md rename to receiver/solacereceiver/internal/model/README.md diff --git a/receiver/solacereceiver/model/egress/v1/egress_v1.pb.go b/receiver/solacereceiver/internal/model/egress/v1/egress_v1.pb.go similarity index 100% rename from receiver/solacereceiver/model/egress/v1/egress_v1.pb.go rename to receiver/solacereceiver/internal/model/egress/v1/egress_v1.pb.go diff --git a/receiver/solacereceiver/model/egress_v1.proto b/receiver/solacereceiver/internal/model/egress_v1.proto similarity index 100% rename from receiver/solacereceiver/model/egress_v1.proto rename to receiver/solacereceiver/internal/model/egress_v1.proto diff --git a/receiver/solacereceiver/model/receive/v1/receive_v1.pb.go b/receiver/solacereceiver/internal/model/receive/v1/receive_v1.pb.go similarity index 100% rename from receiver/solacereceiver/model/receive/v1/receive_v1.pb.go rename to receiver/solacereceiver/internal/model/receive/v1/receive_v1.pb.go diff --git a/receiver/solacereceiver/model/receive_v1.proto b/receiver/solacereceiver/internal/model/receive_v1.proto similarity index 100% rename from receiver/solacereceiver/model/receive_v1.proto rename to receiver/solacereceiver/internal/model/receive_v1.proto diff --git a/receiver/solacereceiver/unmarshaller_egress.go b/receiver/solacereceiver/unmarshaller_egress.go index 068d209b77d2..bd1aa6b62ed3 100644 --- a/receiver/solacereceiver/unmarshaller_egress.go +++ b/receiver/solacereceiver/unmarshaller_egress.go @@ -13,7 +13,7 @@ import ( "go.uber.org/zap" "google.golang.org/protobuf/proto" - egress_v1 "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/model/egress/v1" + egress_v1 "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/internal/model/egress/v1" ) type brokerTraceEgressUnmarshallerV1 struct { diff --git a/receiver/solacereceiver/unmarshaller_egress_test.go b/receiver/solacereceiver/unmarshaller_egress_test.go index 65545fdf741b..6376706d3e7b 100644 --- a/receiver/solacereceiver/unmarshaller_egress_test.go +++ b/receiver/solacereceiver/unmarshaller_egress_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" - egress_v1 "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/model/egress/v1" + egress_v1 "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/internal/model/egress/v1" ) // msgWithAdditionalSpan is an EgressSpanMsg with one EgressSpan of type 1 (future proofing) diff --git a/receiver/solacereceiver/unmarshaller_receive.go b/receiver/solacereceiver/unmarshaller_receive.go index e3e29da79b6a..1ad06ebe3b38 100644 --- a/receiver/solacereceiver/unmarshaller_receive.go +++ b/receiver/solacereceiver/unmarshaller_receive.go @@ -15,7 +15,7 @@ import ( "go.uber.org/zap" "google.golang.org/protobuf/proto" - receive_v1 "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/model/receive/v1" + receive_v1 "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/internal/model/receive/v1" ) type brokerTraceReceiveUnmarshallerV1 struct { diff --git a/receiver/solacereceiver/unmarshaller_receive_test.go b/receiver/solacereceiver/unmarshaller_receive_test.go index b4ed5312821c..f0c02bc54648 100644 --- a/receiver/solacereceiver/unmarshaller_receive_test.go +++ b/receiver/solacereceiver/unmarshaller_receive_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" - receive_v1 "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/model/receive/v1" + receive_v1 "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/internal/model/receive/v1" ) func TestReceiveUnmarshallerMapResourceSpan(t *testing.T) { diff --git a/receiver/solacereceiver/unmarshaller_test.go b/receiver/solacereceiver/unmarshaller_test.go index fef0fa8eddf0..187194456c0e 100644 --- a/receiver/solacereceiver/unmarshaller_test.go +++ b/receiver/solacereceiver/unmarshaller_test.go @@ -15,8 +15,8 @@ import ( "go.uber.org/zap" "google.golang.org/protobuf/proto" - egress_v1 "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/model/egress/v1" - receive_v1 "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/model/receive/v1" + egress_v1 "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/internal/model/egress/v1" + receive_v1 "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/internal/model/receive/v1" ) // Validate entire unmarshal flow