Skip to content

Commit

Permalink
Merge branch 'opentelemetrybot/update-otel-1737650898' into mx-psi/fi…
Browse files Browse the repository at this point in the history
…x-otelarrow
  • Loading branch information
mx-psi authored Jan 24, 2025
2 parents 9c8f47a + c37b272 commit 59a68ae
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions exporter/otelarrowexporter/metadata_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ func TestSendTracesWithMetadata(t *testing.T) {
},
}
cfg.Arrow.MaxStreamLifetime = 100 * time.Second
cfg.QueueSettings.Enabled = false

cfg.MetadataCardinalityLimit = 10
cfg.MetadataKeys = []string{"key1", "key2"}
Expand Down
7 changes: 3 additions & 4 deletions exporter/otelarrowexporter/otelarrow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -932,10 +932,9 @@ func testSendArrowTraces(t *testing.T, clientWaitForReady, streamServiceAvailabl
},
}
// Arrow client is enabled, but the server doesn't support it.
cfg.Arrow = ArrowConfig{
NumStreams: 1,
MaxStreamLifetime: 100 * time.Second,
}
cfg.Arrow.NumStreams = 1
cfg.Arrow.MaxStreamLifetime = 100 * time.Second
cfg.QueueSettings.Enabled = false

set := exportertest.NewNopSettings()
set.TelemetrySettings.Logger = zaptest.NewLogger(t)
Expand Down

0 comments on commit 59a68ae

Please sign in to comment.