Skip to content

Commit 60b2321

Browse files
authored
Add windows events logs for opentelemetry section (#2193)
1 parent 43b8841 commit 60b2321

46 files changed

Lines changed: 2663 additions & 68 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ require (
203203
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.124.1
204204
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.124.1
205205
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.124.1
206+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.124.1
206207
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.124.1
207208
github.com/pkg/errors v0.9.1
208209
github.com/prometheus/client_golang v1.22.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,6 +1387,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceive
13871387
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.124.1/go.mod h1:cVf9mR1NQUOSxKaG68d1f6J1R1gD+es8N4KlfXzMrzY=
13881388
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.124.1 h1:ViSLfZ+rwltr/cJyUzxwH7+Ew/qDs4KyQpMFsDbRd/g=
13891389
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.124.1/go.mod h1:mEiB1YGSaguEyYsq803/QgBiJVofgknWgJ3eqgvlj7I=
1390+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.124.1 h1:4gVuHekKmzaLU1tZvIAntbkJhpThoCkZEwJCdL7SrOs=
1391+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.124.1/go.mod h1:BcBDxsZysvBLwjGhjLP62QY9Db6uXqvhSIQJkhVfEz0=
13901392
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.124.1 h1:XkxqUEoukMWXF+EpEWeM9itXKt62yKi13Lzd8ZEASP4=
13911393
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.124.1/go.mod h1:CuCZVPz+yn88b5vhZPAlxaMrVuhAVexUV6f8b07lpUc=
13921394
github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029 h1:lXQqyLroROhwR2Yq/kXbLzVecgmVeZh2TFLg6OxCd+w=

service/defaultcomponents/components.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import (
6060
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver"
6161
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver"
6262
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver"
63+
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver"
6364
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver"
6465
"go.opentelemetry.io/collector/connector"
6566
"go.opentelemetry.io/collector/connector/forwardconnector"
@@ -123,6 +124,7 @@ func Factories() (otelcol.Factories, error) {
123124
systemmetricsreceiver.NewFactory(),
124125
tcplogreceiver.NewFactory(),
125126
udplogreceiver.NewFactory(),
127+
windowseventlogreceiver.NewFactory(),
126128
zipkinreceiver.NewFactory(),
127129
); err != nil {
128130
return otelcol.Factories{}, err

service/defaultcomponents/components_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ func TestComponents(t *testing.T) {
4040
"systemmetrics",
4141
"tcplog",
4242
"udplog",
43+
"windowseventlog",
4344
"zipkin",
4445
}
4546
gotReceivers := collections.MapSlice(maps.Keys(factories.Receivers), component.Type.String)

tool/downloader/downloader_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import (
1111

1212
"github.com/stretchr/testify/assert"
1313
"github.com/stretchr/testify/require"
14+
15+
"github.com/aws/amazon-cloudwatch-agent/translator/config"
1416
)
1517

1618
func TestRunDownloader_DefaultOtel(t *testing.T) {
@@ -21,9 +23,9 @@ func TestRunDownloader_DefaultOtel(t *testing.T) {
2123
content, err := os.ReadFile(filepath.Join(outputDir, "default_otel.tmp"))
2224
require.NoError(t, err)
2325

24-
expected, err := os.ReadFile("../../translator/config/defaults/otel.json")
25-
require.NoError(t, err)
26-
assert.JSONEq(t, string(expected), string(content))
26+
expected, ok := config.DefaultJSONConfigFor("otel")
27+
require.True(t, ok)
28+
assert.JSONEq(t, expected, string(content))
2729
}
2830

2931
func TestRunDownloader_DefaultBare(t *testing.T) {

translator/cmdutil/translatorutil_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,16 @@ func TestDefaultOtelConfigSchemaValidation(t *testing.T) {
441441
assert.True(t, result.Valid(), "default otel config must pass schema validation: %v", result.Errors())
442442
}
443443

444+
func TestOpenTelemetryWindowsEventsSchemaValidation(t *testing.T) {
445+
checkIfSchemaValidateAsExpected(t, "../../translator/config/sampleSchema/opentelemetry/validOpenTelemetryWindowsEvents.json", true, map[string]int{})
446+
}
447+
448+
func TestOpenTelemetryWindowsEventsInvalidSchemaValidation(t *testing.T) {
449+
checkIfSchemaValidateAsExpected(t, "../../translator/config/sampleSchema/opentelemetry/invalidOpenTelemetryWindowsEvents.json", false, map[string]int{
450+
"enum": 1,
451+
})
452+
}
453+
444454
func TestCombinedV1V2SchemaValidation(t *testing.T) {
445455
checkIfSchemaValidateAsExpected(t, "../../translator/config/sampleSchema/opentelemetry/validCombinedV1V2Config.json", true, map[string]int{})
446456
}

translator/config/defaultConfig.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33

44
package config
55

6-
import _ "embed"
7-
8-
//go:embed defaults/otel.json
9-
var defaultOtelConfig string
10-
116
var defaultConfigs = map[string]string{
127
"otel": defaultOtelConfig,
138
}

translator/config/defaultConfig_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package config
55

66
import (
7-
"os"
87
"testing"
98

109
"github.com/stretchr/testify/assert"
@@ -14,10 +13,7 @@ import (
1413
func TestDefaultJSONConfigFor_Otel(t *testing.T) {
1514
cfg, ok := DefaultJSONConfigFor("otel")
1615
require.True(t, ok)
17-
18-
expected, err := os.ReadFile("defaults/otel.json")
19-
require.NoError(t, err)
20-
assert.JSONEq(t, string(expected), cfg)
16+
assert.JSONEq(t, defaultOtelConfig, cfg)
2117
}
2218

2319
func TestDefaultJSONConfigFor_Unknown(t *testing.T) {
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: MIT
3+
4+
//go:build !windows
5+
6+
package config
7+
8+
import _ "embed"
9+
10+
//go:embed defaults/otel.json
11+
var defaultOtelConfig string
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: MIT
3+
4+
//go:build windows
5+
6+
package config
7+
8+
import _ "embed"
9+
10+
//go:embed defaults/otel_windows.json
11+
var defaultOtelConfig string

0 commit comments

Comments
 (0)