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

bump go.opentelemetry.io/collector/confmap from 0.69.0 to 0.78.2 in /receiver/postgresqlreceiver #10647

Closed
wants to merge 2 commits into from
Closed

bump go.opentelemetry.io/collector/confmap from 0.69.0 to 0.78.2 in /receiver/postgresqlreceiver #10647

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
8fc2b58
[chore] [exporter/carbon] Update tests to not use Map.Sort
dmitryax Jan 10, 2023
0cd9f87
bump go.opentelemetry.io/collector/confmap
dependabot[bot] May 30, 2023
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
99 changes: 57 additions & 42 deletions exporter/carbonexporter/metricdata_to_plaintext_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func TestBuildPath(t *testing.T) {
}

func TestToPlaintext(t *testing.T) {
expectedTagsStr := ";k0=v0;k1=v1"
expectedTagsCombinations := []string{";k0=v0;k1=v1", ";k1=v1;k0=v0"}

unixSecs := int64(1574092046)
expectedUnixSecsStr := strconv.FormatInt(unixSecs, 10)
Expand All @@ -148,7 +148,7 @@ func TestToPlaintext(t *testing.T) {
tests := []struct {
name string
metricsDataFn func() pmetric.Metrics
wantLines []string
wantLines [][]string
wantNumConvertedTimeseries int
wantNumDroppedTimeseries int
}{
Expand Down Expand Up @@ -179,11 +179,13 @@ func TestToPlaintext(t *testing.T) {
return md

},
wantLines: []string{
"gauge_double_no_dims " + expectedDobuleValStr + " " + expectedUnixSecsStr,
"gauge_int_no_dims " + expectedInt64ValStr + " " + expectedUnixSecsStr,
"cumulative_double_no_dims " + expectedDobuleValStr + " " + expectedUnixSecsStr,
"cumulative_int_no_dims " + expectedInt64ValStr + " " + expectedUnixSecsStr,
wantLines: [][]string{
{
"gauge_double_no_dims " + expectedDobuleValStr + " " + expectedUnixSecsStr,
"gauge_int_no_dims " + expectedInt64ValStr + " " + expectedUnixSecsStr,
"cumulative_double_no_dims " + expectedDobuleValStr + " " + expectedUnixSecsStr,
"cumulative_int_no_dims " + expectedInt64ValStr + " " + expectedUnixSecsStr,
},
},
wantNumConvertedTimeseries: 4,
},
Expand Down Expand Up @@ -221,12 +223,18 @@ func TestToPlaintext(t *testing.T) {
dps4.At(0).SetIntValue(int64Val)
return md
},
wantLines: []string{
"gauge_double_with_dims" + expectedTagsStr + " " + expectedDobuleValStr + " " + expectedUnixSecsStr,
"gauge_int_with_dims" + expectedTagsStr + " " + expectedInt64ValStr + " " + expectedUnixSecsStr,
"cumulative_double_with_dims" + expectedTagsStr + " " + expectedDobuleValStr + " " + expectedUnixSecsStr,
"cumulative_int_with_dims" + expectedTagsStr + " " + expectedInt64ValStr + " " + expectedUnixSecsStr,
},
wantLines: func() [][]string {
combinations := make([][]string, 0, len(expectedTagsCombinations))
for _, tags := range expectedTagsCombinations {
combinations = append(combinations, []string{
"gauge_double_with_dims" + tags + " " + expectedDobuleValStr + " " + expectedUnixSecsStr,
"gauge_int_with_dims" + tags + " " + expectedInt64ValStr + " " + expectedUnixSecsStr,
"cumulative_double_with_dims" + tags + " " + expectedDobuleValStr + " " + expectedUnixSecsStr,
"cumulative_int_with_dims" + tags + " " + expectedInt64ValStr + " " + expectedUnixSecsStr,
})
}
return combinations
}(),
wantNumConvertedTimeseries: 4,
},
{
Expand All @@ -239,15 +247,14 @@ func TestToPlaintext(t *testing.T) {
dp := ms.At(0).SetEmptyHistogram().DataPoints().AppendEmpty()
dp.SetTimestamp(pcommon.NewTimestampFromTime(tsUnix))
assert.NoError(t, dp.Attributes().FromRaw(map[string]interface{}{"k0": "v0", "k1": "v1"}))
dp.Attributes().Sort() // ensures result order
dp.SetCount(distributionCount)
dp.SetSum(distributionSum)
dp.ExplicitBounds().FromRaw(distributionBounds)
dp.BucketCounts().FromRaw(distributionCounts)
return md
},
wantLines: expectedDistributionLines(
"distrib", expectedTagsStr, expectedUnixSecsStr,
"distrib", expectedTagsCombinations, expectedUnixSecsStr,
distributionSum,
distributionCount,
distributionBounds,
Expand All @@ -263,7 +270,6 @@ func TestToPlaintext(t *testing.T) {
dp := ms.At(0).SetEmptySummary().DataPoints().AppendEmpty()
dp.SetTimestamp(pcommon.NewTimestampFromTime(tsUnix))
assert.NoError(t, dp.Attributes().FromRaw(map[string]interface{}{"k0": "v0", "k1": "v1"}))
dp.Attributes().Sort() // ensures result order
dp.SetCount(summaryCount)
dp.SetSum(summarySum)
for i := range summaryQuantiles {
Expand All @@ -274,7 +280,7 @@ func TestToPlaintext(t *testing.T) {
return md
},
wantLines: expectedSummaryLines(
"summary", expectedTagsStr, expectedUnixSecsStr,
"summary", expectedTagsCombinations, expectedUnixSecsStr,
summarySum,
summaryCount,
summaryQuantiles,
Expand All @@ -287,49 +293,58 @@ func TestToPlaintext(t *testing.T) {
gotLines := metricDataToPlaintext(tt.metricsDataFn())
got := strings.Split(gotLines, "\n")
got = got[:len(got)-1]
assert.Equal(t, tt.wantLines, got)
assert.Contains(t, tt.wantLines, got)
})
}
}

func expectedDistributionLines(
metricName, tags, timestampStr string,
metricName string,
tagsCombinations []string,
timestampStr string,
sum float64,
count uint64,
bounds []float64,
counts []uint64,
) []string {
lines := []string{
metricName + ".count" + tags + " " + formatInt64(int64(count)) + " " + timestampStr,
metricName + tags + " " + formatFloatForLabel(sum) + " " + timestampStr,
}

for i, bound := range bounds {
) [][]string {
combinations := make([][]string, 0, len(tagsCombinations))
for _, tags := range tagsCombinations {
lines := []string{
metricName + ".count" + tags + " " + formatInt64(int64(count)) + " " + timestampStr,
metricName + tags + " " + formatFloatForLabel(sum) + " " + timestampStr,
}
for i, bound := range bounds {
lines = append(lines,
metricName+".bucket"+tags+";upper_bound="+formatFloatForLabel(bound)+" "+formatInt64(int64(counts[i]))+" "+timestampStr)
}
lines = append(lines,
metricName+".bucket"+tags+";upper_bound="+formatFloatForLabel(bound)+" "+formatInt64(int64(counts[i]))+" "+timestampStr)
metricName+".bucket"+tags+";upper_bound=inf "+formatInt64(int64(counts[len(bounds)]))+" "+timestampStr)
combinations = append(combinations, lines)
}
lines = append(lines,
metricName+".bucket"+tags+";upper_bound=inf "+formatInt64(int64(counts[len(bounds)]))+" "+timestampStr)

return lines
return combinations
}

func expectedSummaryLines(
metricName, tags, timestampStr string,
metricName string,
tagsCombinations []string,
timestampStr string,
sum float64,
count uint64,
summaryQuantiles []float64,
summaryQuantileValues []float64,
) []string {
lines := []string{
metricName + ".count" + tags + " " + formatInt64(int64(count)) + " " + timestampStr,
metricName + tags + " " + formatFloatForValue(sum) + " " + timestampStr,
}

for i := range summaryQuantiles {
lines = append(lines,
metricName+".quantile"+tags+";quantile="+formatFloatForLabel(summaryQuantiles[i])+" "+formatFloatForValue(summaryQuantileValues[i])+" "+timestampStr)
) [][]string {
combinations := make([][]string, 0, len(tagsCombinations))
for _, tags := range tagsCombinations {
lines := []string{
metricName + ".count" + tags + " " + formatInt64(int64(count)) + " " + timestampStr,
metricName + tags + " " + formatFloatForValue(sum) + " " + timestampStr,
}
for i := range summaryQuantiles {
lines = append(lines,
metricName+".quantile"+tags+";quantile="+formatFloatForLabel(summaryQuantiles[i])+" "+formatFloatForValue(summaryQuantileValues[i])+" "+timestampStr)
}
combinations = append(combinations, lines)
}

return lines
return combinations
}
13 changes: 6 additions & 7 deletions receiver/postgresqlreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ go 1.18
require (
github.com/lib/pq v1.10.7
github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.69.0
github.com/stretchr/testify v1.8.1
github.com/stretchr/testify v1.8.2
github.com/testcontainers/testcontainers-go v0.17.0
go.opentelemetry.io/collector v0.69.0
go.opentelemetry.io/collector/component v0.69.0
go.opentelemetry.io/collector/confmap v0.69.0
go.opentelemetry.io/collector/confmap v0.78.2
go.opentelemetry.io/collector/consumer v0.69.0
go.opentelemetry.io/collector/featuregate v0.69.0
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012
go.opentelemetry.io/collector/pdata v1.0.0-rc3.0.20230109164642-7d168dd20efd
go.uber.org/multierr v1.9.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.24.0
)

Expand All @@ -33,7 +33,7 @@ require (
github.com/google/uuid v1.3.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.13 // indirect
github.com/knadh/koanf v1.4.4 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
Expand All @@ -48,7 +48,6 @@ require (
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/opencontainers/runc v1.1.3 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
Expand All @@ -60,7 +59,7 @@ require (
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/goleak v1.1.12 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.6.0 // indirect
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
google.golang.org/grpc v1.51.0 // indirect
Expand Down
32 changes: 16 additions & 16 deletions receiver/postgresqlreceiver/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.