[chore] prefer usage of testify package vs manual checks (open-teleme…

…try#17964) Signed-off-by: Bogdan Drutu <[email protected]>
sakulali · Jan 24, 2023 · 6970681 · 6970681
1 parent 8a7c98d
commit 6970681
Show file tree

Hide file tree

Showing 44 changed files with 208 additions and 473 deletions.
diff --git a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go
@@ -15,7 +15,6 @@
 package alibabacloudlogserviceexporter
 
 import (
- "reflect"
  "sort"
  "testing"
  "time"
@@ -113,8 +112,6 @@ func TestLogsDataToLogService(t *testing.T) {
 
  sort.Sort(logKeyValuePairs(gotLogPairs[j]))
  sort.Sort(logKeyValuePairs(wantLogs[j]))
- if !reflect.DeepEqual(gotLogPairs[j], wantLogs[j]) {
- t.Errorf("Unsuccessful conversion \nGot:\n\t%v\nWant:\n\t%v", gotLogPairs, wantLogs)
- }
+ assert.Equal(t, wantLogs[j], gotLogPairs[j])
  }
 }
diff --git a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice_test.go
@@ -15,7 +15,6 @@
 package alibabacloudlogserviceexporter
 
 import (
- "reflect"
  "sort"
  "testing"
 
@@ -137,9 +136,7 @@ func TestMetricDataToLogService(t *testing.T) {
  for j := 0; j < len(gotLogs); j++ {
  sort.Sort(logKeyValuePairs(gotLogPairs[j]))
  sort.Sort(logKeyValuePairs(wantLogs[j]))
- if !reflect.DeepEqual(gotLogPairs[j], wantLogs[j]) {
- t.Errorf("Unsuccessful conversion \nGot:\n\t%v\nWant:\n\t%v", gotLogPairs, wantLogs)
- }
+ assert.Equal(t, wantLogs[j], gotLogPairs[j])
  }
 }
 

diff --git a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go
@@ -18,7 +18,6 @@ import (
  "encoding/json"
  "fmt"
  "os"
- "reflect"
  "sort"
  "testing"
  "time"
@@ -67,9 +66,7 @@ func TestTraceDataToLogService(t *testing.T) {
  for j := 0; j < len(gotLogs); j++ {
  sort.Sort(logKeyValuePairs(gotLogPairs[j]))
  sort.Sort(logKeyValuePairs(wantLogs[j]))
- if !reflect.DeepEqual(gotLogPairs[j], wantLogs[j]) {
- t.Errorf("Unsuccessful conversion \nGot:\n\t%v\nWant:\n\t%v", gotLogPairs[j], wantLogs[j])
- }
+ assert.Equal(t, wantLogs[j], gotLogPairs[j])
  }
 }
 

diff --git a/exporter/awsemfexporter/datapoint_test.go b/exporter/awsemfexporter/datapoint_test.go
@@ -858,9 +858,8 @@ func TestIntDataPointSlice_At(t *testing.T) {
  deltaMetricMetadata: tt.fields.deltaMetricMetadata,
  NumberDataPointSlice: tt.fields.NumberDataPointSlice,
  }
- if got, _ := dps.At(tt.args.i); !reflect.DeepEqual(got, tt.want) {
- t.Errorf("At() = %v, want %v", got, tt.want)
- }
+ got, _ := dps.At(tt.args.i)
+ assert.Equal(t, tt.want, got)
  })
  }
 }
diff --git a/exporter/awsemfexporter/metric_translator_test.go b/exporter/awsemfexporter/metric_translator_test.go
@@ -357,7 +357,7 @@ func assertDimsEqual(t *testing.T, expected, actual [][]string) {
  assert.Equal(t, len(expected), len(actual))
  expectedDimensions := normalizeDimensionality(expected)
  actualDimensions := normalizeDimensionality(actual)
- assert.True(t, reflect.DeepEqual(expectedDimensions, actualDimensions))
+ assert.Equal(t, expectedDimensions, actualDimensions)
 }
 
 // cWMeasurementEqual returns true if CW Measurements are equal.

diff --git a/exporter/awsxrayexporter/internal/translator/cause_test.go b/exporter/awsxrayexporter/internal/translator/cause_test.go
@@ -20,6 +20,7 @@ import (
  "time"
 
  "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
  conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
@@ -167,9 +168,7 @@ func TestCauseWithStatusMessage(t *testing.T) {
  assert.NotNil(t, filtered)
  assert.NotNil(t, cause)
  w := testWriters.borrow()
- if err := w.Encode(cause); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(cause))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, errorMsg))
@@ -194,9 +193,7 @@ func TestCauseWithHttpStatusMessage(t *testing.T) {
  assert.NotNil(t, filtered)
  assert.NotNil(t, cause)
  w := testWriters.borrow()
- if err := w.Encode(cause); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(cause))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, errorMsg))

