Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Increase coverage.
  • Loading branch information
constanca-m committed Apr 5, 2025
commit 0051ebf9a8d311f8485cb7b650051ca326f32e4a
1 change: 0 additions & 1 deletion pkg/translator/azurelogs/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/
go 1.23.0

require (
github.com/goccy/go-json v0.10.5
github.com/json-iterator/go v1.1.12
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.123.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.123.0
Expand Down
2 changes: 0 additions & 2 deletions pkg/translator/azurelogs/go.sum

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

291 changes: 2 additions & 289 deletions pkg/translator/azurelogs/resourcelogs_to_logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ package azurelogs // import "github.com/open-telemetry/opentelemetry-collector-c

import (
"encoding/json"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
"github.com/stretchr/testify/require"
"os"
"path/filepath"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/plog"
conventions "go.opentelemetry.io/collector/semconv/v1.22.0"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest"
)

Expand Down Expand Up @@ -349,290 +349,3 @@ func TestUnmarshalLogs_Files(t *testing.T) {
})
}
}

// func TestUnmarshalLogs(t *testing.T) {
// expectedMinimum := plog.NewLogs()
// resourceLogs := expectedMinimum.ResourceLogs().AppendEmpty()
// scopeLogs := resourceLogs.ScopeLogs().AppendEmpty()
// scopeLogs.Scope().SetName("otelcol/azureresourcelogs")
// scopeLogs.Scope().SetVersion(testBuildInfo.Version)
// lr := scopeLogs.LogRecords().AppendEmpty()
// minimumLogRecord.CopyTo(lr)
//
// expectedMinimum2 := plog.NewLogs()
// resourceLogs = expectedMinimum2.ResourceLogs().AppendEmpty()
// scopeLogs = resourceLogs.ScopeLogs().AppendEmpty()
// scopeLogs.Scope().SetName("otelcol/azureresourcelogs")
// scopeLogs.Scope().SetVersion(testBuildInfo.Version)
// logRecords := scopeLogs.LogRecords()
// lr = logRecords.AppendEmpty()
// minimumLogRecord.CopyTo(lr)
// lr = logRecords.AppendEmpty()
// minimumLogRecord.CopyTo(lr)
//
// expectedMaximum := plog.NewLogs()
// resourceLogs = expectedMaximum.ResourceLogs().AppendEmpty()
// scopeLogs = resourceLogs.ScopeLogs().AppendEmpty()
// scopeLogs.Scope().SetName("otelcol/azureresourcelogs")
// scopeLogs.Scope().SetVersion(testBuildInfo.Version)
// lr = scopeLogs.LogRecords().AppendEmpty()
// maximumLogRecord1.CopyTo(lr)
//
// resourceLogs = expectedMaximum.ResourceLogs().AppendEmpty()
// scopeLogs = resourceLogs.ScopeLogs().AppendEmpty()
// scopeLogs.Scope().SetName("otelcol/azureresourcelogs")
// scopeLogs.Scope().SetVersion(testBuildInfo.Version)
// lr = scopeLogs.LogRecords().AppendEmpty()
// lr2 := scopeLogs.LogRecords().AppendEmpty()
// maximumLogRecord2[0].CopyTo(lr)
// maximumLogRecord2[1].CopyTo(lr2)
//
// expectedBadLevel := plog.NewLogs()
// resourceLogs = expectedBadLevel.ResourceLogs().AppendEmpty()
// scopeLogs = resourceLogs.ScopeLogs().AppendEmpty()
// scopeLogs.Scope().SetName("otelcol/azureresourcelogs")
// scopeLogs.Scope().SetVersion(testBuildInfo.Version)
// lr = scopeLogs.LogRecords().AppendEmpty()
// badLevelLogRecord.CopyTo(lr)
//
// expectedBadTime := plog.NewLogs()
// resourceLogs = expectedBadTime.ResourceLogs().AppendEmpty()
// scopeLogs = resourceLogs.ScopeLogs().AppendEmpty()
// scopeLogs.Scope().SetName("otelcol/azureresourcelogs")
// scopeLogs.Scope().SetVersion(testBuildInfo.Version)
// lr = scopeLogs.LogRecords().AppendEmpty()
// badTimeLogRecord.CopyTo(lr)
//
// tests := []struct {
// file string
// expected plog.Logs
// }{
// {
// file: "log-minimum.json",
// expected: expectedMinimum,
// },
// {
// file: "log-minimum-2.json",
// expected: expectedMinimum2,
// },
// {
// file: "log-maximum.json",
// expected: expectedMaximum,
// },
// {
// file: "log-bad-level.json",
// expected: expectedBadLevel,
// },
// {
// file: "log-bad-time.json",
// expected: expectedBadTime,
// },
// }
//
// sut := &ResourceLogsUnmarshaler{
// Version: testBuildInfo.Version,
// Logger: zap.NewNop(),
// }
// for _, tt := range tests {
// t.Run(tt.file, func(t *testing.T) {
// data, err := os.ReadFile(filepath.Join("testdata", tt.file))
// assert.NoError(t, err)
// assert.NotNil(t, data)
//
// logs, err := sut.UnmarshalLogs(data)
// assert.NoError(t, err)
//
// assert.NoError(t, plogtest.CompareLogs(tt.expected, logs))
// })
// }
// }

