Skip to content

[Microsoft.App] add java agent related properties #28192

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
fangjian0423 merged 9 commits into from
Mar 22, 2024
Merged

[Microsoft.App] add java agent related properties #28192

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9e00dcf
add java agent related properties
fangjian0423 Mar 11, 2024
a47e367
fix build error
fangjian0423 Mar 11, 2024
d8031fc
fix format
fangjian0423 Mar 11, 2024
0c10a19
resolve conflicts
fangjian0423 Mar 12, 2024
321d659
re-run pipeline
fangjian0423 Mar 12, 2024
de1c056
update enum list and fix typo
fangjian0423 Mar 12, 2024
43d40e7
revert cspell config
fangjian0423 Mar 13, 2024
7c04653
update level field type from enum to string
fangjian0423 Mar 14, 2024
305cfdc
add identifiers for array prop
fangjian0423 Mar 18, 2024
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
7 changes: 7 additions & 0 deletions cSpell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,13 @@
"containerd"
]
}
,
{
"filename": "**/specification/app/resource-manager/Microsoft.App/**/*.json",
"words": [
"Loglevel"
]
}
],
"enableFiletypes": [
"cadl"
Expand Down
47 changes: 47 additions & 0 deletions ...fication/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/ContainerApps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,23 @@
"enableMetrics": {
"description": "Enable jmx core metrics for the java app",
"type": "boolean"
},
"javaAgent": {
"description": "Diagnostic capabilities achieved by java agent",
"type": "object",
"properties": {
"enabled": {
"description": "Enable java agent injection for the java app.",
Copy link
Member

@raosuhas raosuhas Mar 15, 2024

Choose a reason for hiding this comment

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

":

https://github.com/Azure/azure-openapi-validator/blob/main/docs/enum-instead-of-boolean.md

Copy link
Contributor Author

@fangjian0423 fangjian0423 Mar 18, 2024

Choose a reason for hiding this comment

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

thx for your feedback. It's intended to keep consistent with the enableMetrics property which is also boolean.

"type": "boolean"
},
"logLevelSettings": {
"description": "Settings of the log level for the java app.",
"type": "array",
"items": {
"$ref": "#/definitions/LogLevelSetting"
}
}
}
}
}
},
Expand All @@ -886,6 +903,36 @@
}
}
},
"LogLevelSetting": {
"description": "Log level settings for java workloads.",
"type": "object",
"required": [
"logger",
"level"
],
"properties": {
"logger": {
"description": "Logger name.",
"type": "string"
},
"level": {
"description": "The specified logger's log level.",
"type": "string",
"enum": [
"off",
"error",
"warn",
"info",
"debug",
"trace"
],
"x-ms-enum": {
"name": "level",
"modelAsString": true
}
}
}
},
"Ingress": {
"description": "Container App Ingress configuration.",
"type": "object",
Expand Down
33 changes: 30 additions & 3 deletions ...nager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,16 @@
},
"runtime": {
"java": {
"enableMetrics": true
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
},
"dotnet": {
"autoConfigureDataProtection": true
Expand Down Expand Up @@ -268,7 +277,16 @@
},
"runtime": {
"java": {
"enableMetrics": true
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
},
"dotnet": {
"autoConfigureDataProtection": true
Expand Down Expand Up @@ -401,7 +419,16 @@
},
"runtime": {
"java": {
"enableMetrics": true
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
},
"dotnet": {
"autoConfigureDataProtection": true
Expand Down
33 changes: 30 additions & 3 deletions ...review/2024-02-02-preview/examples/ContainerApps_CreateOrUpdate_ConnectedEnvironment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,16 @@
},
"runtime": {
"java": {
"enableMetrics": true
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
},
"dotnet": {
"autoConfigureDataProtection": true
Expand Down Expand Up @@ -237,7 +246,16 @@
},
"runtime": {
"java": {
"enableMetrics": true
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
},
"dotnet": {
"autoConfigureDataProtection": true
Expand Down Expand Up @@ -350,7 +368,16 @@
},
"runtime": {
"java": {
"enableMetrics": true
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
},
"dotnet": {
"autoConfigureDataProtection": true
Expand Down
11 changes: 10 additions & 1 deletion ...resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,16 @@
},
"runtime": {
"java": {
"enableMetrics": true
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
},
"dotnet": {
"autoConfigureDataProtection": true
Expand Down
11 changes: 10 additions & 1 deletion .../Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,16 @@
},
"runtime": {
"java": {
"enableMetrics": true
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
},
"dotnet": {
"autoConfigureDataProtection": true
Expand Down
11 changes: 10 additions & 1 deletion ...r/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_ListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,16 @@
},
"runtime": {
"java": {
"enableMetrics": true
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
Copy link
Contributor

@howang-ms howang-ms Apr 2, 2024

Choose a reason for hiding this comment

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

Since this more than logLevel , should we call it logSettings extendibility?

Copy link
Contributor Author

@fangjian0423 fangjian0423 Apr 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

hi @howang-ms , current design is aslo extendibility. When adding some new settings, the payload will looks like:

{
    "enabled": true,
    "logLevelSettings": [
        {
            "logger": "org.springframework.boot",
            "level": "debug"
        }
    ],
    "logXXXSettings": {
        "sth": "sth"
    }
}

{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
},
"dotnet": {
"autoConfigureDataProtection": true
Expand Down
22 changes: 20 additions & 2 deletions ...source-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,16 @@
},
"runtime": {
"java": {
"enableMetrics": true
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
},
"dotnet": {
"autoConfigureDataProtection": true
Expand Down Expand Up @@ -207,7 +216,16 @@
},
"runtime": {
"java": {
"enableMetrics": true
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
},
"dotnet": {
"autoConfigureDataProtection": true
Expand Down
11 changes: 10 additions & 1 deletion ...source-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_Start.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,16 @@
},
"runtime": {
"java": {
"enableMetrics": true
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
},
"dotnet": {
"autoConfigureDataProtection": true
Expand Down
11 changes: 10 additions & 1 deletion ...esource-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_Stop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,16 @@
},
"runtime": {
"java": {
"enableMetrics": true
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
},
"dotnet": {
"autoConfigureDataProtection": true
Expand Down