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

Mysqlreceiver #261

Closed
wants to merge 20 commits into from
Closed

Mysqlreceiver #261

Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
38bb599
Merge branch 'main' into normalizesums
JonathanWamsley Jul 7, 2021
c84926c
updated scraper to pdata metrics
JonathanWamsley Jul 8, 2021
58a8796
updated how metrics are collected w/o simple metrics
JonathanWamsley Jul 8, 2021
c4bd0ad
updated scraper test
JonathanWamsley Jul 8, 2021
95265c5
Merge branch 'normalizesums' into mysqlreceiver
djaglowski Jul 8, 2021
003ccd5
Merge branch 'normalizesums' into mysqlreceiver
dehaansa Jul 12, 2021
5a68ba6
combined port and address config option to endpoint
JonathanWamsley Jul 9, 2021
99acf7b
cleaned up client Query function
JonathanWamsley Jul 12, 2021
411d43c
corrected metric key name when tagging metrics
JonathanWamsley Jul 13, 2021
f42f368
added unit test for scraper
JonathanWamsley Jul 13, 2021
1d7bec1
added integration tests
JonathanWamsley Jul 13, 2021
8dcd68d
added comments
JonathanWamsley Jul 13, 2021
6ec636f
added doc
JonathanWamsley Jul 13, 2021
b767b78
added working integration test
JonathanWamsley Jul 13, 2021
5eca4c5
added license
JonathanWamsley Jul 13, 2021
1419c7b
cleaned comments
JonathanWamsley Jul 13, 2021
922e774
fixed linting issue
JonathanWamsley Jul 13, 2021
a704783
updated integration test with shell script
JonathanWamsley Jul 14, 2021
9721209
updated metrics: now every label does not have its own metric type
JonathanWamsley Jul 14, 2021
70526fc
updated how metadata is being added when initializing metrics in the …
JonathanWamsley Jul 15, 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
68 changes: 37 additions & 31 deletions processor/normalizesumsprocessor/processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ func TestNormalizeSumsProcessor(t *testing.T) {
},
{
name: "transform-all-happy-case",
inputs: generateSimpleInput(testStart),
expected: generateTransformAllCaseOutput(testStart),
inputs: generateLabelledInput(testStart),
expected: generateLabelledOutput(testStart),
transforms: nil,
},
{
Expand Down Expand Up @@ -173,12 +173,12 @@ func generateLabelledOutput(startTime int64) pdata.Metrics {
mb1 := b.addMetric("m1", pdata.MetricDataTypeIntSum, true)
// mb1.addIntDataPoint(1, map[string]string{"label": "val1"}, startTime, 0)
// mb1.addIntDataPoint(1, map[string]string{"label": "val2"}, startTime, 0)
mb1.addIntDataPoint(1, map[string]string{"label": "val1"}, startTime+1000, startTime)
mb1.addIntDataPoint(1, map[string]string{"label": "val2"}, startTime+1000, startTime)
mb1.addIntDataPoint(1, map[string]string{"label": "val1"}, startTime+2000, startTime)
mb1.addIntDataPoint(12, map[string]string{"label": "val1"}, startTime+1000, startTime)
mb1.addIntDataPoint(2, map[string]string{"label": "val2"}, startTime+1000, startTime)
mb1.addIntDataPoint(15, map[string]string{"label": "val1"}, startTime+2000, startTime)
//mb1.addIntDataPoint(1, map[string]string{"label": "val2"}, startTime+2000, 1)
mb1.addIntDataPoint(1, map[string]string{"label": "val1"}, startTime+3000, startTime)
mb1.addIntDataPoint(1, map[string]string{"label": "val2"}, startTime+3000, startTime+2000)
mb1.addIntDataPoint(22, map[string]string{"label": "val1"}, startTime+3000, startTime)
mb1.addIntDataPoint(10, map[string]string{"label": "val2"}, startTime+3000, startTime+2000)

rmb.Build().CopyTo(output.ResourceMetrics())
return output
Expand Down Expand Up @@ -353,7 +353,7 @@ func newResourceMetricsBuilder() resourceMetricsBuilder {
}

func (rmsb resourceMetricsBuilder) addResourceMetrics(resourceAttributes map[string]pdata.AttributeValue) metricsBuilder {
rm := pdata.NewResourceMetrics()
rm := rmsb.rms.AppendEmpty()

if resourceAttributes != nil {
rm.Resource().Attributes().InitFromMap(resourceAttributes)
Expand All @@ -362,7 +362,6 @@ func (rmsb resourceMetricsBuilder) addResourceMetrics(resourceAttributes map[str
rm.InstrumentationLibraryMetrics().Resize(1)
ilm := rm.InstrumentationLibraryMetrics().At(0)

rmsb.rms.Append(rm)
return metricsBuilder{metrics: ilm.Metrics()}
}

Expand All @@ -375,7 +374,7 @@ type metricsBuilder struct {
}

func (msb metricsBuilder) addMetric(name string, t pdata.MetricDataType, isMonotonic bool) metricBuilder {
metric := pdata.NewMetric()
metric := msb.metrics.AppendEmpty()
metric.SetName(name)
metric.SetDataType(t)

Expand All @@ -390,7 +389,6 @@ func (msb metricsBuilder) addMetric(name string, t pdata.MetricDataType, isMonot
sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative)
}

msb.metrics.Append(metric)
return metricBuilder{metric: metric}
}

Expand All @@ -399,38 +397,46 @@ type metricBuilder struct {
}

func (mb metricBuilder) addIntDataPoint(value int64, labels map[string]string, timestamp int64, startTimestamp int64) metricBuilder {
idp := pdata.NewIntDataPoint()
idp.LabelsMap().InitFromMap(labels)
idp.SetValue(value)
idp.SetTimestamp(pdata.TimestampFromTime(time.Unix(timestamp, 0)))
if startTimestamp > 0 {
idp.SetStartTimestamp(pdata.TimestampFromTime(time.Unix(startTimestamp, 0)))
}

switch mb.metric.DataType() {
case pdata.MetricDataTypeIntSum:
mb.metric.IntSum().DataPoints().Append(idp)
idp := mb.metric.IntSum().DataPoints().AppendEmpty()
idp.LabelsMap().InitFromMap(labels)
idp.SetValue(value)
idp.SetTimestamp(pdata.TimestampFromTime(time.Unix(timestamp, 0)))
if startTimestamp > 0 {
idp.SetStartTimestamp(pdata.TimestampFromTime(time.Unix(startTimestamp, 0)))
}
case pdata.MetricDataTypeIntGauge:
mb.metric.IntGauge().DataPoints().Append(idp)
idp := mb.metric.IntGauge().DataPoints().AppendEmpty()
idp.LabelsMap().InitFromMap(labels)
idp.SetValue(value)
idp.SetTimestamp(pdata.TimestampFromTime(time.Unix(timestamp, 0)))
if startTimestamp > 0 {
idp.SetStartTimestamp(pdata.TimestampFromTime(time.Unix(startTimestamp, 0)))
}
}

return mb
}

func (mb metricBuilder) addDoubleDataPoint(value float64, labels map[string]string, timestamp int64, startTimestamp int64) metricBuilder {
ddp := pdata.NewDoubleDataPoint()
ddp.LabelsMap().InitFromMap(labels)
ddp.SetValue(value)
ddp.SetTimestamp(pdata.TimestampFromTime(time.Unix(timestamp, 0)))
if startTimestamp > 0 {
ddp.SetStartTimestamp(pdata.TimestampFromTime(time.Unix(startTimestamp, 0)))
}

switch mb.metric.DataType() {
case pdata.MetricDataTypeDoubleSum:
mb.metric.DoubleSum().DataPoints().Append(ddp)
ddp := mb.metric.DoubleSum().DataPoints().AppendEmpty()
ddp.LabelsMap().InitFromMap(labels)
ddp.SetValue(value)
ddp.SetTimestamp(pdata.TimestampFromTime(time.Unix(timestamp, 0)))
if startTimestamp > 0 {
ddp.SetStartTimestamp(pdata.TimestampFromTime(time.Unix(startTimestamp, 0)))
}
case pdata.MetricDataTypeDoubleGauge:
mb.metric.DoubleGauge().DataPoints().Append(ddp)
ddp := mb.metric.DoubleGauge().DataPoints().AppendEmpty()
ddp.LabelsMap().InitFromMap(labels)
ddp.SetValue(value)
ddp.SetTimestamp(pdata.TimestampFromTime(time.Unix(timestamp, 0)))
if startTimestamp > 0 {
ddp.SetStartTimestamp(pdata.TimestampFromTime(time.Unix(startTimestamp, 0)))
}
}

return mb
Expand Down