From 08fa2a49990d29a426c403cb7a57b31c2a99191f Mon Sep 17 00:00:00 2001 From: golangisfun123 Date: Tue, 10 Sep 2024 11:06:47 -0500 Subject: [PATCH 1/4] fix function call [goreleaser] --- core/metrics/otlp.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/metrics/otlp.go b/core/metrics/otlp.go index c572b53774..3370685a4b 100644 --- a/core/metrics/otlp.go +++ b/core/metrics/otlp.go @@ -3,11 +3,10 @@ package metrics import ( "context" "fmt" + "os" "strings" "time" - "os" - "github.com/synapsecns/sanguine/core" "github.com/synapsecns/sanguine/core/config" "go.opentelemetry.io/otel/exporters/otlp/otlptrace" @@ -131,7 +130,7 @@ const ( // makeOTLPTrace creates a new OTLP client based on the transport type and url. func makeOTLPExporter(ctx context.Context, transportEnv, urlEnv string) (*otlptrace.Exporter, error) { transport := transportFromString(core.GetEnv(transportEnv, otlpTransportHTTP.String())) - url := os.GetEnv(urlEnv) + url := os.Getenv(urlEnv) oteltraceClient, err := buildClientFromTransport( transport, From 1c63c19c0e0aae99779afbf847a02df432a9f57d Mon Sep 17 00:00:00 2001 From: golangisfun123 Date: Tue, 10 Sep 2024 11:08:39 -0500 Subject: [PATCH 2/4] warnings and uneeded err check --- core/metrics/multiexporter_test.go | 5 +++-- core/metrics/otlp.go | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/metrics/multiexporter_test.go b/core/metrics/multiexporter_test.go index d86a92bb8e..0c0d6f0310 100644 --- a/core/metrics/multiexporter_test.go +++ b/core/metrics/multiexporter_test.go @@ -1,4 +1,4 @@ -package metrics +package metrics_test import ( "context" @@ -6,6 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/synapsecns/sanguine/core/metrics" sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/sdk/trace/tracetest" ) @@ -16,7 +17,7 @@ func TestMultiExporter(t *testing.T) { exporter2 := tracetest.NewInMemoryExporter() // Create multi-exporter - multiExporter := NewMultiExporter(exporter1, exporter2) + multiExporter := metrics.NewMultiExporter(exporter1, exporter2) // Create test spans spans := []sdktrace.ReadOnlySpan{ diff --git a/core/metrics/otlp.go b/core/metrics/otlp.go index 3370685a4b..243344c967 100644 --- a/core/metrics/otlp.go +++ b/core/metrics/otlp.go @@ -50,9 +50,7 @@ func (n *otlpHandler) Start(ctx context.Context) (err error) { exporter, err := makeOTLPExporter(ctx, transportEnv, endpointEnv) if err != nil { - if err != nil { - return fmt.Errorf("could not create exporter %d: %v", i, err) - } + return fmt.Errorf("could not create exporter %d: %v", i, err) } exporters = append(exporters, exporter) From d08315e5107c9fe03f01fbcfcb3ff7e631c8d773 Mon Sep 17 00:00:00 2001 From: golangisfun123 Date: Tue, 10 Sep 2024 11:09:47 -0500 Subject: [PATCH 3/4] more accurate comment --- core/metrics/otlp.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/metrics/otlp.go b/core/metrics/otlp.go index 243344c967..21dd8c535c 100644 --- a/core/metrics/otlp.go +++ b/core/metrics/otlp.go @@ -56,7 +56,7 @@ func (n *otlpHandler) Start(ctx context.Context) (err error) { exporters = append(exporters, exporter) } - // create the multi-exporter with optional secondary exporter + // create the multi-exporter with all the exporters multiExporter := NewMultiExporter(exporters...) n.baseHandler = newBaseHandler( From 1d670a0a00efa13141c2c6aa0043fe9232dce638 Mon Sep 17 00:00:00 2001 From: golangisfun123 Date: Tue, 10 Sep 2024 11:13:15 -0500 Subject: [PATCH 4/4] [goreleaser]