Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
5df60a4
parse attribute limits
maryliag Sep 23, 2025
2381346
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Sep 23, 2025
b2bfada
set propagators
maryliag Sep 23, 2025
8f60964
parse limit of tracer provider
maryliag Sep 23, 2025
6933b03
add meter and logger
maryliag Sep 23, 2025
9dec6ab
fix lint
maryliag Sep 23, 2025
01497ab
add changelog
maryliag Sep 23, 2025
aaaed79
create check for propagator
maryliag Oct 2, 2025
2d0369c
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 2, 2025
bb00dc8
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 7, 2025
0ce3289
parse trace provider
maryliag Oct 7, 2025
860aae1
add changelog
maryliag Oct 7, 2025
2e06c42
update changelog
maryliag Oct 7, 2025
4f18dd4
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 8, 2025
da7762d
fix post merge
maryliag Oct 8, 2025
2cd03d7
fix pos merge
maryliag Oct 8, 2025
6265f0f
parse logger provider
maryliag Oct 8, 2025
8e0420d
add changelog
maryliag Oct 8, 2025
f26c8d0
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 8, 2025
7d09a23
fix lint
maryliag Oct 8, 2025
d5546b7
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 8, 2025
dd229ae
separate models
maryliag Oct 9, 2025
30fffce
Merge branch 'tracer-parse' into logger-parse
maryliag Oct 9, 2025
79d6a61
updates to model
maryliag Oct 9, 2025
60fafee
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 9, 2025
2ec2b47
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 9, 2025
1061b07
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 10, 2025
6c7f7a9
feedback from PR
maryliag Oct 10, 2025
2b48da4
fix endpoint
maryliag Oct 10, 2025
f40c414
Merge branch 'tracer-parse' into logger-parse
maryliag Oct 10, 2025
b324fd4
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 14, 2025
2b8a2d2
fixes with messed merge
maryliag Oct 14, 2025
e1913b4
Merge branch 'main' into logger-parse
maryliag Oct 15, 2025
eff2f69
Merge branch 'main' into logger-parse
maryliag Oct 16, 2025
43a2640
fix log exporter
maryliag Oct 19, 2025
1e2c925
feat(otlp-exporter-base): accept TLS config for node HTTP exporters f…
david-luna Oct 16, 2025
5b2988f
test(sdk-logs): ensure process.env is cleaned up between tests (#6017)
cjihrig Oct 16, 2025
6556527
chore(deps): Update `import-in-the-middle` (#6020)
timfish Oct 17, 2025
ac553cb
test(otlp-grpc-exporter-base): remove duplicated `delete` statements …
cjihrig Oct 17, 2025
a42ee3f
chore(move-to-emeriuts): create token before checkout (#6018)
pichlermarc Oct 17, 2025
57bd3a2
add tests to improve coverage
maryliag Oct 19, 2025
8cf5a2b
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 19, 2025
faf0c56
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 20, 2025
50dfad0
Merge branch 'main' into logger-parse
maryliag Oct 20, 2025
e472748
feat(opentelemetry-configuration): support file with format rc.2 (#6029)
maryliag Oct 20, 2025
542bd28
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 20, 2025
21c8abc
Merge branch 'main' into logger-parse
maryliag Oct 21, 2025
f4d1d0c
Merge branch 'main' into logger-parse
maryliag Oct 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix lint
  • Loading branch information
maryliag committed Sep 23, 2025
commit 9dec6abacea6c881b572ce66ae663e35206728f8
Original file line number Diff line number Diff line change
Expand Up @@ -268,15 +268,17 @@ function setMeterProvider(
meterProvider: ConfigMeterProvider
): void {
if (meterProvider) {
const exemplarFilter = getStringFromConfigFile(meterProvider['exemplar_filter']);
if (
exemplarFilter &&
(exemplarFilter === 'trace_based' ||
exemplarFilter === 'always_on' ||
exemplarFilter === 'always_off')
) {
config.meter_provider.exemplar_filter = exemplarFilter;
}
const exemplarFilter = getStringFromConfigFile(
meterProvider['exemplar_filter']
);
if (
exemplarFilter &&
(exemplarFilter === 'trace_based' ||
exemplarFilter === 'always_on' ||
exemplarFilter === 'always_off')
) {
config.meter_provider.exemplar_filter = exemplarFilter;
}
}
}

Expand All @@ -292,7 +294,7 @@ function setLoggerProvider(
config.logger_provider.limits.attribute_value_length_limit =
attributeValueLengthLimit;
}

const attributeCountLimit = getNumberFromConfigFile(
loggerProvider['limits']['attribute_count_limit']
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@ describe('ConfigProvider', function () {
limits: {
attribute_value_length_limit: 28,
attribute_count_limit: 29,
}
},
},
};

Expand Down
Loading