Skip to content

Add ICP agent configurations to the log message when ICP agent running #1393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anuruddhal merged 13 commits into from
Dec 1, 2025
Merged

Add ICP agent configurations to the log message when ICP agent running #1393

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
17f7196
[Automated] Update the native jar versions
NipunaMadhushan Oct 3, 2025
b39230a
[Automated] Update the native jar versions
NipunaMadhushan Oct 16, 2025
45ab630
Add ICP tags to log message if ICP agent running
NipunaMadhushan Oct 16, 2025
78b4b09
Fix merge conflicts
NipunaMadhushan Oct 16, 2025
6cf8f45
[Automated] Update the native jar versions
NipunaMadhushan Oct 16, 2025
338370b
[Automated] Update the native jar versions
NipunaMadhushan Oct 16, 2025
02ef375
[Automated] Update the native jar versions
NipunaMadhushan Nov 26, 2025
7a39711
[Automated] Update the native jar versions
NipunaMadhushan Nov 26, 2025
a80dd75
Remove unneccessary tags
NipunaMadhushan Nov 26, 2025
ccd4534
Merge branch 'master' of https://github.com/ballerina-platform/module…
NipunaMadhushan Nov 26, 2025
134e83c
[Automated] Update the native jar versions
NipunaMadhushan Nov 26, 2025
300af02
Address review suggestions
NipunaMadhushan Nov 26, 2025
8d5d0a1
Address review suggestions
NipunaMadhushan Nov 26, 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
4 changes: 2 additions & 2 deletions ballerina/Dependencies.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

[ballerina]
dependencies-toml-version = "2"
distribution-version = "2201.12.0"
distribution-version = "2201.13.0-20251016-073200-0d348172"
Copy link
Contributor

@TharmiganK TharmiganK Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason to bump the lang version? Can't we do it as a patch on top of update 12?


[[package]]
org = "ballerina"
Expand Down Expand Up @@ -91,7 +91,7 @@ modules = [
[[package]]
org = "ballerina"
name = "observe"
version = "1.5.0"
version = "1.6.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand Down
19 changes: 19 additions & 0 deletions ballerina/root_logger.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,25 @@ isolated class RootLogger {
logRecord[k] = v;
}
}
if observe:isObservabilityEnabled() {
string? runtimeId = observe:getTagValue("runtime");
if runtimeId is string {
logRecord["runtime"] = runtimeId;
}
string? componentId = observe:getTagValue("component");
if componentId is string {
logRecord["component"] = componentId;
}
string? environmentId = observe:getTagValue("environment");
if environmentId is string {
logRecord["environment"] = environmentId;
}
string? projectId = observe:getTagValue("project");
if projectId is string {
logRecord["project"] = projectId;
}
}

foreach [string, Value] [k, v] in self.keyValues.entries() {
logRecord[k] = v is Valuer ? v() :
(v is PrintableRawTemplate ? evaluateTemplate(v, self.enableSensitiveDataMasking) : v);
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
org.gradle.caching=true
group=io.ballerina.stdlib
version=2.14.1-SNAPSHOT
ballerinaLangVersion=2201.12.0
version=2.15.0-SNAPSHOT
ballerinaLangVersion=2201.13.0-20251016-073200-0d348172

checkstylePluginVersion=10.12.0
spotbugsPluginVersion=6.0.18
Expand All @@ -15,6 +15,6 @@ jacksonDatabindVersion=2.17.2

#stdlib dependencies
stdlibIoVersion=1.8.0
observeVersion=1.5.0
observeVersion=1.6.0-20251016-103500-bf7ffd2
observeInternalVersion=1.5.0
testngVersion=6.14.3