diff --git a/exporter/awsxrayexporter/internal/translator/http_test.go b/exporter/awsxrayexporter/internal/translator/http_test.go
@@ -20,6 +20,7 @@ import (
  "time"
 
  "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
  conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
@@ -37,9 +38,7 @@ func TestClientSpanWithURLAttribute(t *testing.T) {
  assert.NotNil(t, httpData)
  assert.NotNil(t, filtered)
  w := testWriters.borrow()
- if err := w.Encode(httpData); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(httpData))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, "https://api.example.com/users/junit"))
@@ -60,9 +59,7 @@ func TestClientSpanWithSchemeHostTargetAttributes(t *testing.T) {
  assert.NotNil(t, httpData)
  assert.NotNil(t, filtered)
  w := testWriters.borrow()
- if err := w.Encode(httpData); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(httpData))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, "https://api.example.com/users/junit"))
@@ -87,9 +84,7 @@ func TestClientSpanWithPeerAttributes(t *testing.T) {
  assert.Equal(t, "10.8.17.36", *httpData.Request.ClientIP)
 
  w := testWriters.borrow()
- if err := w.Encode(httpData); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(httpData))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, "http:https://kb234.example.com:8080/users/junit"))
@@ -122,9 +117,7 @@ func TestClientSpanWithPeerIp4Attributes(t *testing.T) {
  assert.NotNil(t, httpData)
  assert.NotNil(t, filtered)
  w := testWriters.borrow()
- if err := w.Encode(httpData); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(httpData))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, "http:https://10.8.17.36:8080/users/junit"))
@@ -143,9 +136,7 @@ func TestClientSpanWithPeerIp6Attributes(t *testing.T) {
  assert.NotNil(t, httpData)
  assert.NotNil(t, filtered)
  w := testWriters.borrow()
- if err := w.Encode(httpData); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(httpData))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, "https://2001:db8:85a3::8a2e:370:7334/users/junit"))
@@ -165,9 +156,7 @@ func TestServerSpanWithURLAttribute(t *testing.T) {
  assert.NotNil(t, httpData)
  assert.NotNil(t, filtered)
  w := testWriters.borrow()
- if err := w.Encode(httpData); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(httpData))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, "https://api.example.com/users/junit"))
@@ -188,9 +177,7 @@ func TestServerSpanWithSchemeHostTargetAttributes(t *testing.T) {
  assert.NotNil(t, httpData)
  assert.NotNil(t, filtered)
  w := testWriters.borrow()
- if err := w.Encode(httpData); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(httpData))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, "https://api.example.com/users/junit"))
@@ -212,9 +199,7 @@ func TestServerSpanWithSchemeServernamePortTargetAttributes(t *testing.T) {
  assert.NotNil(t, httpData)
  assert.NotNil(t, filtered)
  w := testWriters.borrow()
- if err := w.Encode(httpData); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(httpData))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, "https://api.example.com/users/junit"))
@@ -238,9 +223,7 @@ func TestServerSpanWithSchemeNamePortTargetAttributes(t *testing.T) {
  assert.NotNil(t, httpData)
  assert.NotNil(t, filtered)
  w := testWriters.borrow()
- if err := w.Encode(httpData); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(httpData))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, "http:https://kb234.example.com:8080/users/junit"))

diff --git a/exporter/awsxrayexporter/internal/translator/segment_test.go b/exporter/awsxrayexporter/internal/translator/segment_test.go
@@ -23,6 +23,7 @@ import (
  "time"
 
  "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
  conventions "go.opentelemetry.io/collector/semconv/v1.8.0"
@@ -259,9 +260,7 @@ func TestClientSpanWithDbComponent(t *testing.T) {
  assert.Equal(t, "remote", *segment.Namespace)
 
  w := testWriters.borrow()
- if err := w.Encode(segment); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(segment))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, spanName))

diff --git a/exporter/awsxrayexporter/internal/translator/service_test.go b/exporter/awsxrayexporter/internal/translator/service_test.go
@@ -19,6 +19,7 @@ import (
  "testing"
 
  "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
  "go.opentelemetry.io/collector/pdata/pcommon"
  conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 )
@@ -30,9 +31,7 @@ func TestServiceFromResource(t *testing.T) {
 
  assert.NotNil(t, service)
  w := testWriters.borrow()
- if err := w.Encode(service); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(service))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, "semver:1.1.4"))
@@ -45,9 +44,7 @@ func TestServiceFromResourceWithNoServiceVersion(t *testing.T) {
 
  assert.NotNil(t, service)
  w := testWriters.borrow()
- if err := w.Encode(service); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(service))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, "v1"))