// func loadJSONLogsAndApplySemanticConventions(filename string) (plog.Logs, error) {
// l := plog.NewLogs()
//
// sut := &ResourceLogsUnmarshaler{
// Version: testBuildInfo.Version,
// Logger: zap.NewNop(),
// }
//
// data, err := os.ReadFile(filepath.Join("testdata", filename))
// if err != nil {
// return l, err
// }
//
// logs, err := sut.UnmarshalLogs(data)
// if err != nil {
// return l, err
// }
//
// return logs, nil
// }

// func TestAzureCdnAccessLog(t *testing.T) {
// logs, err := loadJSONLogsAndApplySemanticConventions("log-azurecdnaccesslog.json")
//
// assert.NoError(t, err)
//
// record := logs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Map().AsRaw()
//
// assert.Equal(t, http.MethodGet, record["http.request.method"])
// assert.Equal(t, "1.1.0.0", record["network.protocol.version"])
// assert.Equal(t, "TRACKING_REFERENCE", record["az.service_request_id"])
// assert.Equal(t, "https://test.net/", record["url.full"])
// assert.Equal(t, int64(1234), record["http.request.size"])
// assert.Equal(t, int64(12345), record["http.response.size"])
// assert.Equal(t, "Mozilla/5.0", record["user_agent.original"])
// assert.Equal(t, "42.42.42.42", record["client.address"])
// assert.Equal(t, "0", record["client.port"])
// assert.Equal(t, "tls", record["tls.protocol.name"])
// assert.Equal(t, "1.3", record["tls.protocol.version"])
// assert.Equal(t, int64(200), record["http.response.status_code"])
// assert.Equal(t, "NoError", record["error.type"])
// }

