update: use env pkg for fetch env variables

Author: sreeram-narayanan

instruments/traces.go

@@ -5,13 +5,9 @@ import (
 	"crypto/tls"
 	"fmt"
 	"net/http"
-	"os"
-	"strconv"
 	"time"
 
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/credentials/insecure"
+	"github.com/skit-ai/vcore/env"
 
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
@@ -20,13 +16,16 @@ import (
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
 	"go.opentelemetry.io/otel/trace"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
 )
 
 var (
-	OtelEnable, _     = strconv.ParseBool(os.Getenv("OTEL_ENABLE"))
-	serviceName       = os.Getenv("OTEL_SERVICE_NAME")
-	collectorEndpoint = os.Getenv("OTEL_COLLECTOR_ENDPOINT")
-	useTls, _         = strconv.ParseBool(os.Getenv("OTEL_USE_TLS"))
+	OtelEnable        = env.Bool("OTEL_ENABLE", false)
+	serviceName       = env.String("OTEL_SERVICE_NAME", "")
+	collectorEndpoint = env.String("OTEL_COLLECTOR_ENDPOINT", "")
+	useTls            = env.Bool("OTEL_USE_TLS", false)
 )
 
 // Initializes an OTLP exporter, and configures the corresponding trace and
@@ -47,14 +46,14 @@ func InitProvider() (func(context.Context) error, error) {
 	ctx, cancel := context.WithTimeout(ctx, time.Second)
 	defer cancel()
 
-    opts := []grpc.DialOption{
-        grpc.WithBlock(),
-    }
-    if useTls {
-        opts = append(opts, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{MinVersion: tls.VersionTLS12})))
-    } else {
-        opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
-    }
+	opts := []grpc.DialOption{
+		grpc.WithBlock(),
+	}
+	if useTls {
+		opts = append(opts, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{MinVersion: tls.VersionTLS12})))
+	} else {
+		opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	}
 	conn, err := grpc.DialContext(ctx, collectorEndpoint, opts...)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to create gRPC connection to collector: %w", err)

profile/pyroscope.go

@@ -1,8 +1,8 @@
 package profile
 
 import (
+	"github.com/grafana/pyroscope-go"
 	"github.com/pkg/errors"
-	"github.com/pyroscope-io/client/pyroscope"
 	"github.com/skit-ai/vcore/env"
 )
 

sentry/http.go

@@ -27,7 +27,7 @@ func (h *Handler) HandleFunc(handler http.HandlerFunc) http.HandlerFunc {
 			ctx = sentry.SetHubOnContext(ctx, hub)
 		}
 		span := sentry.StartSpan(ctx, "http.server",
-			sentry.TransactionName(fmt.Sprintf("%s %s", r.Method, r.URL.Path)),
+			sentry.WithTransactionName(fmt.Sprintf("%s %s", r.Method, r.URL.Path)),
 			sentry.ContinueFromRequest(r),
 		)
 		defer span.Finish()
@@ -79,7 +79,7 @@ func (h *Handler) HandleHttpRouter(handler httprouter.Handle) httprouter.Handle
 			ctx = sentry.SetHubOnContext(ctx, hub)
 		}
 		span := sentry.StartSpan(ctx, "http.server",
-			sentry.TransactionName(fmt.Sprintf("%s %s", r.Method, r.URL.Path)),
+			sentry.WithTransactionName(fmt.Sprintf("%s %s", r.Method, r.URL.Path)),
 			sentry.ContinueFromRequest(r),
 		)
 		defer span.Finish()

surveillance/sentry.go

@@ -2,19 +2,17 @@ package surveillance
 
 import (
 	"context"
-	"net/http"
-	"os"
-	"strconv"
-
 	"github.com/getsentry/sentry-go"
 	sentryhttp "github.com/getsentry/sentry-go/http"
 	"github.com/julienschmidt/httprouter"
+	"github.com/skit-ai/vcore/env"
 	"github.com/skit-ai/vcore/errors"
 	"github.com/skit-ai/vcore/log"
 	sentryWrapper "github.com/skit-ai/vcore/sentry"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"net/http"
 )
 
 type Sentry struct {
@@ -23,12 +21,11 @@ type Sentry struct {
 }
 
 func InitSentry(release string) (client *Sentry) {
-	dsn := os.Getenv("SENTRY_DSN")
-
-	sampleRate, _ := strconv.ParseFloat(os.Getenv("SENTRY_SAMPLING"), 64)
+	dsn := env.String("SENTRY_DSN", "")
+	sampleRate := env.Float("SENTRY_SAMPLING", 0.0)
 
 	if release == "" {
-		release = os.Getenv("SENTRY_RELEASE")
+		release = env.String("SENTRY_RELEASE", "")
 	}
 	if dsn != "" {
 		if err := sentry.Init(sentry.ClientOptions{
@@ -42,7 +39,7 @@ func InitSentry(release string) (client *Sentry) {
 			Release:    release,
 			SampleRate: sampleRate,
 
-			Environment: os.Getenv("ENVIRONMENT"),
+			Environment: env.String("ENVIRONMENT", ""),
 		}); err != nil {
 			log.Warnf("Could not initialize sentry with DSN: %s", dsn)
 			client = &Sentry{nil, nil}

utils/utils.go

@@ -19,14 +19,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/getsentry/sentry-go"
+	"github.com/skit-ai/vcore/env"
 	"github.com/skit-ai/vcore/errors"
 	"github.com/skit-ai/vcore/surveillance"
 
+	"github.com/getsentry/sentry-go"
 	"github.com/google/go-cmp/cmp"
 )
 
-var DevMode = strings.ToUpper(os.Getenv("ENVIRONMENT")) == "DEV"
+var DevMode = strings.ToUpper(env.String("ENVIRONMENT", "")) == "DEV"
 
 var link = regexp.MustCompile("(^[A-Za-z])|_([A-Za-z])")