Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support timeout in Collector Logs exporter #894

Merged
merged 3 commits into from
Sep 18, 2024
Merged

Support timeout in Collector Logs exporter #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90a699a
Support timeout in Collector Logs exporter
damemi Sep 17, 2024
fd6d702
Add default timeout
damemi Sep 18, 2024
ac62f2c
Add duration to test
damemi Sep 18, 2024
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
2 changes: 2 additions & 0 deletions exporter/collector/integrationtest/inmemoryotelexporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,14 @@ func NewLogTestExporter(
logger, err := zap.NewDevelopment()
require.NoError(t, err)

var duration time.Duration
exporter, err := collector.NewGoogleCloudLogsExporter(
ctx,
cfg,
logger,
meterProvider,
"latest",
duration,
)
require.NoError(t, err)

Expand Down
3 changes: 3 additions & 0 deletions exporter/collector/integrationtest/logs_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,15 @@ func createLogsExporter(
cfg := test.CreateLogConfig()
// For sending to a real project, set the project ID from an env var.
cfg.ProjectID = os.Getenv("PROJECT_ID")

var duration time.Duration
exporter, err := collector.NewGoogleCloudLogsExporter(
ctx,
cfg,
logger,
noop.NewMeterProvider(),
"latest",
duration,
)
require.NoError(t, err)
err = exporter.Start(ctx, componenttest.NewNopHost())
Expand Down
14 changes: 12 additions & 2 deletions exporter/collector/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ type LogsExporter struct {
loggingClient *loggingv2.Client
cfg Config
mapper logMapper
timeout time.Duration
}

type logMapper struct {
Expand All @@ -163,6 +164,7 @@ func NewGoogleCloudLogsExporter(
log *zap.Logger,
meterProvider metric.MeterProvider,
version string,
timeout time.Duration,
) (*LogsExporter, error) {
setVersionInUserAgent(&cfg, version)
obs := selfObservability{
Expand All @@ -171,8 +173,9 @@ func NewGoogleCloudLogsExporter(
}

return &LogsExporter{
cfg: cfg,
obs: obs,
cfg: cfg,
obs: obs,
timeout: timeout,
mapper: logMapper{
obs: obs,
cfg: cfg,
Expand Down Expand Up @@ -364,6 +367,13 @@ func mergeLogLabels(instrumentationSource, instrumentationVersion string, resour
}

func (l *LogsExporter) writeLogEntries(ctx context.Context, batch []*logpb.LogEntry) (*logpb.WriteLogEntriesResponse, error) {
timeout := l.timeout
if timeout <= 0 {
timeout = 12 * time.Second
}
ctx, cancel := context.WithTimeout(ctx, timeout)
defer cancel()

request := &logpb.WriteLogEntriesRequest{
PartialSuccess: true,
Entries: batch,
Expand Down
Loading