// func TestFrontDoorAccessLog(t *testing.T) {
// logs, err := loadJSONLogsAndApplySemanticConventions("log-frontdooraccesslog.json")
//
// assert.NoError(t, err)
//
// record := logs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Map().AsRaw()
//
// assert.Equal(t, http.MethodGet, record["http.request.method"])
// assert.Equal(t, "1.1.0.0", record["network.protocol.version"])
// assert.Equal(t, "TRACKING_REFERENCE", record["az.service_request_id"])
// assert.Equal(t, "https://test.net/", record["url.full"])
// assert.Equal(t, int64(1234), record["http.request.size"])
// assert.Equal(t, int64(12345), record["http.response.size"])
// assert.Equal(t, "Mozilla/5.0", record["user_agent.original"])
// assert.Equal(t, "42.42.42.42", record["client.address"])
// assert.Equal(t, "0", record["client.port"])
// assert.Equal(t, "23.23.23.23", record["network.peer.address"])
// assert.Equal(t, float64(0.23), record["http.server.request.duration"])
// assert.Equal(t, "https", record["network.protocol.name"])
// assert.Equal(t, "tls", record["tls.protocol.name"])
// assert.Equal(t, "1.3", record["tls.protocol.version"])
// assert.Equal(t, "TLS_AES_256_GCM_SHA384", record["tls.cipher"])
// assert.Equal(t, "secp384r1", record["tls.curve"])
// assert.Equal(t, int64(200), record["http.response.status_code"])
// assert.Equal(t, "REFERER", record["http.request.header.referer"])
// assert.Equal(t, "NoError", record["error.type"])
// }
//
// func TestFrontDoorHealthProbeLog(t *testing.T) {
// logs, err := loadJSONLogsAndApplySemanticConventions("log-frontdoorhealthprobelog.json")
//
// assert.NoError(t, err)
//
// record := logs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Map().AsRaw()
//
// assert.Equal(t, http.MethodGet, record["http.request.method"])
// assert.Equal(t, int64(200), record["http.response.status_code"])
// assert.Equal(t, "https://probe.net/health", record["url.full"])
// assert.Equal(t, "42.42.42.42", record["server.address"])
// assert.Equal(t, 0.042, record["http.request.duration"])
// assert.Equal(t, 0.00023, record["dns.lookup.duration"])
// }
//
// func TestFrontDoorWAFLog(t *testing.T) {
// logs, err := loadJSONLogsAndApplySemanticConventions("log-frontdoorwaflog.json")
//
// assert.NoError(t, err)
//
// record := logs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Map().AsRaw()
//
// assert.Equal(t, "TRACKING_REFERENCE", record["az.service_request_id"])
// assert.Equal(t, "https://test.net/", record["url.full"])
// assert.Equal(t, "test.net", record["server.address"])
// assert.Equal(t, "42.42.42.42", record["client.address"])
// assert.Equal(t, "0", record["client.port"])
// assert.Equal(t, "23.23.23.23", record["network.peer.address"])
// }
//
// func TestAppServiceAppLog(t *testing.T) {
// logs, err := loadJSONLogsAndApplySemanticConventions("log-appserviceapplogs.json")
//
// assert.NoError(t, err)
//
// record := logs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Map().AsRaw()
//
// assert.Equal(t, "CONTAINER_ID", record["container.id"])
// assert.Equal(t, "EXCEPTION_CLASS", record["exception.type"])
// assert.Equal(t, "HOST", record["host.id"])
// assert.Equal(t, "METHOD", record["code.function"])
// assert.Equal(t, "FILEPATH", record["code.filepath"])
// assert.Equal(t, "STACKTRACE", record["exception.stacktrace"])
// }
//
// func TestAppServiceConsoleLog(t *testing.T) {
// logs, err := loadJSONLogsAndApplySemanticConventions("log-appserviceconsolelogs.json")
//
// assert.NoError(t, err)
//
// record := logs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Map().AsRaw()
//
// assert.Equal(t, "CONTAINER_ID", record["container.id"])
// assert.Equal(t, "HOST", record["host.id"])
// }
//
// func TestAppServiceAuditLog(t *testing.T) {
// logs, err := loadJSONLogsAndApplySemanticConventions("log-appserviceauditlogs.json")
//
// assert.NoError(t, err)
//
// record := logs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Map().AsRaw()
//
// assert.Equal(t, "USER_ID", record["enduser.id"])
// assert.Equal(t, "42.42.42.42", record["client.address"])
// assert.Equal(t, "kudu", record["network.protocol.name"])
// }
//
// func TestAppServiceHTTPLog(t *testing.T) {
// logs, err := loadJSONLogsAndApplySemanticConventions("log-appservicehttplogs.json")
//
// assert.NoError(t, err)
//
// record := logs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Map().AsRaw()
//
// assert.Equal(t, "test.com", record["url.domain"])
// assert.Equal(t, "42.42.42.42", record["client.address"])
// assert.Equal(t, int64(80), record["server.port"])
// assert.Equal(t, "/api/test/", record["url.path"])
// assert.Equal(t, "foo=42", record["url.query"])
// assert.Equal(t, http.MethodGet, record["http.request.method"])
// assert.Equal(t, 0.42, record["http.server.request.duration"])
// assert.Equal(t, int64(200), record["http.response.status_code"])
// assert.Equal(t, int64(4242), record["http.request.body.size"])
// assert.Equal(t, int64(42), record["http.response.body.size"])
// assert.Equal(t, "Mozilla/5.0", record["user_agent.original"])
// assert.Equal(t, "REFERER", record["http.request.header.referer"])
// assert.Equal(t, "COMPUTER_NAME", record["host.name"])
// assert.Equal(t, "http", record["network.protocol.name"])
// assert.Equal(t, "1.1", record["network.protocol.version"])
// }
//
// func TestAppServicePlatformLog(t *testing.T) {
// logs, err := loadJSONLogsAndApplySemanticConventions("log-appserviceplatformlogs.json")
//
// assert.NoError(t, err)
//
// record := logs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Map().AsRaw()
//
// assert.Equal(t, "CONTAINER_ID", record["container.id"])
// assert.Equal(t, "CONTAINER_NAME", record["container.name"])
// }
//
// func TestAppServiceIPSecAuditLog(t *testing.T) {
// logs, err := loadJSONLogsAndApplySemanticConventions("log-appserviceipsecauditlogs.json")
//
// assert.NoError(t, err)
//
// record := logs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().Map().AsRaw()
//
// assert.Equal(t, "42.42.42.42", record["client.address"])
// assert.Equal(t, "HOST", record["url.domain"])
// assert.Equal(t, "FDID", record["http.request.header.x-azure-fdid"])
// assert.Equal(t, "HEALTH_PROBE", record["http.request.header.x-fd-healthprobe"])
// assert.Equal(t, "FORWARDED_FOR", record["http.request.header.x-forwarded-for"])
// assert.Equal(t, "FORWARDED_HOST", record["http.request.header.x-forwarded-host"])
// }
//
Loading