diff --git a/exporter/awsxrayexporter/internal/translator/sql_test.go b/exporter/awsxrayexporter/internal/translator/sql_test.go
@@ -20,6 +20,7 @@ import (
  "time"
 
  "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
  conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
@@ -42,9 +43,7 @@ func TestClientSpanWithStatementAttribute(t *testing.T) {
  assert.NotNil(t, sqlData)
 
  w := testWriters.borrow()
- if err := w.Encode(sqlData); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(sqlData))
  jsonStr := w.String()
  testWriters.release(w)
  assert.True(t, strings.Contains(jsonStr, "mysql:https://db.example.com:3306/customers"))

diff --git a/exporter/awsxrayexporter/internal/translator/writer_pool_test.go b/exporter/awsxrayexporter/internal/translator/writer_pool_test.go
@@ -20,6 +20,7 @@ import (
  "testing"
 
  "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
  conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
@@ -38,9 +39,7 @@ func TestWriterPoolBasic(t *testing.T) {
  assert.Equal(t, 0, w.buffer.Len())
  resource := pcommon.NewResource()
  segment, _ := MakeSegment(span, resource, nil, false, nil)
- if err := w.Encode(*segment); err != nil {
- assert.Fail(t, "invalid json")
- }
+ require.NoError(t, w.Encode(*segment))
  jsonStr := w.String()
  assert.Equal(t, len(jsonStr), w.buffer.Len())
  wp.release(w)

diff --git a/exporter/humioexporter/traces_exporter_test.go b/exporter/humioexporter/traces_exporter_test.go
@@ -182,9 +182,7 @@ func TestPushTraceData_TransientOnPartialFailure(t *testing.T) {
  assert.False(t, consumererror.IsPermanent(err))
 
  tErr := consumererror.Traces{}
- if ok := errors.As(err, &tErr); !ok {
- assert.Fail(t, "PushTraceData did not return a Traces error")
- }
+ require.ErrorAs(t, err, &tErr)
  assert.Equal(t, 1, tErr.GetTraces().ResourceSpans().Len())
 }
 

diff --git a/exporter/signalfxexporter/internal/dimensions/metadata_test.go b/exporter/signalfxexporter/internal/dimensions/metadata_test.go
@@ -15,9 +15,9 @@
 package dimensions
 
 import (
- "reflect"
  "testing"
 
+ "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
  "go.uber.org/zap"
 
@@ -217,10 +217,7 @@ func TestGetDimensionUpdateFromMetadata(t *testing.T) {
  "-_.",
  )
  require.NoError(t, err)
- got := getDimensionUpdateFromMetadata(tt.args.metadata, *converter)
- if !reflect.DeepEqual(*got, *tt.want) {
- t.Errorf("getDimensionUpdateFromMetadata() = %v, want %v", *got, *tt.want)
- }
+ assert.Equal(t, tt.want, getDimensionUpdateFromMetadata(tt.args.metadata, *converter))
  })
  }
 }

diff --git a/exporter/signalfxexporter/internal/hostmetadata/host_linux_test.go b/exporter/signalfxexporter/internal/hostmetadata/host_linux_test.go
@@ -21,9 +21,10 @@ package hostmetadata
 
 import (
  "errors"
- "reflect"
  "testing"
 
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
  "golang.org/x/sys/unix"
 )
 
@@ -74,15 +75,13 @@ func TestFillOSSpecificData(t *testing.T) {
  syscallUname = tt.args.syscallUname
  t.Setenv("HOST_ETC", tt.args.etc)
  in := &hostOS{}
- if err := fillPlatformSpecificOSData(in); err != nil {
- if !tt.wantErr {
- t.Errorf("fillPlatformSpecificOSData returned an error %v", err)
- }
+ err := fillPlatformSpecificOSData(in)
+ if tt.wantErr {
+ assert.Error(t, err)
  return
  }
- if !reflect.DeepEqual(in, tt.want) {
- t.Errorf("fillPlatformSpecificOSData() = %v, want %v", in, tt.want)
- }
+ require.NoError(t, err)
+ assert.Equal(t, tt.want, in)
  })
  syscallUname = unix.Uname
  }
@@ -127,15 +126,13 @@ func TestFillPlatformSpecificCPUData(t *testing.T) {
  t.Run(tt.name, func(t *testing.T) {
  syscallUname = tt.args.syscallUname
  in := &hostCPU{}
- if err := fillPlatformSpecificCPUData(in); err != nil {
- if !tt.wantErr {
- t.Errorf("fillPlatformSpecificCPUData returned an error %v", err)
- }
+ err := fillPlatformSpecificCPUData(in)
+ if tt.wantErr {
+ assert.Error(t, err)
  return
  }
- if !reflect.DeepEqual(in, tt.want) {
- t.Errorf("fillPlatformSpecificCPUData() = %v, want %v", in, tt.want)
- }
+ require.NoError(t, err)
+ assert.Equal(t, tt.want, in)
  })
  syscallUname = unix.Uname
  }