refactor: change env key from OTLP... to OTEL...

pkg/constant/env.go

@@ -1,11 +1,11 @@
 package constant
 
 const (
-	EnvKeyOTLPEnabled         = "OTLP_ENABLED"
-	EnvKeyOTLPCollectorUrl    = "OTLP_COLLECTOR_URL"
-	EnvKeyOTLPInsecure        = "OTLP_INSECURE"
-	EnvKeyOTLPProtocol        = "OTLP_PROTOCOL"
-	EnvKeyOTLPServiceName     = "OTLP_SERVICE_NAME"
-	EnvKeyOTLPServiceVersion  = "OTLP_SERVICE_VERSION"
-	EnvKeyOTLPTraceSampleRate = "OTLP_TRACE_SAMPLE_RATE"
+	EnvKeyOtelEnabled         = "OTEL_ENABLED"
+	EnvKeyOtelCollectorUrl    = "OTEL_COLLECTOR_URL"
+	EnvKeyOtelInsecure        = "OTEL_INSECURE"
+	EnvKeyOtelProtocol        = "OTEL_PROTOCOL"
+	EnvKeyOtelServiceName     = "OTEL_SERVICE_NAME"
+	EnvKeyOtelServiceVersion  = "OTEL_SERVICE_VERSION"
+	EnvKeyOtelTraceSampleRate = "OTEL_TRACE_SAMPLE_RATE"
 )

pkg/constant/otlp.go

@@ -1,9 +1,9 @@
 package constant
 
 const (
-	OTLPDefaultServiceName    = "default-service-name"
-	OTLPDefaultServiceVersion = "0.1.0"
-	OTLPProtocolGRPC          = "grpc"
-	OTLPProtocolHTTP          = "http"
-	OTLPDefaultSampleRate     = 0.5
+	OtelDefaultServiceName    = "default-service-name"
+	OtelDefaultServiceVersion = "0.1.0"
+	OtelProtocolGRPC          = "grpc"
+	OtelProtocolHTTP          = "http"
+	OtelDefaultSampleRate     = 0.5
 )

pkg/metric/init.go

