add more tests

Author: maryliag

experimental/packages/opentelemetry-configuration/src/EnvironmentConfigProvider.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { DiagLogLevel } from '@opentelemetry/api';
 import {
   ConfigurationModel,
   initializeDefaultConfiguration,
@@ -37,10 +36,9 @@ export class EnvironmentConfigProvider implements ConfigProvider {
     this._config = initializeDefaultConfiguration();
     this._config.disabled = getBooleanFromEnv('OTEL_SDK_DISABLED');
 
-    const logLevel = getStringFromEnv('OTEL_LOG_LEVEL');
+    const logLevel = diagLogLevelFromString(getStringFromEnv('OTEL_LOG_LEVEL'));
     if (logLevel) {
-      this._config.log_level =
-        diagLogLevelFromString(logLevel) ?? DiagLogLevel.INFO;
+      this._config.log_level = logLevel;
     }
 
     const nodeResourceDetectors = getStringListFromEnv(

experimental/packages/opentelemetry-configuration/src/FileConfigProvider.ts

@@ -26,7 +26,6 @@ import {
 import { ConfigProvider } from './IConfigProvider';
 import * as fs from 'fs';
 import * as yaml from 'yaml';
-import { DiagLogLevel } from '@opentelemetry/api';
 
 export class FileConfigProvider implements ConfigProvider {
   private _config: ConfigurationModel;
@@ -67,19 +66,35 @@ function ParseConfigFile(config: ConfigurationModel) {
     parsedContent['file_format'] &&
     supportedFileVersions.includes(parsedContent['file_format'])
   ) {
-    config.disabled = setValue(config.disabled, parsedContent['disabled']);
-    config.log_level = setValue(
+    const disabled = getValue(config.disabled, parsedContent['disabled']);
+    if (disabled || disabled === false) {
+      config.disabled = disabled;
+    }
+
+    const logLevel = getValue(
       config.log_level,
-      diagLogLevelFromString(parsedContent['log_level']) ?? DiagLogLevel.INFO
+      diagLogLevelFromString(parsedContent['log_level'])
     );
-    config.resource.attributes_list = setValue(
+    if (logLevel) {
+      config.log_level = logLevel;
+    }
+
+    const attrList = getValue(
       config.resource.attributes_list,
       parsedContent['resource']?.['attributes_list']
     );
-    config.resource.schema_url = setValue(
+    if (attrList) {
+      config.resource.attributes_list = attrList;
+    }
+
+    const schemaUrl = getValue(
       config.resource.schema_url,
       parsedContent['resource']?.['schema_url']
     );
+    if (schemaUrl) {
+      config.resource.schema_url = schemaUrl;
+    }
+
     setResourceAttributes(config, parsedContent['resource']?.['attributes']);
 
     setValuesFromEnvVariables(config);
@@ -91,17 +106,14 @@ function ParseConfigFile(config: ConfigurationModel) {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function setValue(obj: unknown, value: unknown): any {
-  if (value) {
-    return value;
-  }
+function getValue(obj: unknown, value: unknown): any {
   if (typeof obj === 'boolean') {
     const raw = String(value)?.trim().toLowerCase();
     if (raw === 'false') {
       return false;
     }
   }
-  return obj;
+  return value;
 }
 
 /**

experimental/packages/opentelemetry-configuration/test/ConfigProvider.test.ts

@@ -160,6 +160,7 @@ describe('ConfigProvider', function () {
   describe('get values from config file', function () {
     afterEach(function () {
       delete process.env.OTEL_EXPERIMENTAL_CONFIG_FILE;
+      delete process.env.OTEL_NODE_RESOURCE_DETECTORS;
     });
 
     it('should initialize config with default values from valid config file', function () {
@@ -179,6 +180,13 @@ describe('ConfigProvider', function () {
       });
     });
 
+    it('should return error from invalid config file format', function () {
+      process.env.OTEL_EXPERIMENTAL_CONFIG_FILE = 'test/fixtures/invalid.yaml';
+      assert.throws(() => {
+        createConfigProvider();
+      });
+    });
+
     it('should initialize config with default values with empty string for config file', function () {
       process.env.OTEL_EXPERIMENTAL_CONFIG_FILE = '';
       const configProvider = createConfigProvider();
@@ -196,5 +204,30 @@ describe('ConfigProvider', function () {
         defaultConfig
       );
     });
+
+    it('should initialize config with default values from valid short config file', function () {
+      process.env.OTEL_EXPERIMENTAL_CONFIG_FILE =
+        'test/fixtures/short-config.yml';
+      const configProvider = createConfigProvider();
+      assert.deepStrictEqual(
+        configProvider.getInstrumentationConfig(),
+        defaultConfig
+      );
+    });
+
+    it('should initialize config with default values from valid config file and node resources', function () {
+      process.env.OTEL_EXPERIMENTAL_CONFIG_FILE =
+        'test/fixtures/short-config.yml';
+      process.env.OTEL_NODE_RESOURCE_DETECTORS = 'env,host, serviceinstance';
+      const expectedConfig = {
+        ...defaultConfig,
+        node_resource_detectors: ['env', 'host', 'serviceinstance'],
+      };
+      const configProvider = createConfigProvider();
+      assert.deepStrictEqual(
+        configProvider.getInstrumentationConfig(),
+        expectedConfig
+      );
+    });
   });
 });

experimental/packages/opentelemetry-configuration/test/fixtures/invalid.yaml

@@ -0,0 +1 @@
+file_format: "invalid"

experimental/packages/opentelemetry-configuration/test/fixtures/short-config.yml

@@ -0,0 +1,2 @@
+file_format: "1.0-rc.1"
+disabled: false