Skip to content

[7.x] Enable transaction aggregation by default (#4882) #5000

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

Merged
axw merged 2 commits into from
Mar 25, 2021
Merged

[7.x] Enable transaction aggregation by default (#4882) #5000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2c3a47
Enable transaction aggregation by default (#4882)
axw Mar 3, 2021
999e9e8
Merge branch '7.x' into backport/7.x/pr-4882
mergify[bot] Mar 25, 2021
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
1 change: 1 addition & 0 deletions beater/config/aggregation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ type ServiceDestinationAggregationConfig struct {
func defaultAggregationConfig() AggregationConfig {
return AggregationConfig{
Transactions: TransactionAggregationConfig{
Enabled: true,
Interval: defaultTransactionAggregationInterval,
MaxTransactionGroups: defaultTransactionAggregationMaxGroups,
HDRHistogramSignificantFigures: defaultTransactionAggregationHDRHistogramSignificantFigures,
Expand Down
8 changes: 4 additions & 4 deletions beater/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func TestUnpackConfig(t *testing.T) {
},
"aggregation": map[string]interface{}{
"transactions": map[string]interface{}{
"enabled": true,
"enabled": false,
"interval": "1s",
"max_groups": 123,
"hdrhistogram_significant_figures": 1,
Expand Down Expand Up @@ -223,7 +223,7 @@ func TestUnpackConfig(t *testing.T) {
},
Aggregation: AggregationConfig{
Transactions: TransactionAggregationConfig{
Enabled: true,
Enabled: false,
Interval: time.Second,
MaxTransactionGroups: 123,
HDRHistogramSignificantFigures: 1,
Expand Down Expand Up @@ -280,7 +280,7 @@ func TestUnpackConfig(t *testing.T) {
},
"jaeger.grpc.enabled": true,
"api_key.enabled": true,
"aggregation.transactions.enabled": true,
"aggregation.transactions.enabled": false,
"aggregation.service_destinations.enabled": false,
"sampling.keep_unsampled": false,
"sampling.tail": map[string]interface{}{
Expand Down Expand Up @@ -359,7 +359,7 @@ func TestUnpackConfig(t *testing.T) {
APIKeyConfig: &APIKeyConfig{Enabled: true, LimitPerMin: 100, ESConfig: elasticsearch.DefaultConfig()},
Aggregation: AggregationConfig{
Transactions: TransactionAggregationConfig{
Enabled: true,
Enabled: false,
Interval: time.Minute,
MaxTransactionGroups: 10000,
HDRHistogramSignificantFigures: 2,
Expand Down
3 changes: 3 additions & 0 deletions systemtest/sampling_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ func TestKeepUnsampledWarning(t *testing.T) {
systemtest.CleanupElasticsearch(t)
srv := apmservertest.NewUnstartedServer(t)
srv.Config.Sampling = &apmservertest.SamplingConfig{KeepUnsampled: false}
srv.Config.Aggregation = &apmservertest.AggregationConfig{
Transactions: &apmservertest.TransactionAggregationConfig{Enabled: false},
}
require.NoError(t, srv.Start())
require.NoError(t, srv.Close())

Expand Down