From 07f6de40c5efcebb23e6071b62f5442525fd7910 Mon Sep 17 00:00:00 2001 From: Hannah Kim Date: Fri, 25 Oct 2024 09:13:13 -0400 Subject: [PATCH] mocktracer and error code fixes --- instrumentation/httptrace/httptrace_test.go | 8 ++++---- .../integrations/manual_api_mocktracer_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/instrumentation/httptrace/httptrace_test.go b/instrumentation/httptrace/httptrace_test.go index 15c01a1e16..c144391eff 100644 --- a/instrumentation/httptrace/httptrace_test.go +++ b/instrumentation/httptrace/httptrace_test.go @@ -106,13 +106,13 @@ func TestConfiguredErrorStatuses(t *testing.T) { switch status { case 0: assert.Equal(t, "200", spans[i].Tag(ext.HTTPCode)) - assert.Nil(t, spans[i].Tag(ext.Error)) + assert.Nil(t, spans[i].Tag(ext.ErrorMsg)) case 200, 400: assert.Equal(t, strconv.Itoa(status), spans[i].Tag(ext.HTTPCode)) - assert.Equal(t, fmt.Errorf("%s: %s", strconv.Itoa(status), http.StatusText(status)), spans[i].Tag(ext.Error).(error)) + assert.Equal(t, fmt.Sprintf("%s: %s", strconv.Itoa(status), http.StatusText(status)), spans[i].Tag(ext.ErrorMsg)) case 500: assert.Equal(t, strconv.Itoa(status), spans[i].Tag(ext.HTTPCode)) - assert.Nil(t, spans[i].Tag(ext.Error)) + assert.Nil(t, spans[i].Tag(ext.ErrorMsg)) } } }) @@ -133,7 +133,7 @@ func TestConfiguredErrorStatuses(t *testing.T) { spans := mt.FinishedSpans() require.Len(t, spans, 1) assert.Equal(t, "0", spans[0].Tag(ext.HTTPCode)) - assert.Equal(t, fmt.Errorf("0: %s", http.StatusText(0)), spans[0].Tag(ext.Error).(error)) + assert.Equal(t, fmt.Sprintf("0: %s", http.StatusText(0)), spans[0].Tag(ext.ErrorMsg)) }) } diff --git a/internal/civisibility/integrations/manual_api_mocktracer_test.go b/internal/civisibility/integrations/manual_api_mocktracer_test.go index c2381c2394..1c497cbeae 100644 --- a/internal/civisibility/integrations/manual_api_mocktracer_test.go +++ b/internal/civisibility/integrations/manual_api_mocktracer_test.go @@ -279,7 +279,7 @@ func TestWithInnerFunc(t *testing.T) { } func testAssertions(assert *assert.Assertions, now time.Time, testSpan *mocktracer.Span) { - assert.Equal(now, testSpan.StartTime()) + assert.Equal(now.Unix(), testSpan.StartTime().Unix()) assert.Equal("my-module-framework.test", testSpan.OperationName()) tags := map[string]interface{}{ @@ -306,7 +306,7 @@ func testAssertions(assert *assert.Assertions, now time.Time, testSpan *mocktrac assert.Contains(spanTags, constants.TestSourceStartLine) assert.Contains(spanTags, constants.TestSourceEndLine) // make sure the startLine < endLine - assert.Less(spanTags[constants.TestSourceStartLine].(int), spanTags[constants.TestSourceEndLine].(int)) + assert.Less(spanTags[constants.TestSourceStartLine].(float64), spanTags[constants.TestSourceEndLine].(float64)) commonAssertions(assert, testSpan) }