@@ -6,7 +6,7 @@ import (
 )
 
 func init() {
-	if env.BoolFromEnv(constant.EnvKeyOTLPEnabled) {
+	if env.BoolFromEnv(constant.EnvKeyOtelEnabled) {
 		InitProvider()
 	}
 }

pkg/metric/meter.go

@@ -9,5 +9,5 @@ import (
 )
 
 func Meter() metric.Meter {
-	return otel.GetMeterProvider().Meter(env.StringFromEnv(constant.EnvKeyOTLPServiceName, constant.OTLPDefaultServiceName))
+	return otel.GetMeterProvider().Meter(env.StringFromEnv(constant.EnvKeyOtelServiceName, constant.OtelDefaultServiceName))
 }

pkg/metric/provider.go

@@ -54,12 +54,12 @@ func newOTLPExporter() (metric.Exporter, error) {
 	ctx := context.Background()
 	ctx, cancel := context.WithTimeout(ctx, time.Second)
 	defer cancel()
-	providerServerUrl := env.StringFromEnv(constant.EnvKeyOTLPCollectorUrl, "")
-	isInsecure := env.BoolFromEnv(constant.EnvKeyOTLPInsecure)
-	protocol := env.StringFromEnv(constant.EnvKeyOTLPProtocol, constant.OTLPProtocolGRPC)
+	providerServerUrl := env.StringFromEnv(constant.EnvKeyOtelCollectorUrl, "")
+	isInsecure := env.BoolFromEnv(constant.EnvKeyOtelInsecure)
+	protocol := env.StringFromEnv(constant.EnvKeyOtelProtocol, constant.OtelProtocolGRPC)
 
 	// gRPC
-	if protocol == constant.OTLPProtocolGRPC {
+	if protocol == constant.OtelProtocolGRPC {
 		return newGRPCExporter(ctx, providerServerUrl, isInsecure)
 	}
 
@@ -72,8 +72,8 @@ func newResources() *resource.Resource {
 	// ref: https://opentelemetry.io/docs/instrumentation/go/resources/
 	return resource.NewWithAttributes(
 		semconv.SchemaURL,
-		semconv.ServiceName(env.StringFromEnv(constant.EnvKeyOTLPServiceName, constant.OTLPDefaultServiceName)),
-		semconv.ServiceVersion(env.StringFromEnv(constant.EnvKeyOTLPServiceVersion, constant.OTLPDefaultServiceVersion)),
+		semconv.ServiceName(env.StringFromEnv(constant.EnvKeyOtelServiceName, constant.OtelDefaultServiceName)),
+		semconv.ServiceVersion(env.StringFromEnv(constant.EnvKeyOtelServiceVersion, constant.OtelDefaultServiceVersion)),
 	)
 }
 

pkg/tracer/init.go

@@ -6,7 +6,7 @@ import (
 )
 
 func init() {
-	if env.BoolFromEnv(constant.EnvKeyOTLPEnabled) {
+	if env.BoolFromEnv(constant.EnvKeyOtelEnabled) {
 		InitProvider()
 	}
 }

pkg/tracer/provider.go

@@ -60,12 +60,12 @@ func newOTLPExporter() (*otlptrace.Exporter, error) {
 	ctx := context.Background()
 	ctx, cancel := context.WithTimeout(ctx, time.Second)
 	defer cancel()
-	providerServerUrl := env.StringFromEnv(constant.EnvKeyOTLPCollectorUrl, "")
-	isInsecure := env.BoolFromEnv(constant.EnvKeyOTLPInsecure)
-	protocol := env.StringFromEnv(constant.EnvKeyOTLPProtocol, constant.OTLPProtocolGRPC)
+	providerServerUrl := env.StringFromEnv(constant.EnvKeyOtelCollectorUrl, "")
+	isInsecure := env.BoolFromEnv(constant.EnvKeyOtelInsecure)
+	protocol := env.StringFromEnv(constant.EnvKeyOtelProtocol, constant.OtelProtocolGRPC)
 
 	// gRPC
-	if protocol == constant.OTLPProtocolGRPC {
+	if protocol == constant.OtelProtocolGRPC {
 		return newGRPCExporter(ctx, providerServerUrl, isInsecure)
 	}
 
@@ -78,8 +78,8 @@ func newResources() *resource.Resource {
 	// ref: https://opentelemetry.io/docs/instrumentation/go/resources/
 	return resource.NewWithAttributes(
 		semconv.SchemaURL,
-		semconv.ServiceName(env.StringFromEnv(constant.EnvKeyOTLPServiceName, constant.OTLPDefaultServiceName)),
-		semconv.ServiceVersion(env.StringFromEnv(constant.EnvKeyOTLPServiceVersion, constant.OTLPDefaultServiceVersion)),
+		semconv.ServiceName(env.StringFromEnv(constant.EnvKeyOtelServiceName, constant.OtelDefaultServiceName)),
+		semconv.ServiceVersion(env.StringFromEnv(constant.EnvKeyOtelServiceVersion, constant.OtelDefaultServiceVersion)),
 	)
 }
 
@@ -100,7 +100,7 @@ func InitProvider() {
 	// Register the trace exporter with a TracerProvider, using a batch span processor to aggregate spans before export.
 	bsp := trace.NewBatchSpanProcessor(exporter)
 
-	sampleRate := env.FloatFromEnv(constant.EnvKeyOTLPTraceSampleRate, constant.OTLPDefaultSampleRate)
+	sampleRate := env.FloatFromEnv(constant.EnvKeyOtelTraceSampleRate, constant.OtelDefaultSampleRate)
 
 	// init tracer provider
 	provider = trace.NewTracerProvider(

pkg/tracer/tracer.go

@@ -9,5 +9,5 @@ import (
 )
 
 func Tracer() trace.Tracer {
-	return otel.Tracer(env.StringFromEnv(constant.EnvKeyOTLPServiceName, constant.OTLPDefaultServiceName))
+	return otel.Tracer(env.StringFromEnv(constant.EnvKeyOtelServiceName, constant.OtelDefaultServiceName))
 }