@opentelemetry/sdk-logs
Advanced tools
Comparing version 0.54.2 to 0.55.0
@@ -9,2 +9,3 @@ import { LogRecordLimits } from './types'; | ||
includeTraceContext: boolean; | ||
mergeResourceWithDefaults: boolean; | ||
}; | ||
@@ -11,0 +12,0 @@ /** |
@@ -25,2 +25,3 @@ /* | ||
includeTraceContext: true, | ||
mergeResourceWithDefaults: true, | ||
}; | ||
@@ -27,0 +28,0 @@ } |
@@ -25,8 +25,14 @@ /* | ||
export var DEFAULT_LOGGER_NAME = 'unknown'; | ||
function prepareResource(mergeWithDefaults, providedResource) { | ||
var resource = providedResource !== null && providedResource !== void 0 ? providedResource : Resource.empty(); | ||
if (mergeWithDefaults) { | ||
return Resource.default().merge(resource); | ||
} | ||
return resource; | ||
} | ||
var LoggerProvider = /** @class */ (function () { | ||
function LoggerProvider(config) { | ||
if (config === void 0) { config = {}; } | ||
var _a; | ||
var mergedConfig = merge({}, loadDefaultConfig(), config); | ||
var resource = Resource.default().merge((_a = mergedConfig.resource) !== null && _a !== void 0 ? _a : Resource.empty()); | ||
var resource = prepareResource(mergedConfig.mergeResourceWithDefaults, config.resource); | ||
this._sharedState = new LoggerProviderSharedState(resource, mergedConfig.forceFlushTimeoutMillis, reconfigureLimits(mergedConfig.logRecordLimits)); | ||
@@ -33,0 +39,0 @@ this._shutdownOnce = new BindOnceFuture(this._shutdown, this); |
@@ -12,2 +12,7 @@ import type { IResource } from '@opentelemetry/resources'; | ||
logRecordLimits?: LogRecordLimits; | ||
/** | ||
* Merge resource with {@link Resource.default()}? | ||
* Default: {@code true} | ||
*/ | ||
mergeResourceWithDefaults?: boolean; | ||
} | ||
@@ -14,0 +19,0 @@ export interface LogRecordLimits { |
@@ -1,2 +0,2 @@ | ||
export declare const VERSION = "0.54.2"; | ||
export declare const VERSION = "0.55.0"; | ||
//# sourceMappingURL=version.d.ts.map |
@@ -17,3 +17,3 @@ /* | ||
// this is autogenerated file, see scripts/version-update.js | ||
export var VERSION = '0.54.2'; | ||
export var VERSION = '0.55.0'; | ||
//# sourceMappingURL=version.js.map |
@@ -9,2 +9,3 @@ import { LogRecordLimits } from './types'; | ||
includeTraceContext: boolean; | ||
mergeResourceWithDefaults: boolean; | ||
}; | ||
@@ -11,0 +12,0 @@ /** |
@@ -25,2 +25,3 @@ /* | ||
includeTraceContext: true, | ||
mergeResourceWithDefaults: true, | ||
}; | ||
@@ -27,0 +28,0 @@ } |
@@ -25,7 +25,13 @@ /* | ||
export const DEFAULT_LOGGER_NAME = 'unknown'; | ||
function prepareResource(mergeWithDefaults, providedResource) { | ||
const resource = providedResource !== null && providedResource !== void 0 ? providedResource : Resource.empty(); | ||
if (mergeWithDefaults) { | ||
return Resource.default().merge(resource); | ||
} | ||
return resource; | ||
} | ||
export class LoggerProvider { | ||
constructor(config = {}) { | ||
var _a; | ||
const mergedConfig = merge({}, loadDefaultConfig(), config); | ||
const resource = Resource.default().merge((_a = mergedConfig.resource) !== null && _a !== void 0 ? _a : Resource.empty()); | ||
const resource = prepareResource(mergedConfig.mergeResourceWithDefaults, config.resource); | ||
this._sharedState = new LoggerProviderSharedState(resource, mergedConfig.forceFlushTimeoutMillis, reconfigureLimits(mergedConfig.logRecordLimits)); | ||
@@ -32,0 +38,0 @@ this._shutdownOnce = new BindOnceFuture(this._shutdown, this); |
@@ -12,2 +12,7 @@ import type { IResource } from '@opentelemetry/resources'; | ||
logRecordLimits?: LogRecordLimits; | ||
/** | ||
* Merge resource with {@link Resource.default()}? | ||
* Default: {@code true} | ||
*/ | ||
mergeResourceWithDefaults?: boolean; | ||
} | ||
@@ -14,0 +19,0 @@ export interface LogRecordLimits { |
@@ -1,2 +0,2 @@ | ||
export declare const VERSION = "0.54.2"; | ||
export declare const VERSION = "0.55.0"; | ||
//# sourceMappingURL=version.d.ts.map |
@@ -17,3 +17,3 @@ /* | ||
// this is autogenerated file, see scripts/version-update.js | ||
export const VERSION = '0.54.2'; | ||
export const VERSION = '0.55.0'; | ||
//# sourceMappingURL=version.js.map |
@@ -9,2 +9,3 @@ import { LogRecordLimits } from './types'; | ||
includeTraceContext: boolean; | ||
mergeResourceWithDefaults: boolean; | ||
}; | ||
@@ -11,0 +12,0 @@ /** |
@@ -28,2 +28,3 @@ "use strict"; | ||
includeTraceContext: true, | ||
mergeResourceWithDefaults: true, | ||
}; | ||
@@ -30,0 +31,0 @@ } |
@@ -28,7 +28,13 @@ "use strict"; | ||
exports.DEFAULT_LOGGER_NAME = 'unknown'; | ||
function prepareResource(mergeWithDefaults, providedResource) { | ||
const resource = providedResource !== null && providedResource !== void 0 ? providedResource : resources_1.Resource.empty(); | ||
if (mergeWithDefaults) { | ||
return resources_1.Resource.default().merge(resource); | ||
} | ||
return resource; | ||
} | ||
class LoggerProvider { | ||
constructor(config = {}) { | ||
var _a; | ||
const mergedConfig = (0, core_1.merge)({}, (0, config_1.loadDefaultConfig)(), config); | ||
const resource = resources_1.Resource.default().merge((_a = mergedConfig.resource) !== null && _a !== void 0 ? _a : resources_1.Resource.empty()); | ||
const resource = prepareResource(mergedConfig.mergeResourceWithDefaults, config.resource); | ||
this._sharedState = new LoggerProviderSharedState_1.LoggerProviderSharedState(resource, mergedConfig.forceFlushTimeoutMillis, (0, config_1.reconfigureLimits)(mergedConfig.logRecordLimits)); | ||
@@ -35,0 +41,0 @@ this._shutdownOnce = new core_1.BindOnceFuture(this._shutdown, this); |
@@ -12,2 +12,7 @@ import type { IResource } from '@opentelemetry/resources'; | ||
logRecordLimits?: LogRecordLimits; | ||
/** | ||
* Merge resource with {@link Resource.default()}? | ||
* Default: {@code true} | ||
*/ | ||
mergeResourceWithDefaults?: boolean; | ||
} | ||
@@ -14,0 +19,0 @@ export interface LogRecordLimits { |
@@ -1,2 +0,2 @@ | ||
export declare const VERSION = "0.54.2"; | ||
export declare const VERSION = "0.55.0"; | ||
//# sourceMappingURL=version.d.ts.map |
@@ -20,3 +20,3 @@ "use strict"; | ||
// this is autogenerated file, see scripts/version-update.js | ||
exports.VERSION = '0.54.2'; | ||
exports.VERSION = '0.55.0'; | ||
//# sourceMappingURL=version.js.map |
{ | ||
"name": "@opentelemetry/sdk-logs", | ||
"version": "0.54.2", | ||
"version": "0.55.0", | ||
"publishConfig": { | ||
@@ -74,7 +74,7 @@ "access": "public" | ||
"devDependencies": { | ||
"@babel/core": "7.25.2", | ||
"@babel/preset-env": "7.25.4", | ||
"@babel/core": "7.26.0", | ||
"@babel/preset-env": "7.26.0", | ||
"@opentelemetry/api": ">=1.4.0 <1.10.0", | ||
"@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", | ||
"@types/mocha": "10.0.8", | ||
"@types/mocha": "10.0.9", | ||
"@types/node": "18.6.5", | ||
@@ -91,3 +91,3 @@ "@types/sinon": "17.0.3", | ||
"lerna": "6.6.2", | ||
"mocha": "10.7.3", | ||
"mocha": "10.8.2", | ||
"nyc": "15.1.0", | ||
@@ -97,3 +97,3 @@ "sinon": "15.1.2", | ||
"typescript": "4.4.4", | ||
"webpack": "5.94.0", | ||
"webpack": "5.96.1", | ||
"webpack-cli": "5.1.4", | ||
@@ -103,7 +103,7 @@ "webpack-merge": "5.10.0" | ||
"dependencies": { | ||
"@opentelemetry/api-logs": "0.54.2", | ||
"@opentelemetry/core": "1.27.0", | ||
"@opentelemetry/resources": "1.27.0" | ||
"@opentelemetry/api-logs": "0.55.0", | ||
"@opentelemetry/core": "1.28.0", | ||
"@opentelemetry/resources": "1.28.0" | ||
}, | ||
"gitHead": "72c9af91983e4b7aade98c901bd45c6cefee0da4" | ||
"gitHead": "4b1ad3fda0cde58907e30fab25c3c767546708e5" | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
425889
4462
+ Added@opentelemetry/api-logs@0.55.0(transitive)
+ Added@opentelemetry/core@1.28.0(transitive)
+ Added@opentelemetry/resources@1.28.0(transitive)
- Removed@opentelemetry/api-logs@0.54.2(transitive)
- Removed@opentelemetry/core@1.27.0(transitive)
- Removed@opentelemetry/resources@1.27.0(transitive)
Updated@opentelemetry/core@1.28.0