fix(infra): change otel_endpoint env name (#1574)

fix: change otel_endpoint env name
skkuding · Mar 19, 2024 · 3cde213 · 3cde213
1 parent 4984ff3
commit 3cde213
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 15 deletions.
diff --git a/apps/backend/apps/admin/src/main.ts b/apps/backend/apps/admin/src/main.ts
@@ -9,8 +9,8 @@ const bootstrap = async () => {
   // otel instrumentation
   if (process.env.NODE_ENV == 'production') {
     if (
-      process.env.OTEL_EXPORTER_OTLP_ENDPOINT == undefined ||
-      process.env.OTEL_EXPORTER_OTLP_ENDPOINT == ''
+      process.env.OTEL_EXPORTER_OTLP_ENDPOINT_URL == undefined ||
+      process.env.OTEL_EXPORTER_OTLP_ENDPOINT_URL == ''
     ) {
       console.log('The exporter url is not defined')
     } else {

diff --git a/apps/backend/apps/admin/src/metric.ts b/apps/backend/apps/admin/src/metric.ts
@@ -9,7 +9,8 @@ import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'
 
 const startMetricsExporter = () => {
   const options = {
-    url: 'http://' + process.env.OTEL_EXPORTER_OTLP_ENDPOINT + '/v1/metrics', // Grafana Agent Metric을 받는 url
+    url:
+      'http://' + process.env.OTEL_EXPORTER_OTLP_ENDPOINT_URL + '/v1/metrics', // Grafana Agent Metric을 받는 url
     headers: {},
     concurrencyLimit: 5
   }

diff --git a/apps/backend/apps/admin/src/tracer.ts b/apps/backend/apps/admin/src/tracer.ts
@@ -15,7 +15,7 @@ class Tracer {
 
   // http://localhost:4318/v1/traces
   private exporter = new OTLPTraceExporter({
-    url: 'http://' + process.env.OTEL_EXPORTER_OTLP_ENDPOINT + '/v1/traces'
+    url: 'http://' + process.env.OTEL_EXPORTER_OTLP_ENDPOINT_URL + '/v1/traces'
   })
 
   private provider = new BasicTracerProvider({

diff --git a/apps/backend/apps/client/src/main.ts b/apps/backend/apps/client/src/main.ts
@@ -11,8 +11,8 @@ const bootstrap = async () => {
   // otel instrumentation
   if (process.env.NODE_ENV == 'production') {
     if (
-      process.env.OTEL_EXPORTER_OTLP_ENDPOINT == undefined ||
-      process.env.OTEL_EXPORTER_OTLP_ENDPOINT == ''
+      process.env.OTEL_EXPORTER_OTLP_ENDPOINT_URL == undefined ||
+      process.env.OTEL_EXPORTER_OTLP_ENDPOINT_URL == ''
     ) {
       console.log('The exporter url is not defined')
     } else {

diff --git a/apps/backend/apps/client/src/metric.ts b/apps/backend/apps/client/src/metric.ts
@@ -9,7 +9,8 @@ import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'
 
 const startMetricsExporter = () => {
   const options = {
-    url: 'http://' + process.env.OTEL_EXPORTER_OTLP_ENDPOINT + '/v1/metrics', // Grafana Agent Metric을 받는 url
+    url:
+      'http://' + process.env.OTEL_EXPORTER_OTLP_ENDPOINT_URL + '/v1/metrics', // Grafana Agent Metric을 받는 url
     headers: {},
     concurrencyLimit: 5
   }

diff --git a/apps/backend/apps/client/src/tracer.ts b/apps/backend/apps/client/src/tracer.ts
@@ -15,7 +15,7 @@ class Tracer {
 
   // http://localhost:4318/v1/traces
   private exporter = new OTLPTraceExporter({
-    url: 'http://' + process.env.OTEL_EXPORTER_OTLP_ENDPOINT + '/v1/traces'
+    url: 'http://' + process.env.OTEL_EXPORTER_OTLP_ENDPOINT_URL + '/v1/traces'
   })
 
   private provider = new BasicTracerProvider({

diff --git a/apps/infra/modules/codedang-infra/backend/admin-task-definition.tftpl b/apps/infra/modules/codedang-infra/backend/admin-task-definition.tftpl
@@ -72,7 +72,7 @@
         "value" : "${media_secret_key}"
       },
       {
-        "name" : "OTEL_EXPORTER_OTLP_ENDPOINT",
+        "name" : "OTEL_EXPORTER_OTLP_ENDPOINT_URL",
         "value" : "${otel_endpoint}"
       }
     ],

diff --git a/apps/infra/modules/codedang-infra/backend/client-task-definition.tftpl b/apps/infra/modules/codedang-infra/backend/client-task-definition.tftpl
@@ -92,7 +92,7 @@
         "value": "${kakao_client_secret}"
       },
       {
-        "name" : "OTEL_EXPORTER_OTLP_ENDPOINT",
+        "name" : "OTEL_EXPORTER_OTLP_ENDPOINT_URL",
         "value" : "${otel_endpoint}"
       }
     ],

diff --git a/apps/infra/modules/codedang-infra/iris/task-definition.tftpl b/apps/infra/modules/codedang-infra/iris/task-definition.tftpl
@@ -63,7 +63,7 @@
         "value": "${redis_port}"
       },
       {
-        "name" : "OTEL_EXPORTER_OTLP_ENDPOINT",
+        "name" : "OTEL_EXPORTER_OTLP_ENDPOINT_URL",
         "value" : "${otel_endpoint}"
       }
     ],

diff --git a/apps/iris/main.go b/apps/iris/main.go
@@ -35,15 +35,15 @@ func main() {
 	ctx := context.Background()
 	cache := cache.NewCache(ctx)
 	if env == "production" {
-		if utils.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT", "") != "" {
+		if utils.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT_URL", "") != "" {
 			shutdown := observability.InitTracer(ctx)
 			defer shutdown()
 			observability.SetGlobalMeterProvider()
 			// Aynchronous Instruments로써, go routine 불필요
 			observability.GetMemoryMeter(otel.Meter("memory-metrics"))
 			observability.GetCPUMeter(otel.Meter("cpu-metrics"), 15*time.Second)
 		} else {
-			logProvider.Log(logger.INFO, "Cannot find OTEL_EXPORTER_OTLP_ENDPOINT")
+			logProvider.Log(logger.INFO, "Cannot find OTEL_EXPORTER_OTLP_ENDPOINT_URL")
 		}
 	} else {
 		logProvider.Log(logger.INFO, "Running in development mode")

diff --git a/apps/iris/src/observability/metric.go b/apps/iris/src/observability/metric.go
@@ -50,7 +50,7 @@ func newMetricResource() (*resource.Resource, error) {
 
 func newMeterProvider(res *resource.Resource, second time.Duration) (*sdkmetric.MeterProvider, error) {
 	// Use OLTP Exporter for Grafana Agent (Recommended)
-	entryPoint := os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT")
+	entryPoint := os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT_URL")
 	otlpExporter, err := otlpmetrichttp.New(context.Background(), otlpmetrichttp.WithEndpointURL("http://"+entryPoint+"/v1/metrics"))
 	if err != nil {
 		return nil, err

diff --git a/apps/iris/src/observability/tracer.go b/apps/iris/src/observability/tracer.go
@@ -62,7 +62,7 @@ func newResource(ctx context.Context) (*resource.Resource, error) {
 }
 
 func newExporter(ctx context.Context) (*otlptrace.Exporter, error) {
-	oltpEndpoint := utils.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT", "")
+	oltpEndpoint := utils.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT_URL", "")
 	exp, err := otlptracehttp.New(ctx, otlptracehttp.WithEndpoint(oltpEndpoint), otlptracehttp.WithInsecure())
 	if err != nil {
 		return nil, err