forked from elastic/apm-server
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
decoder v2: add metricset (elastic#4333)
Add support for metricset to model decoder/v2 part of elastic#3551
- Loading branch information
Showing
12 changed files
with
783 additions
and
360 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package v2 | ||
|
|
||
| import ( | ||
| "strings" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/elastic/apm-server/decoder" | ||
| "github.com/elastic/apm-server/model" | ||
| "github.com/elastic/apm-server/model/modeldecoder" | ||
| "github.com/elastic/apm-server/model/modeldecoder/modeldecodertest" | ||
| ) | ||
|
|
||
| func TestResetMetricsetOnRelease(t *testing.T) { | ||
| inp := `{"metricset":{"samples":{"a.b.":{"value":2048}}}}` | ||
| root := fetchMetricsetRoot() | ||
| require.NoError(t, decoder.NewJSONDecoder(strings.NewReader(inp)).Decode(root)) | ||
| require.True(t, root.IsSet()) | ||
| releaseMetricsetRoot(root) | ||
| assert.False(t, root.IsSet()) | ||
| } | ||
|
|
||
| func TestDecodeNestedMetricset(t *testing.T) { | ||
| t.Run("decode", func(t *testing.T) { | ||
| now := time.Now() | ||
| input := modeldecoder.Input{Metadata: model.Metadata{}, RequestTime: now, Config: modeldecoder.Config{}} | ||
| str := `{"metricset":{"timestamp":1599996822281000,"samples":{"a.b":{"value":2048}}}}` | ||
| dec := decoder.NewJSONDecoder(strings.NewReader(str)) | ||
| var out model.Metricset | ||
| require.NoError(t, DecodeNestedMetricset(dec, &input, &out)) | ||
| assert.Equal(t, []model.Sample{{Name: "a.b", Value: 2048}}, out.Samples) | ||
| assert.Equal(t, "2020-09-13 11:33:42.281 +0000 UTC", out.Timestamp.String()) | ||
|
|
||
| // invalid type | ||
| err := DecodeNestedMetricset(decoder.NewJSONDecoder(strings.NewReader(`malformed`)), &input, &out) | ||
| require.Error(t, err) | ||
| assert.Contains(t, err.Error(), "decode") | ||
| }) | ||
|
|
||
| t.Run("validate", func(t *testing.T) { | ||
| var out model.Metricset | ||
| err := DecodeNestedMetricset(decoder.NewJSONDecoder(strings.NewReader(`{}`)), &modeldecoder.Input{}, &out) | ||
| require.Error(t, err) | ||
| assert.Contains(t, err.Error(), "validation") | ||
| }) | ||
| } | ||
|
|
||
| func TestDecodeMapToMetricsetModel(t *testing.T) { | ||
| // gatewayIP := net.ParseIP("192.168.0.1") | ||
| // randomIP := net.ParseIP("71.0.54.1") | ||
| exceptions := func(key string) bool { return false } | ||
|
|
||
| t.Run("metadata-set", func(t *testing.T) { | ||
| // set metadata - metricsets do not hold metadata themselves | ||
| var input metricset | ||
| var out model.Metricset | ||
| otherVal := modeldecodertest.NonDefaultValues() | ||
| modeldecodertest.SetStructValues(&input, otherVal) | ||
| mapToMetricsetModel(&input, initializedMetadata(), time.Now(), modeldecoder.Config{}, &out) | ||
| // iterate through metadata model and assert values are set to default values | ||
| modeldecodertest.AssertStructValues(t, &out.Metadata, exceptions, modeldecodertest.DefaultValues()) | ||
| }) | ||
|
|
||
| t.Run("metricset-values", func(t *testing.T) { | ||
| exceptions := func(key string) bool { | ||
| // metadata are tested separately | ||
| if strings.HasPrefix(key, "Metadata") || | ||
| // only set by aggregator | ||
| strings.HasPrefix(key, "Event") || | ||
| key == "TimeseriesInstanceID" || | ||
| key == "Transaction.Result" || | ||
| key == "Transaction.Root" || | ||
| strings.HasPrefix(key, "Span.DestinationService") || | ||
| // test Samples separately | ||
| strings.HasPrefix(key, "Samples") { | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| var input metricset | ||
| var out1, out2 model.Metricset | ||
| reqTime := time.Now().Add(time.Second) | ||
| defaultVal := modeldecodertest.DefaultValues() | ||
| modeldecodertest.SetStructValues(&input, defaultVal) | ||
| mapToMetricsetModel(&input, initializedMetadata(), reqTime, modeldecoder.Config{}, &out1) | ||
| input.Reset() | ||
| modeldecodertest.AssertStructValues(t, &out1, exceptions, defaultVal) | ||
| defaultSamples := []model.Sample{ | ||
| {Name: defaultVal.Str + "0", Value: defaultVal.Float}, | ||
| {Name: defaultVal.Str + "1", Value: defaultVal.Float}, | ||
| {Name: defaultVal.Str + "2", Value: defaultVal.Float}, | ||
| } | ||
| assert.ElementsMatch(t, defaultSamples, out1.Samples) | ||
|
|
||
| // set Timestamp to requestTime if eventTime is zero | ||
| defaultVal.Update(time.Time{}) | ||
| modeldecodertest.SetStructValues(&input, defaultVal) | ||
| mapToMetricsetModel(&input, initializedMetadata(), reqTime, modeldecoder.Config{}, &out1) | ||
| defaultVal.Update(reqTime) | ||
| input.Reset() | ||
| modeldecodertest.AssertStructValues(t, &out1, exceptions, defaultVal) | ||
|
|
||
| // ensure memory is not shared by reusing input model | ||
| otherVal := modeldecodertest.NonDefaultValues() | ||
| modeldecodertest.SetStructValues(&input, otherVal) | ||
| mapToMetricsetModel(&input, initializedMetadata(), reqTime, modeldecoder.Config{}, &out2) | ||
| modeldecodertest.AssertStructValues(t, &out2, exceptions, otherVal) | ||
| otherSamples := []model.Sample{ | ||
| {Name: otherVal.Str + "0", Value: otherVal.Float}, | ||
| {Name: otherVal.Str + "1", Value: otherVal.Float}, | ||
| } | ||
| assert.ElementsMatch(t, otherSamples, out2.Samples) | ||
| modeldecodertest.AssertStructValues(t, &out1, exceptions, defaultVal) | ||
| assert.ElementsMatch(t, defaultSamples, out1.Samples) | ||
| }) | ||
| } |
Oops, something went wrong.