Skip to content

Commit 69bd759

Browse files
authored
Adds sdk changes necessary for adding Entity field to CW Logs PutLogEvent API (#231)
1 parent 5944792 commit 69bd759

File tree

11 files changed

+22258
-8
lines changed

11 files changed

+22258
-8
lines changed

exporter/awscloudwatchlogsexporter/exporter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313

1414
"github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware"
1515
"github.com/aws/aws-sdk-go/aws"
16-
"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
1716
"github.com/google/uuid"
1817
"go.opentelemetry.io/collector/component"
1918
"go.opentelemetry.io/collector/consumer"
@@ -25,6 +24,7 @@ import (
2524

2625
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
2726
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs"
27+
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs/sdk/service/cloudwatchlogs"
2828
)
2929

3030
type cwlExporter struct {

exporter/awscloudwatchlogsexporter/exporter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212

1313
"github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware"
1414
"github.com/aws/aws-sdk-go/aws"
15-
"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
1615
"github.com/stretchr/testify/assert"
1716
"github.com/stretchr/testify/mock"
1817
"github.com/stretchr/testify/require"
@@ -22,6 +21,7 @@ import (
2221
"go.opentelemetry.io/collector/pdata/plog"
2322

2423
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs"
24+
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs/sdk/service/cloudwatchlogs"
2525
)
2626

2727
func init() {

internal/aws/cwlogs/cwlog_client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212
"github.com/aws/aws-sdk-go/aws/awserr"
1313
"github.com/aws/aws-sdk-go/aws/request"
1414
"github.com/aws/aws-sdk-go/aws/session"
15-
"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
16-
"github.com/aws/aws-sdk-go/service/cloudwatchlogs/cloudwatchlogsiface"
1715
"go.opentelemetry.io/collector/component"
1816
"go.uber.org/zap"
1917

2018
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs/handler"
19+
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs/sdk/service/cloudwatchlogs"
20+
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs/sdk/service/cloudwatchlogs/cloudwatchlogsiface"
2121
)
2222

2323
const (

internal/aws/cwlogs/cwlog_client_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ import (
1313
"github.com/aws/aws-sdk-go/aws/client/metadata"
1414
"github.com/aws/aws-sdk-go/aws/request"
1515
"github.com/aws/aws-sdk-go/aws/session"
16-
"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
17-
"github.com/aws/aws-sdk-go/service/cloudwatchlogs/cloudwatchlogsiface"
1816
"github.com/stretchr/testify/assert"
1917
"github.com/stretchr/testify/mock"
2018
"go.opentelemetry.io/collector/component"
2119
"go.uber.org/zap"
20+
21+
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs/sdk/service/cloudwatchlogs"
22+
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs/sdk/service/cloudwatchlogs/cloudwatchlogsiface"
2223
)
2324

2425
func newAlwaysPassMockLogClient(putLogEventsFunc func(args mock.Arguments)) *Client {

internal/aws/cwlogs/pusher.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import (
1010
"time"
1111

1212
"github.com/aws/aws-sdk-go/aws"
13-
"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
1413
"go.uber.org/zap"
14+
15+
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs/sdk/service/cloudwatchlogs"
1516
)
1617

1718
const (

internal/aws/cwlogs/pusher_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import (
1111
"time"
1212

1313
"github.com/aws/aws-sdk-go/aws"
14-
"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
1514
"github.com/stretchr/testify/assert"
1615
"github.com/stretchr/testify/mock"
1716
"go.uber.org/zap"
17+
18+
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs/sdk/service/cloudwatchlogs"
1819
)
1920

2021
// logEvent Tests

0 commit comments

Comments
 (0)