Merge pull request #3953 from atlanhq/dev/otel3

retrrieve as env variables
atlanhq · Jan 8, 2025 · 02b0490 · 02b0490
2 parents b726afa + 93c7a1d
commit 02b0490
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java b/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
@@ -144,7 +144,7 @@ public enum AtlasConfiguration {
      * OTEL Configuration
      */
     OTEL_RESOURCE_ATTRIBUTES("OTEL_RESOURCE_ATTRIBUTES", "service.name=atlas"),
-    OTEL_SERVICE_NAME(" OTEL_SERVICE_NAME", "atlas"),
+    OTEL_SERVICE_NAME("OTEL_SERVICE_NAME", "atlas"),
     OTEL_EXPORTER_OTLP_ENDPOINT("OTEL_EXPORTER_OTLP_ENDPOINT", "http://localhost:4317");
 
 

diff --git a/webapp/src/main/java/org/apache/atlas/Atlas.java b/webapp/src/main/java/org/apache/atlas/Atlas.java
@@ -186,11 +186,23 @@ private static void setApplicationHome() {
 
     private static OpenTelemetry initializeOpenTelemetry() {
 
-         List<String> customResourceAttr =
-                Arrays.asList(AtlasConfiguration.OTEL_RESOURCE_ATTRIBUTES.getStringArray());
+        String otelResourceAttributes = System.getenv("OTEL_RESOURCE_ATTRIBUTES");
+
+        List<String> customResourceAttr = null;
+
+        if (otelResourceAttributes != null) {
+            // Split the environment variable by commas
+            String[] values = otelResourceAttributes.split(",");
+            customResourceAttr = Arrays.asList(values);
+        } else {
+            customResourceAttr = Arrays.asList(AtlasConfiguration.OTEL_RESOURCE_ATTRIBUTES.getStringArray());
+        }
+
+        String serviceName = System.getenv("OTEL_SERVICE_NAME") != null ? System.getenv("OTEL_SERVICE_NAME") : AtlasConfiguration.OTEL_SERVICE_NAME.getString();
+        String otelEndpoint = System.getenv("OTEL_EXPORTER_OTLP_ENDPOINT") != null ? System.getenv("OTEL_EXPORTER_OTLP_ENDPOINT") : AtlasConfiguration.OTEL_EXPORTER_OTLP_ENDPOINT.getString();
 
         ResourceBuilder resourceBuilder = Resource.getDefault().toBuilder()
-                .put(ResourceAttributes.SERVICE_NAME, AtlasConfiguration.OTEL_SERVICE_NAME.getString());
+                .put(ResourceAttributes.SERVICE_NAME, serviceName);
 
         // Iterate through the ArrayList and add each attribute
         for (String attribute : customResourceAttr) {
@@ -212,7 +224,7 @@ private static OpenTelemetry initializeOpenTelemetry() {
                                 .addLogRecordProcessor(
                                         BatchLogRecordProcessor.builder(
                                                         OtlpGrpcLogRecordExporter.builder()
-                                                                .setEndpoint(AtlasConfiguration.OTEL_EXPORTER_OTLP_ENDPOINT.getString())
+                                                                .setEndpoint(otelEndpoint)
                                                                 .build()
                                                 )
                                                 .build()