move BoolEnv to internal package, remove boolEnv from ddtrace/tracer,…

… use internal.BoolEnv.
DataDog · Jul 21, 2020 · 1b10a40 · 1b10a40
1 parent 2d12786
commit 1b10a40
Show file tree

Hide file tree

Showing 33 changed files with 81 additions and 73 deletions.
diff --git a/contrib/Shopify/sarama/option.go b/contrib/Shopify/sarama/option.go
@@ -8,6 +8,7 @@ package sarama
 import (
 	"math"
 
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
 )
 
@@ -24,7 +25,7 @@ func defaults(cfg *config) {
 		cfg.consumerServiceName = svc
 	}
 	// cfg.analyticsRate = globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_SARAMA_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_SARAMA_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()

diff --git a/contrib/aws/aws-sdk-go/aws/option.go b/contrib/aws/aws-sdk-go/aws/option.go
@@ -8,7 +8,7 @@ package aws
 import (
 	"math"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 )
 
 type config struct {
@@ -21,7 +21,7 @@ type Option func(*config)
 
 func defaults(cfg *config) {
 	// cfg.analyticsRate = globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_AWS_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_AWS_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()

diff --git a/contrib/bradfitz/gomemcache/memcache/option.go b/contrib/bradfitz/gomemcache/memcache/option.go
@@ -8,7 +8,7 @@ package memcache
 import (
 	"math"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 )
 
 const (
@@ -27,7 +27,7 @@ type ClientOption func(*clientConfig)
 func defaults(cfg *clientConfig) {
 	cfg.serviceName = serviceName
 	// cfg.analyticsRate = globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_MEMCACHE_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_MEMCACHE_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()

diff --git a/contrib/confluentinc/confluent-kafka-go/kafka/option.go b/contrib/confluentinc/confluent-kafka-go/kafka/option.go
@@ -9,6 +9,7 @@ import (
 	"context"
 	"math"
 
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
 )
 
@@ -30,7 +31,7 @@ func newConfig(opts ...Option) *config {
 		// analyticsRate: globalconfig.AnalyticsRate(),
 		analyticsRate: math.NaN(),
 	}
-	if globalconfig.BoolEnv("DD_TRACE_KAFKA_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_KAFKA_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	}
 	if svc := globalconfig.ServiceName(); svc != "" {

diff --git a/contrib/database/sql/option.go b/contrib/database/sql/option.go
@@ -8,7 +8,7 @@ package sql
 import (
 	"math"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 )
 
 type config struct {
@@ -28,7 +28,7 @@ type RegisterOption = Option
 func defaults(cfg *config) {
 	// default cfg.serviceName set in Register based on driver name
 	// cfg.analyticsRate = globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_SQL_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_SQL_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()

diff --git a/contrib/emicklei/go-restful/option.go b/contrib/emicklei/go-restful/option.go
@@ -8,6 +8,7 @@ package restful
 import (
 	"math"
 
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
 )
 
@@ -18,7 +19,7 @@ type config struct {
 
 func newConfig() *config {
 	rate := globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_RESTFUL_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_RESTFUL_ANALYTICS_ENABLED", false) {
 		rate = 1.0
 	}
 	return &config{

diff --git a/contrib/garyburd/redigo/option.go b/contrib/garyburd/redigo/option.go
@@ -8,7 +8,7 @@ package redigo // import "gopkg.in/DataDog/dd-trace-go.v1/contrib/garyburd/redig
 import (
 	"math"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 )
 
 type dialConfig struct {
@@ -22,7 +22,7 @@ type DialOption func(*dialConfig)
 func defaults(cfg *dialConfig) {
 	cfg.serviceName = "redis.conn"
 	// cfg.analyticsRate = globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_REDIGO_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_REDIGO_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()

diff --git a/contrib/gin-gonic/gin/option.go b/contrib/gin-gonic/gin/option.go
@@ -10,6 +10,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
 )
 
@@ -20,7 +21,7 @@ type config struct {
 
 func newConfig() *config {
 	rate := globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_GIN_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_GIN_ANALYTICS_ENABLED", false) {
 		rate = 1.0
 	}
 	return &config{

diff --git a/contrib/globalsign/mgo/option.go b/contrib/globalsign/mgo/option.go
@@ -9,7 +9,7 @@ import (
 	"context"
 	"math"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 )
 
 type mongoConfig struct {
@@ -20,7 +20,7 @@ type mongoConfig struct {
 
 func newConfig() *mongoConfig {
 	rate := math.NaN()
-	if globalconfig.BoolEnv("DD_TRACE_GIN_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_GIN_ANALYTICS_ENABLED", false) {
 		rate = 1.0
 	}
 	return &mongoConfig{

diff --git a/contrib/go-chi/chi/option.go b/contrib/go-chi/chi/option.go
@@ -9,6 +9,7 @@ import (
 	"math"
 
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
 )
 
@@ -26,7 +27,7 @@ func defaults(cfg *config) {
 	if svc := globalconfig.ServiceName(); svc != "" {
 		cfg.serviceName = svc
 	}
-	if globalconfig.BoolEnv("DD_TRACE_CHI_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_CHI_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = globalconfig.AnalyticsRate()

diff --git a/contrib/go-redis/redis/option.go b/contrib/go-redis/redis/option.go
@@ -8,7 +8,7 @@ package redis // import "gopkg.in/DataDog/dd-trace-go.v1/contrib/go-redis/redis"
 import (
 	"math"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 )
 
 type clientConfig struct {
@@ -22,7 +22,7 @@ type ClientOption func(*clientConfig)
 func defaults(cfg *clientConfig) {
 	cfg.serviceName = "redis.client"
 	// cfg.analyticsRate = globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_REDIS_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_REDIS_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()

diff --git a/contrib/go.mongodb.org/mongo-driver/mongo/option.go b/contrib/go.mongodb.org/mongo-driver/mongo/option.go
@@ -8,7 +8,7 @@ package mongo
 import (
 	"math"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 )
 
 type config struct {
@@ -22,7 +22,7 @@ type Option func(*config)
 func defaults(cfg *config) {
 	cfg.serviceName = "mongo"
 	// cfg.analyticsRate = globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_MONGO_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_MONGO_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()

diff --git a/contrib/gocql/gocql/option.go b/contrib/gocql/gocql/option.go
@@ -8,7 +8,7 @@ package gocql
 import (
 	"math"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 )
 
 type queryConfig struct {
@@ -23,7 +23,7 @@ type WrapOption func(*queryConfig)
 func defaults(cfg *queryConfig) {
 	cfg.serviceName = "gocql.query"
 	// cfg.analyticsRate = globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_GOCQL_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_GOCQL_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()

diff --git a/contrib/gomodule/redigo/option.go b/contrib/gomodule/redigo/option.go
@@ -8,7 +8,7 @@ package redigo // import "gopkg.in/DataDog/dd-trace-go.v1/contrib/gomodule/redig
 import (
 	"math"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 )
 
 type dialConfig struct {
@@ -22,7 +22,7 @@ type DialOption func(*dialConfig)
 func defaults(cfg *dialConfig) {
 	cfg.serviceName = "redis.conn"
 	// cfg.analyticsRate = globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_REDIGO_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_REDIGO_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()

diff --git a/contrib/google.golang.org/api/option.go b/contrib/google.golang.org/api/option.go
@@ -9,7 +9,7 @@ import (
 	"context"
 	"math"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 )
 
 type config struct {
@@ -21,7 +21,7 @@ type config struct {
 
 func newConfig(options ...Option) *config {
 	rate := math.NaN()
-	if globalconfig.BoolEnv("DD_TRACE_GOOGLE_API_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_GOOGLE_API_ANALYTICS_ENABLED", false) {
 		rate = 1.0
 	}
 	cfg := &config{

diff --git a/contrib/google.golang.org/grpc.v12/option.go b/contrib/google.golang.org/grpc.v12/option.go
@@ -8,7 +8,7 @@ package grpc
 import (
 	"math"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 )
 
 type interceptorConfig struct {
@@ -23,7 +23,7 @@ type InterceptorOption func(*interceptorConfig)
 func defaults(cfg *interceptorConfig) {
 	// cfg.serviceName default set in interceptor
 	// cfg.analyticsRate = globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_GRPC_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_GRPC_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()

diff --git a/contrib/google.golang.org/grpc/option.go b/contrib/google.golang.org/grpc/option.go
@@ -8,6 +8,7 @@ package grpc
 import (
 	"math"
 
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
 
 	"google.golang.org/grpc/codes"
@@ -58,7 +59,7 @@ func defaults(cfg *config) {
 	cfg.traceStreamMessages = true
 	cfg.nonErrorCodes = map[codes.Code]bool{codes.Canceled: true}
 	// cfg.analyticsRate = globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_GRPC_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_GRPC_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()

diff --git a/contrib/gorilla/mux/option.go b/contrib/gorilla/mux/option.go
@@ -11,6 +11,7 @@ import (
 
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
 )
 
@@ -26,7 +27,7 @@ type routerConfig struct {
 type RouterOption func(*routerConfig)
 
 func defaults(cfg *routerConfig) {
-	if globalconfig.BoolEnv("DD_TRACE_MUX_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_MUX_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = globalconfig.AnalyticsRate()

diff --git a/contrib/graph-gophers/graphql-go/option.go b/contrib/graph-gophers/graphql-go/option.go
@@ -8,6 +8,7 @@ package graphql
 import (
 	"math"
 
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
 )
 
@@ -25,7 +26,7 @@ func defaults(cfg *config) {
 		cfg.serviceName = svc
 	}
 	// cfg.analyticsRate = globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_GRAPHQL_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_GRAPHQL_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()

diff --git a/contrib/hashicorp/consul/option.go b/contrib/hashicorp/consul/option.go
@@ -8,7 +8,7 @@ package consul
 import (
 	"math"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 )
 
 const (
@@ -25,7 +25,7 @@ type ClientOption func(*clientConfig)
 
 func defaults(cfg *clientConfig) {
 	cfg.serviceName = serviceName
-	if globalconfig.BoolEnv("DD_TRACE_CONSUL_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_CONSUL_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()

diff --git a/contrib/hashicorp/vault/option.go b/contrib/hashicorp/vault/option.go
@@ -8,6 +8,7 @@ package vault
 import (
 	"math"
 
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
 )
 
@@ -23,7 +24,7 @@ type Option func(*config)
 
 func defaults(cfg *config) {
 	cfg.serviceName = defaultServiceName
-	if globalconfig.BoolEnv("DD_TRACE_VAULT_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_VAULT_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = globalconfig.AnalyticsRate()

diff --git a/contrib/jinzhu/gorm/option.go b/contrib/jinzhu/gorm/option.go
@@ -8,7 +8,7 @@ package gorm
 import (
 	"math"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 )
 
 type config struct {
@@ -23,7 +23,7 @@ type Option func(*config)
 func defaults(cfg *config) {
 	cfg.serviceName = "gorm.db"
 	// cfg.analyticsRate = globalconfig.AnalyticsRate()
-	if globalconfig.BoolEnv("DD_TRACE_GORM_ANALYTICS_ENABLED", false) {
+	if internal.BoolEnv("DD_TRACE_GORM_ANALYTICS_ENABLED", false) {
 		cfg.analyticsRate = 1.0
 	} else {
 		cfg.analyticsRate = math.NaN()