Skip to content

Commit 145bde3

Browse files
authored
Merge branch 'main' into sili-metadata-key1
2 parents 7580eca + bf9fa31 commit 145bde3

File tree

13 files changed

+15
-15
lines changed

13 files changed

+15
-15
lines changed

component/component_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
func TestKindString(t *testing.T) {
13-
assert.Equal(t, "", Kind{}.String())
13+
assert.Empty(t, Kind{}.String())
1414
assert.Equal(t, "Receiver", KindReceiver.String())
1515
assert.Equal(t, "Processor", KindProcessor.String())
1616
assert.Equal(t, "Exporter", KindExporter.String())
@@ -78,7 +78,7 @@ func TestStabilityLevelString(t *testing.T) {
7878
assert.Equal(t, "Alpha", StabilityLevelAlpha.String())
7979
assert.Equal(t, "Beta", StabilityLevelBeta.String())
8080
assert.Equal(t, "Stable", StabilityLevelStable.String())
81-
assert.Equal(t, "", StabilityLevel(100).String())
81+
assert.Empty(t, StabilityLevel(100).String())
8282
}
8383

8484
func TestStabilityLevelLogMessage(t *testing.T) {

exporter/otlphttpexporter/factory_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestCreateDefaultConfig(t *testing.T) {
2929
require.NoError(t, componenttest.CheckConfigStruct(cfg))
3030
ocfg, ok := factory.CreateDefaultConfig().(*Config)
3131
assert.True(t, ok)
32-
assert.Equal(t, "", ocfg.ClientConfig.Endpoint)
32+
assert.Empty(t, ocfg.ClientConfig.Endpoint)
3333
assert.Equal(t, 30*time.Second, ocfg.ClientConfig.Timeout, "default timeout is 30 second")
3434
assert.True(t, ocfg.RetryConfig.Enabled, "default retry is enabled")
3535
assert.Equal(t, 300*time.Second, ocfg.RetryConfig.MaxElapsedTime, "default retry MaxElapsedTime")

internal/memorylimiter/cgroups/mountpoint_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func TestMountPointTranslateError(t *testing.T) {
170170
path: path,
171171
}
172172

173-
assert.Equal(t, "", translated, "inaccessiblePaths[%d] == %q", i, path)
173+
assert.Empty(t, translated, "inaccessiblePaths[%d] == %q", i, path)
174174
assert.Equal(t, errExpected, err, "inaccessiblePaths[%d] == %q", i, path)
175175
}
176176

@@ -183,7 +183,7 @@ func TestMountPointTranslateError(t *testing.T) {
183183
for i, path := range relPaths {
184184
translated, err := cgroupMountPoint.Translate(path)
185185

186-
assert.Equal(t, "", translated, "relPaths[%d] == %q", i, path)
186+
assert.Empty(t, translated, "relPaths[%d] == %q", i, path)
187187
assert.Error(t, err, path)
188188
}
189189
}

pdata/pcommon/spanid_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestNewSpanIDEmpty(t *testing.T) {
2323

2424
func TestSpanIDString(t *testing.T) {
2525
sid := SpanID([8]byte{})
26-
assert.Equal(t, "", sid.String())
26+
assert.Empty(t, sid.String())
2727

2828
sid = SpanID([8]byte{0x12, 0x23, 0xAD, 0x12, 0x23, 0xAD, 0x12, 0x23})
2929
assert.Equal(t, "1223ad1223ad1223", sid.String())

pdata/pcommon/trace_state_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestTraceState_CopyTo(t *testing.T) {
3131

3232
func TestTraceState_FromRaw_AsRaw(t *testing.T) {
3333
ms := NewTraceState()
34-
assert.Equal(t, "", ms.AsRaw())
34+
assert.Empty(t, ms.AsRaw())
3535
ms.FromRaw("congo=t61rcWkgMzE")
3636
assert.Equal(t, "congo=t61rcWkgMzE", ms.AsRaw())
3737
}

pdata/pcommon/traceid_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestNewTraceIDEmpty(t *testing.T) {
2323

2424
func TestTraceIDString(t *testing.T) {
2525
tid := TraceID([16]byte{})
26-
assert.Equal(t, "", tid.String())
26+
assert.Empty(t, tid.String())
2727

2828
tid = [16]byte{0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78}
2929
assert.Equal(t, "12345678123456781234567812345678", tid.String())

pdata/pcommon/value_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ func TestInvalidValue(t *testing.T) {
560560
assert.False(t, v.Bool())
561561
assert.Equal(t, int64(0), v.Int())
562562
assert.InDelta(t, float64(0), v.Double(), 0.01)
563-
assert.Equal(t, "", v.Str())
563+
assert.Empty(t, v.Str())
564564
assert.Equal(t, ByteSlice{}, v.Bytes())
565565
assert.Equal(t, Map{}, v.Map())
566566
assert.Equal(t, Slice{}, v.Slice())

pdata/pmetric/aggregation_temporality_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ func TestAggregationTemporalityString(t *testing.T) {
1313
assert.Equal(t, "Unspecified", AggregationTemporalityUnspecified.String())
1414
assert.Equal(t, "Delta", AggregationTemporalityDelta.String())
1515
assert.Equal(t, "Cumulative", AggregationTemporalityCumulative.String())
16-
assert.Equal(t, "", (AggregationTemporalityCumulative + 1).String())
16+
assert.Empty(t, (AggregationTemporalityCumulative + 1).String())
1717
}

pdata/pmetric/exemplar_value_type_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ func TestExemplarValueTypeString(t *testing.T) {
1313
assert.Equal(t, "Empty", ExemplarValueTypeEmpty.String())
1414
assert.Equal(t, "Int", ExemplarValueTypeInt.String())
1515
assert.Equal(t, "Double", ExemplarValueTypeDouble.String())
16-
assert.Equal(t, "", (ExemplarValueTypeDouble + 1).String())
16+
assert.Empty(t, (ExemplarValueTypeDouble + 1).String())
1717
}

pdata/pmetric/metric_type_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ func TestMetricTypeString(t *testing.T) {
1616
assert.Equal(t, "Histogram", MetricTypeHistogram.String())
1717
assert.Equal(t, "ExponentialHistogram", MetricTypeExponentialHistogram.String())
1818
assert.Equal(t, "Summary", MetricTypeSummary.String())
19-
assert.Equal(t, "", (MetricTypeSummary + 1).String())
19+
assert.Empty(t, (MetricTypeSummary + 1).String())
2020
}

0 commit comments

Comments
 (0)