@opentelemetry/configuration 0.211.0 → 0.213.0

package/build/src/FileConfigFactory.js

@@ -1,21 +1,10 @@
 "use strict";
 /*
  * Copyright The OpenTelemetry Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-License-Identifier: Apache-2.0
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setLoggerProvider = exports.setMeterProvider = exports.getTemporalityPreference = exports.setTracerProvider = exports.setPropagator = exports.setAttributeLimits = exports.setResourceAttributes = exports.parseConfigFile = exports.hasValidConfigFile = exports.FileConfigFactory = void 0;
+exports.setLoggerProvider = exports.getSeverity = exports.setMeterProvider = exports.getTemporalityPreference = exports.setTracerProvider = exports.setPropagator = exports.setAttributeLimits = exports.setResourceAttributes = exports.parseConfigFile = exports.hasValidConfigFile = exports.FileConfigFactory = void 0;
 const core_1 = require("@opentelemetry/core");
 const configModel_1 = require("./models/configModel");
 const fs = require("fs");
@@ -51,7 +40,7 @@ function hasValidConfigFile() {
 }
 exports.hasValidConfigFile = hasValidConfigFile;
 function parseConfigFile(config) {
-    const supportedFileVersions = ['1.0-rc.1', '1.0-rc.2'];
+    const supportedFileVersions = ['1.0-rc.3'];
     const configFile = (0, core_1.getStringFromEnv)('OTEL_EXPERIMENTAL_CONFIG_FILE') || '';
     const file = fs.readFileSync(configFile, 'utf8');
     const parsedContent = yaml.parse(file);
@@ -168,13 +157,15 @@ function setAttributeLimits(config, attrLimits) {
 }
 exports.setAttributeLimits = setAttributeLimits;
 function setPropagator(config, propagator) {
-    if (propagator && propagator.composite) {
+    if (propagator && (propagator.composite || propagator.composite_list)) {
         const auxList = [];
         const composite = [];
-        for (let i = 0; i < propagator.composite.length; i++) {
-            const key = Object.keys(propagator.composite[i])[0];
-            auxList.push(key);
-            composite.push({ [key]: null });
+        if (propagator.composite) {
+            for (let i = 0; i < propagator.composite.length; i++) {
+                const key = Object.keys(propagator.composite[i])[0];
+                auxList.push(key);
+                composite.push({ [key]: null });
+            }
         }
         const compositeList = (0, utils_1.getStringListFromConfigFile)(propagator['composite_list']);
         if (compositeList) {
@@ -192,11 +183,12 @@ function setPropagator(config, propagator) {
         }
         const compositeListString = (0, utils_1.getStringFromConfigFile)(propagator['composite_list']);
         if (compositeListString) {
-            if (config.propagator == null) {
-                config.propagator = {};
-            }
             config.propagator.composite_list = compositeListString;
         }
+        else if (auxList.length > 0) {
+            // Generate composite_list from the composite entries
+            config.propagator.composite_list = auxList.join(',');
+        }
     }
 }
 exports.setPropagator = setPropagator;
@@ -257,18 +249,6 @@ function parseConfigSpanOrLogRecordExporter(exporter, providerType) {
                             : commonModel_1.OtlpHttpEncoding.Protobuf,
                     },
                 };
-                certFile = (0, utils_1.getStringFromConfigFile)(e['certificate_file']);
-                if (certFile && parsedExporter.otlp_http) {
-                    parsedExporter.otlp_http.certificate_file = certFile;
-                }
-                clientCertFile = (0, utils_1.getStringFromConfigFile)(e['client_certificate_file']);
-                if (clientCertFile && parsedExporter.otlp_http) {
-                    parsedExporter.otlp_http.client_certificate_file = clientCertFile;
-                }
-                clientKeyFile = (0, utils_1.getStringFromConfigFile)(e['client_key_file']);
-                if (clientKeyFile && parsedExporter.otlp_http) {
-                    parsedExporter.otlp_http.client_key_file = clientKeyFile;
-                }
                 compression = (0, utils_1.getStringFromConfigFile)(e['compression']);
                 if (compression && parsedExporter.otlp_http) {
                     parsedExporter.otlp_http.compression = compression;
@@ -281,6 +261,15 @@ function parseConfigSpanOrLogRecordExporter(exporter, providerType) {
                 if (headers && parsedExporter.otlp_http) {
                     parsedExporter.otlp_http.headers = headers;
                 }
+                if (e['tls']) {
+                    certFile = (0, utils_1.getStringFromConfigFile)(e['tls']['ca_file']);
+                    clientCertFile = (0, utils_1.getStringFromConfigFile)(e['tls']['cert_file']);
+                    clientKeyFile = (0, utils_1.getStringFromConfigFile)(e['tls']['key_file']);
+                    const tls = (0, utils_1.getHttpTlsConfig)(certFile, clientKeyFile, clientCertFile);
+                    if (tls) {
+                        parsedExporter.otlp_http.tls = tls;
+                    }
+                }
             }
             break;
         case 'otlp_grpc':
@@ -292,18 +281,6 @@ function parseConfigSpanOrLogRecordExporter(exporter, providerType) {
                         timeout: (0, utils_1.getNumberFromConfigFile)(e['timeout']) ?? 10000,
                     },
                 };
-                certFile = (0, utils_1.getStringFromConfigFile)(e['certificate_file']);
-                if (certFile && parsedExporter.otlp_grpc) {
-                    parsedExporter.otlp_grpc.certificate_file = certFile;
-                }
-                clientCertFile = (0, utils_1.getStringFromConfigFile)(e['client_certificate_file']);
-                if (clientCertFile && parsedExporter.otlp_grpc) {
-                    parsedExporter.otlp_grpc.client_certificate_file = clientCertFile;
-                }
-                clientKeyFile = (0, utils_1.getStringFromConfigFile)(e['client_key_file']);
-                if (clientKeyFile && parsedExporter.otlp_grpc) {
-                    parsedExporter.otlp_grpc.client_key_file = clientKeyFile;
-                }
                 compression = (0, utils_1.getStringFromConfigFile)(e['compression']);
                 if (compression && parsedExporter.otlp_grpc) {
                     parsedExporter.otlp_grpc.compression = compression;
@@ -316,9 +293,15 @@ function parseConfigSpanOrLogRecordExporter(exporter, providerType) {
                 if (headers && parsedExporter.otlp_grpc) {
                     parsedExporter.otlp_grpc.headers = headers;
                 }
-                insecure = (0, utils_1.getBooleanFromConfigFile)(e['insecure']);
-                if ((insecure || insecure === false) && parsedExporter.otlp_grpc) {
-                    parsedExporter.otlp_grpc.insecure = insecure;
+                if (e['tls']) {
+                    certFile = (0, utils_1.getStringFromConfigFile)(e['tls']['ca_file']);
+                    clientCertFile = (0, utils_1.getStringFromConfigFile)(e['tls']['cert_file']);
+                    clientKeyFile = (0, utils_1.getStringFromConfigFile)(e['tls']['key_file']);
+                    insecure = (0, utils_1.getBooleanFromConfigFile)(e['tls']['insecure']);
+                    const tls = (0, utils_1.getGrpcTlsConfig)(certFile, clientKeyFile, clientCertFile, insecure);
+                    if (tls) {
+                        parsedExporter.otlp_grpc.tls = tls;
+                    }
                 }
             }
             break;
@@ -337,18 +320,6 @@ function parseConfigSpanOrLogRecordExporter(exporter, providerType) {
                 console: {},
             };
             break;
-        case 'zipkin':
-            e = exporter['zipkin'];
-            if (e) {
-                parsedExporter = {
-                    zipkin: {
-                        endpoint: (0, utils_1.getStringFromConfigFile)(e['endpoint']) ??
-                            'http://localhost:9411/api/v2/spans',
-                        timeout: (0, utils_1.getNumberFromConfigFile)(e['timeout']) ?? 10000,
-                    },
-                };
-            }
-            break;
     }
     return parsedExporter;
 }
@@ -357,9 +328,6 @@ function setTracerProvider(config, tracerProvider) {
         config.tracer_provider = (0, tracerProviderModel_1.initializeDefaultTracerProviderConfiguration)();
         // Limits
         if (tracerProvider['limits']) {
-            if (config.tracer_provider.limits == null) {
-                config.tracer_provider.limits = {};
-            }
             const attributeValueLengthLimit = (0, utils_1.getNumberFromConfigFile)(tracerProvider['limits']['attribute_value_length_limit']);
             if (attributeValueLengthLimit) {
                 config.tracer_provider.limits.attribute_value_length_limit =
@@ -453,10 +421,7 @@ function getProducers(producers) {
         for (let j = 0; j < producers.length; j++) {
             const producer = producers[j];
             if (Object.keys(producer)[0] === 'opencensus') {
-                parsedProducers.push({ opencensus: undefined });
-            }
-            if (Object.keys(producer)[0] === 'prometheus') {
-                parsedProducers.push({ prometheus: undefined });
+                parsedProducers.push({ opencensus: {} });
             }
         }
     }
@@ -514,18 +479,6 @@ function parseMetricExporter(exporter) {
                         default_histogram_aggregation: getDefaultHistogramAggregation(e['default_histogram_aggregation']),
                     },
                 };
-                certFile = (0, utils_1.getStringFromConfigFile)(e['certificate_file']);
-                if (certFile && parsedExporter.otlp_http) {
-                    parsedExporter.otlp_http.certificate_file = certFile;
-                }
-                clientCertFile = (0, utils_1.getStringFromConfigFile)(e['client_certificate_file']);
-                if (clientCertFile && parsedExporter.otlp_http) {
-                    parsedExporter.otlp_http.client_certificate_file = clientCertFile;
-                }
-                clientKeyFile = (0, utils_1.getStringFromConfigFile)(e['client_key_file']);
-                if (clientKeyFile && parsedExporter.otlp_http) {
-                    parsedExporter.otlp_http.client_key_file = clientKeyFile;
-                }
                 compression = (0, utils_1.getStringFromConfigFile)(e['compression']);
                 if (compression && parsedExporter.otlp_http) {
                     parsedExporter.otlp_http.compression = compression;
@@ -538,6 +491,15 @@ function parseMetricExporter(exporter) {
                 if (headers && parsedExporter.otlp_http) {
                     parsedExporter.otlp_http.headers = headers;
                 }
+                if (e['tls']) {
+                    certFile = (0, utils_1.getStringFromConfigFile)(e['tls']['ca_file']);
+                    clientCertFile = (0, utils_1.getStringFromConfigFile)(e['tls']['cert_file']);
+                    clientKeyFile = (0, utils_1.getStringFromConfigFile)(e['tls']['key_file']);
+                    const tls = (0, utils_1.getHttpTlsConfig)(certFile, clientKeyFile, clientCertFile);
+                    if (tls) {
+                        parsedExporter.otlp_http.tls = tls;
+                    }
+                }
             }
             break;
         case 'otlp_grpc':
@@ -551,18 +513,6 @@ function parseMetricExporter(exporter) {
                         default_histogram_aggregation: getDefaultHistogramAggregation(e['default_histogram_aggregation']),
                     },
                 };
-                certFile = (0, utils_1.getStringFromConfigFile)(e['certificate_file']);
-                if (certFile && parsedExporter.otlp_grpc) {
-                    parsedExporter.otlp_grpc.certificate_file = certFile;
-                }
-                clientCertFile = (0, utils_1.getStringFromConfigFile)(e['client_certificate_file']);
-                if (clientCertFile && parsedExporter.otlp_grpc) {
-                    parsedExporter.otlp_grpc.client_certificate_file = clientCertFile;
-                }
-                clientKeyFile = (0, utils_1.getStringFromConfigFile)(e['client_key_file']);
-                if (clientKeyFile && parsedExporter.otlp_grpc) {
-                    parsedExporter.otlp_grpc.client_key_file = clientKeyFile;
-                }
                 compression = (0, utils_1.getStringFromConfigFile)(e['compression']);
                 if (compression && parsedExporter.otlp_grpc) {
                     parsedExporter.otlp_grpc.compression = compression;
@@ -575,9 +525,15 @@ function parseMetricExporter(exporter) {
                 if (headers && parsedExporter.otlp_grpc) {
                     parsedExporter.otlp_grpc.headers = headers;
                 }
-                insecure = (0, utils_1.getBooleanFromConfigFile)(e['insecure']);
-                if ((insecure || insecure === false) && parsedExporter.otlp_grpc) {
-                    parsedExporter.otlp_grpc.insecure = insecure;
+                if (e['tls']) {
+                    certFile = (0, utils_1.getStringFromConfigFile)(e['tls']['ca_file']);
+                    clientCertFile = (0, utils_1.getStringFromConfigFile)(e['tls']['cert_file']);
+                    clientKeyFile = (0, utils_1.getStringFromConfigFile)(e['tls']['key_file']);
+                    insecure = (0, utils_1.getBooleanFromConfigFile)(e['tls']['insecure']);
+                    const tls = (0, utils_1.getGrpcTlsConfig)(certFile, clientKeyFile, clientCertFile, insecure);
+                    if (tls) {
+                        parsedExporter.otlp_grpc.tls = tls;
+                    }
                 }
             }
             break;
@@ -594,9 +550,15 @@ function parseMetricExporter(exporter) {
             }
             break;
         case 'console':
-            parsedExporter = {
-                console: {},
-            };
+            e = exporter['console'];
+            if (e) {
+                parsedExporter = {
+                    console: {
+                        temporality_preference: getTemporalityPreference(e['temporality_preference']),
+                        default_histogram_aggregation: getDefaultHistogramAggregation(e['default_histogram_aggregation']),
+                    },
+                };
+            }
             break;
     }
     return parsedExporter;
@@ -631,12 +593,37 @@ function setMeterProvider(config, meterProvider) {
                             host: (0, utils_1.getStringFromConfigFile)(element['exporter']['prometheus/development']['host']) ?? 'localhost',
                             port: (0, utils_1.getNumberFromConfigFile)(element['exporter']['prometheus/development']['port']) ?? 9464,
                             without_scope_info: (0, utils_1.getBooleanFromConfigFile)(element['exporter']['prometheus/development']['without_scope_info']) ?? false,
-                            with_resource_constant_labels: {
-                                included: (0, utils_1.getStringListFromConfigFile)(element['exporter']['prometheus/development']['with_resource_constant_labels']['included']) ?? [],
-                                excluded: (0, utils_1.getStringListFromConfigFile)(element['exporter']['prometheus/development']['with_resource_constant_labels']['excluded']) ?? [],
-                            },
+                            without_target_info: (0, utils_1.getBooleanFromConfigFile)(element['exporter']['prometheus/development']['without_target_info']) ?? false,
                         },
                     };
+                    if (element['exporter']['prometheus/development']['with_resource_constant_labels']) {
+                        exporter['prometheus/development'].with_resource_constant_labels =
+                            {
+                                included: (0, utils_1.getStringListFromConfigFile)(element['exporter']['prometheus/development']['with_resource_constant_labels']?.['included']) ?? [],
+                                excluded: (0, utils_1.getStringListFromConfigFile)(element['exporter']['prometheus/development']['with_resource_constant_labels']?.['excluded']) ?? [],
+                            };
+                    }
+                    if (element['exporter']['prometheus/development']['translation_strategy']) {
+                        const ts = (0, utils_1.getStringFromConfigFile)(element['exporter']['prometheus/development']['translation_strategy']);
+                        switch (ts) {
+                            case 'underscore_escaping_with_suffixes':
+                                exporter['prometheus/development'].translation_strategy =
+                                    meterProviderModel_1.ExperimentalPrometheusTranslationStrategy.UnderscoreEscapingWithSuffixes;
+                                break;
+                            case 'underscore_escaping_without_suffixes':
+                                exporter['prometheus/development'].translation_strategy =
+                                    meterProviderModel_1.ExperimentalPrometheusTranslationStrategy.UnderscoreEscapingWithoutSuffixes;
+                                break;
+                            case 'no_utf8_escaping_with_suffixes':
+                                exporter['prometheus/development'].translation_strategy =
+                                    meterProviderModel_1.ExperimentalPrometheusTranslationStrategy.NoUtf8EscapingWithSuffixes;
+                                break;
+                            case 'no_translation':
+                                exporter['prometheus/development'].translation_strategy =
+                                    meterProviderModel_1.ExperimentalPrometheusTranslationStrategy.NoTranslation;
+                                break;
+                        }
+                    }
                     const pullReader = {
                         pull: {
                             exporter: exporter,
@@ -807,6 +794,62 @@ function setMeterProvider(config, meterProvider) {
     }
 }
 exports.setMeterProvider = setMeterProvider;
+function getSeverity(severity) {
+    const severityType = (0, utils_1.getStringFromConfigFile)(severity);
+    switch (severityType) {
+        case 'debug':
+            return commonModel_1.SeverityNumber.DEBUG;
+        case 'debug2':
+            return commonModel_1.SeverityNumber.DEBUG2;
+        case 'debug3':
+            return commonModel_1.SeverityNumber.DEBUG3;
+        case 'debug4':
+            return commonModel_1.SeverityNumber.DEBUG4;
+        case 'info':
+            return commonModel_1.SeverityNumber.INFO;
+        case 'info2':
+            return commonModel_1.SeverityNumber.INFO2;
+        case 'info3':
+            return commonModel_1.SeverityNumber.INFO3;
+        case 'info4':
+            return commonModel_1.SeverityNumber.INFO4;
+        case 'warn':
+            return commonModel_1.SeverityNumber.WARN;
+        case 'warn2':
+            return commonModel_1.SeverityNumber.WARN2;
+        case 'warn3':
+            return commonModel_1.SeverityNumber.WARN3;
+        case 'warn4':
+            return commonModel_1.SeverityNumber.WARN4;
+        case 'error':
+            return commonModel_1.SeverityNumber.ERROR;
+        case 'error2':
+            return commonModel_1.SeverityNumber.ERROR2;
+        case 'error3':
+            return commonModel_1.SeverityNumber.ERROR3;
+        case 'error4':
+            return commonModel_1.SeverityNumber.ERROR4;
+        case 'fatal':
+            return commonModel_1.SeverityNumber.FATAL;
+        case 'fatal2':
+            return commonModel_1.SeverityNumber.FATAL2;
+        case 'fatal3':
+            return commonModel_1.SeverityNumber.FATAL3;
+        case 'fatal4':
+            return commonModel_1.SeverityNumber.FATAL4;
+        case 'trace':
+            return commonModel_1.SeverityNumber.TRACE;
+        case 'trace2':
+            return commonModel_1.SeverityNumber.TRACE2;
+        case 'trace3':
+            return commonModel_1.SeverityNumber.TRACE3;
+        case 'trace4':
+            return commonModel_1.SeverityNumber.TRACE4;
+        default:
+            return undefined;
+    }
+}
+exports.getSeverity = getSeverity;
 function setLoggerProvider(config, loggerProvider) {
     if (loggerProvider && loggerProvider.processors?.length > 0) {
         config.logger_provider = (0, loggerProviderModel_1.initializeDefaultLoggerProviderConfiguration)();
@@ -815,9 +858,6 @@ function setLoggerProvider(config, loggerProvider) {
             const attributeValueLengthLimit = (0, utils_1.getNumberFromConfigFile)(loggerProvider['limits']['attribute_value_length_limit']);
             const attributeCountLimit = (0, utils_1.getNumberFromConfigFile)(loggerProvider['limits']['attribute_count_limit']);
             if (attributeValueLengthLimit || attributeCountLimit) {
-                if (config.logger_provider.limits == null) {
-                    config.logger_provider.limits = { attribute_count_limit: 128 };
-                }
                 if (attributeValueLengthLimit) {
                     config.logger_provider.limits.attribute_value_length_limit =
                         attributeValueLengthLimit;
@@ -863,11 +903,11 @@ function setLoggerProvider(config, loggerProvider) {
         }
         // logger_configurator/development
         if (loggerProvider['logger_configurator/development']) {
-            const defaultConfigDisabled = (0, utils_1.getBooleanFromConfigFile)(loggerProvider['logger_configurator/development']['default_config']?.['disabled']);
+            const defaultConfigDisabled = (0, utils_1.getBooleanFromConfigFile)(loggerProvider['logger_configurator/development']['default_config']?.['enabled']);
             if (defaultConfigDisabled || defaultConfigDisabled === false) {
                 config.logger_provider['logger_configurator/development'] = {
                     default_config: {
-                        disabled: defaultConfigDisabled,
+                        enabled: defaultConfigDisabled,
                     },
                 };
             }
@@ -876,19 +916,32 @@ function setLoggerProvider(config, loggerProvider) {
                 const loggers = [];
                 for (let i = 0; i < loggerProvider['logger_configurator/development'].loggers.length; i++) {
                     const logger = loggerProvider['logger_configurator/development'].loggers[i];
-                    let disabled = false;
+                    let enabled = false;
+                    let traceBased;
+                    let minSeverity;
                     if (logger['config']) {
-                        disabled =
-                            (0, utils_1.getBooleanFromConfigFile)(logger['config']['disabled']) ?? false;
+                        enabled =
+                            (0, utils_1.getBooleanFromConfigFile)(logger['config']['enabled']) ?? false;
+                        traceBased = (0, utils_1.getBooleanFromConfigFile)(logger['config']['trace_based']);
+                        if (logger['config']['minimum_severity']) {
+                            minSeverity = getSeverity(logger['config']['minimum_severity']);
+                        }
                     }
                     const name = (0, utils_1.getStringFromConfigFile)(logger['name']);
                     if (name) {
-                        loggers.push({
+                        const loggerNew = {
                             name: name,
                             config: {
-                                disabled: disabled,
+                                enabled: enabled,
                             },
-                        });
+                        };
+                        if (traceBased !== undefined) {
+                            loggerNew.config.trace_based = traceBased;
+                        }
+                        if (minSeverity !== undefined) {
+                            loggerNew.config.minimum_severity = minSeverity;
+                        }
+                        loggers.push(loggerNew);
                     }
                 }
                 if (config.logger_provider['logger_configurator/development'] == null) {