Skip to content
This repository has been archived by the owner on May 25, 2022. It is now read-only.

Add copyright to files added in PR 24 #38

Merged
merged 3 commits into from
Mar 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions operator/builtin/input/syslog/syslog.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package syslog

import (
"fmt"

"github.com/open-telemetry/opentelemetry-log-collection/operator"
"github.com/open-telemetry/opentelemetry-log-collection/operator/builtin/input/tcp"
"github.com/open-telemetry/opentelemetry-log-collection/operator/builtin/input/udp"
Expand Down
22 changes: 18 additions & 4 deletions operator/builtin/input/syslog/syslog_test.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,32 @@
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package syslog

import (
"fmt"
"net"
"testing"
"time"

"github.com/open-telemetry/opentelemetry-log-collection/operator/builtin/input/tcp"
"github.com/open-telemetry/opentelemetry-log-collection/operator/builtin/input/udp"
"github.com/open-telemetry/opentelemetry-log-collection/operator/builtin/parser/syslog"
"github.com/open-telemetry/opentelemetry-log-collection/pipeline"
"github.com/open-telemetry/opentelemetry-log-collection/testutil"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v2"
"net"
"testing"
"time"
)

func TestSyslogInput(t *testing.T) {
Expand Down Expand Up @@ -108,7 +123,6 @@ udp:
require.Equal(t, "rfc5424", cfg.Protocol)
require.Equal(t, "localhost:1234", cfg.Udp.ListenAddress)


base = `type: syslog_input
protocol: rfc5424
tcp:
Expand Down
17 changes: 16 additions & 1 deletion operator/builtin/parser/syslog/data.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package syslog

import (
"github.com/open-telemetry/opentelemetry-log-collection/entry"
"time"

"github.com/open-telemetry/opentelemetry-log-collection/entry"
)

type Case struct {
Expand Down