diff --git a/correlation/raven/doc.go b/correlation/raven/doc.go deleted file mode 100644 index 2af1a2296869ecebe7e3dfeeedff9b26f16d9dbe..0000000000000000000000000000000000000000 --- a/correlation/raven/doc.go +++ /dev/null @@ -1,4 +0,0 @@ -// Package raven is allows correlation information to be added to raven requests. -// -// Deprecated: Use gitlab.com/gitlab-org/labkit/errortracking instead. -package raven diff --git a/correlation/raven/examples_test.go b/correlation/raven/examples_test.go deleted file mode 100644 index d0cd62ca181735a80791bea200a571dc05358d2f..0000000000000000000000000000000000000000 --- a/correlation/raven/examples_test.go +++ /dev/null @@ -1,20 +0,0 @@ -package raven_test - -import ( - "context" - "fmt" - - raven "github.com/getsentry/raven-go" - correlation "gitlab.com/gitlab-org/labkit/correlation/raven" -) - -func Example() { - // In reality, this would be passed into the function - ctx := context.Background() - err := fmt.Errorf("An error occurred") - - client := raven.DefaultClient - extra := correlation.SetExtra(ctx, nil) - packet := raven.NewPacketWithExtra(fmt.Sprintf("error: %v", err), extra) - client.Capture(packet, nil) -} diff --git a/correlation/raven/extras.go b/correlation/raven/extras.go deleted file mode 100644 index 60605a5331383cec248f0a2e1eccf7e61b40ff2b..0000000000000000000000000000000000000000 --- a/correlation/raven/extras.go +++ /dev/null @@ -1,28 +0,0 @@ -package raven - -import ( - "context" - - raven "github.com/getsentry/raven-go" - "gitlab.com/gitlab-org/labkit/correlation" -) - -const ravenSentryExtraKey = "gitlab.CorrelationID" - -// SetExtra will augment a raven message with the CorrelationID. -// An existing `extra` can be passed in, but if it's nil -// a new one will be created. -// -// Deprecated: Use gitlab.com/gitlab-org/labkit/errortracking instead. -func SetExtra(ctx context.Context, extra raven.Extra) raven.Extra { - if extra == nil { - extra = raven.Extra{} - } - - correlationID := correlation.ExtractFromContext(ctx) - if correlationID != "" { - extra[ravenSentryExtraKey] = correlationID - } - - return extra -} diff --git a/correlation/raven/extras_test.go b/correlation/raven/extras_test.go deleted file mode 100644 index 691e40039a482762e0fdb7e5bd264d4dd5526490..0000000000000000000000000000000000000000 --- a/correlation/raven/extras_test.go +++ /dev/null @@ -1,46 +0,0 @@ -package raven - -import ( - "context" - "reflect" - "testing" - - raven "github.com/getsentry/raven-go" - "gitlab.com/gitlab-org/labkit/correlation" -) - -func TestSetExtra(t *testing.T) { - tests := []struct { - name string - ctx context.Context - extra raven.Extra - want raven.Extra - }{ - { - name: "context", - ctx: correlation.ContextWithCorrelation(context.Background(), "C001"), - extra: map[string]interface{}{ - "key": "value", - }, - want: map[string]interface{}{ - "key": "value", - ravenSentryExtraKey: "C001", - }, - }, - { - name: "no_injected_extras", - ctx: correlation.ContextWithCorrelation(context.Background(), "C001"), - extra: nil, - want: map[string]interface{}{ - ravenSentryExtraKey: "C001", - }, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - if got := SetExtra(tt.ctx, tt.extra); !reflect.DeepEqual(got, tt.want) { - t.Errorf("SetExtra() = %v, want %v", got, tt.want) - } - }) - } -} diff --git a/go.mod b/go.mod index 080630c10c6bf0d3b37699c7681c31f74b5388ff..1a6650234e190fd6c03e25ac7a5f01b18c8d931d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.23.0 require ( cloud.google.com/go/profiler v0.1.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.8 - github.com/getsentry/raven-go v0.2.0 github.com/getsentry/sentry-go v0.13.0 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/lightstep/lightstep-tracer-go v0.25.0 @@ -36,7 +35,6 @@ require ( github.com/aws/aws-sdk-go v1.37.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect - github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-ole/go-ole v1.2.4 // indirect diff --git a/go.sum b/go.sum index 8c933563a5c63672095614ee08653bb326801198..91de84879402ce4f7a1d855d64a9e5c28fcd92e5 100644 --- a/go.sum +++ b/go.sum @@ -73,8 +73,6 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnduCsavhwFUklBMoGVYUCqmCqk= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d h1:S2NE3iHSwP0XV47EEXL8mWmRdEfGscSJ+7EgePNgt0s= -github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -100,8 +98,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= -github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/getsentry/sentry-go v0.13.0 h1:20dgTiUSfxRB/EhMPtxcL9ZEbM1ZdR+W/7f7NWD+xWo= github.com/getsentry/sentry-go v0.13.0/go.mod h1:EOsfu5ZdvKPfeHYV6pTVQnsjfp30+XA7//UooKNumH0= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=