Fixed permissions on executables and added cluster settings back to t…

…elemetry plugin

Signed-off-by: Shephali Mittal <[email protected]>

plugins/telemetry-otel/src/internalClusterTest/java/org/opensearch/telemetry/tracing/InMemorySingletonSpanProvider.java → plugins/telemetry-otel/src/internalClusterTest/java/org/opensearch/telemetry/tracing/InMemorySingletonSpanExporterProvider.java

@@ -12,7 +12,7 @@
 import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 
-public class InMemorySingletonSpanProvider implements ConfigurableSpanExporterProvider {
+public class InMemorySingletonSpanExporterProvider implements ConfigurableSpanExporterProvider {
 
     @Override
     public SpanExporter createExporter(ConfigProperties config) {

plugins/telemetry-otel/src/internalClusterTest/java/org/opensearch/telemetry/tracing/IntegrationTestOTelTelemetryPlugin.java

@@ -8,6 +8,7 @@
 
 package org.opensearch.telemetry.tracing;
 
+import org.opensearch.common.settings.Settings;
 import org.opensearch.telemetry.OTelTelemetryPlugin;
 import org.opensearch.telemetry.Telemetry;
 
@@ -21,9 +22,10 @@
 public class IntegrationTestOTelTelemetryPlugin extends OTelTelemetryPlugin {
     /**
      * Creates IntegrationTestOTelTelemetryPlugin
+     * @param settings cluster settings
      */
-    public IntegrationTestOTelTelemetryPlugin() {
-        super();
+    public IntegrationTestOTelTelemetryPlugin(Settings settings) {
+        super(settings);
     }
 
     /**

plugins/telemetry-otel/src/main/java/org/opensearch/telemetry/OTelTelemetryPlugin.java

@@ -8,6 +8,7 @@
 
 package org.opensearch.telemetry;
 
+import org.opensearch.common.settings.Settings;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.plugins.TelemetryPlugin;
 import org.opensearch.telemetry.metrics.MetricsTelemetry;
@@ -24,10 +25,15 @@ public class OTelTelemetryPlugin extends Plugin implements TelemetryPlugin {
 
     static final String OTEL_TRACER_NAME = "otel";
 
+    private final Settings settings;
+
     /**
      * Creates Otel plugin
+     * @param settings cluster settings
      */
-    public OTelTelemetryPlugin() {}
+    public OTelTelemetryPlugin(Settings settings) {
+        this.settings = settings;
+    }
 
     @Override
     public Optional<Telemetry> getTelemetry() {
@@ -40,7 +46,7 @@ public String getName() {
     }
 
     private Telemetry telemetry() {
-        return new OTelTelemetry(new OTelTracingTelemetry(OTelResourceProvider.get()), new MetricsTelemetry() {
+        return new OTelTelemetry(new OTelTracingTelemetry(OTelResourceProvider.get(settings)), new MetricsTelemetry() {
         });
     }
 

plugins/telemetry-otel/src/main/java/org/opensearch/telemetry/tracing/OTelResourceProvider.java

@@ -8,6 +8,8 @@
 
 package org.opensearch.telemetry.tracing;
 
+import org.opensearch.common.settings.Settings;
+
 import java.util.Map;
 
 import io.opentelemetry.api.OpenTelemetry;
@@ -23,9 +25,10 @@ private OTelResourceProvider() {}
 
     /**
      * Creates OpenTelemetry instance with AutoConfiguredOpenTelemetrySdk settings configuration
+     * @param settings cluster settings
      * @return OpenTelemetry instance
      */
-    public static OpenTelemetry get() {
+    public static OpenTelemetry get(Settings settings) {
         OpenTelemetry openTelemetry = AutoConfiguredOpenTelemetrySdk.builder()
             .setResultAsGlobal(false)
             .addPropertiesSupplier(() -> Map.of("otel.logs.exporter", "none", "otel.metrics.exporter", "none"))

plugins/telemetry-otel/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider

@@ -6,4 +6,4 @@
 # compatible open source license.
 #
 
-org.opensearch.telemetry.tracing.InMemorySingletonSpanProvider
+org.opensearch.telemetry.tracing.InMemorySingletonSpanExporterProvider

plugins/telemetry-otel/src/test/java/org/opensearch/telemetry/OTelTelemetryPluginTests.java

@@ -10,6 +10,7 @@
 
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
+import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.FeatureFlags;
 import org.opensearch.telemetry.tracing.OTelTracingTelemetry;
 import org.opensearch.telemetry.tracing.TracingTelemetry;
@@ -32,9 +33,8 @@ public class OTelTelemetryPluginTests extends OpenSearchTestCase {
 
     @Before
     public void setup() {
-        // TRACER_EXPORTER_DELAY_SETTING should always be less than 10 seconds because
-        // io.opentelemetry.sdk.OpenTelemetrySdk.close waits only for 10 seconds for shutdown to complete.
-        oTelTracerModulePlugin = new OTelTelemetryPlugin();
+        Settings settings = Settings.builder().build();
+        oTelTracerModulePlugin = new OTelTelemetryPlugin(settings);
         telemetry = oTelTracerModulePlugin.getTelemetry();
         tracingTelemetry = telemetry.get().getTracingTelemetry();
     }

server/src/main/java/org/opensearch/node/Node.java

@@ -723,18 +723,6 @@ protected Node(
                 threadPool
             );
 
-            TracerFactory tracerFactory;
-            if (FeatureFlags.isEnabled(TELEMETRY)) {
-                final TelemetrySettings telemetrySettings = new TelemetrySettings(settings, clusterService.getClusterSettings());
-                List<TelemetryPlugin> telemetryPlugins = pluginsService.filterPlugins(TelemetryPlugin.class);
-                TelemetryModule telemetryModule = new TelemetryModule(telemetryPlugins);
-                tracerFactory = new TracerFactory(telemetrySettings, telemetryModule.getTelemetry(), threadPool.getThreadContext());
-            } else {
-                tracerFactory = new NoopTracerFactory();
-            }
-            tracer = tracerFactory.getTracer();
-            resourcesToClose.add(tracer::close);
-
             final IndicesService indicesService = new IndicesService(
                 settings,
                 pluginsService,
@@ -1048,6 +1036,18 @@ protected Node(
                 searchModule.getIndexSearcherExecutor(threadPool)
             );
 
+            TracerFactory tracerFactory;
+            if (FeatureFlags.isEnabled(TELEMETRY)) {
+                final TelemetrySettings telemetrySettings = new TelemetrySettings(settings, clusterService.getClusterSettings());
+                List<TelemetryPlugin> telemetryPlugins = pluginsService.filterPlugins(TelemetryPlugin.class);
+                TelemetryModule telemetryModule = new TelemetryModule(telemetryPlugins);
+                tracerFactory = new TracerFactory(telemetrySettings, telemetryModule.getTelemetry(), threadPool.getThreadContext());
+            } else {
+                tracerFactory = new NoopTracerFactory();
+            }
+            tracer = tracerFactory.getTracer();
+            resourcesToClose.add(tracer::close);
+
             final List<PersistentTasksExecutor<?>> tasksExecutors = pluginsService.filterPlugins(PersistentTaskPlugin.class)
                 .stream()
                 .map(