Skip to content

[Microsoft.App] optimize java agent related properties #28573

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 4 commits into from
Apr 9, 2024
Merged

[Microsoft.App] optimize java agent related properties #28573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7c1b49
optimize java agent related props
fangjian0423 Apr 3, 2024
81513cc
fix
fangjian0423 Apr 3, 2024
7895e29
adding logging property to include logger settings
fangjian0423 Apr 8, 2024
13c4192
Merge branch 'release-app-Microsoft.App-2024-02-02-preview' into rele…
bowen5 Apr 8, 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
44 changes: 31 additions & 13 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 @@ -920,16 +920,22 @@
"description": "Enable java agent injection for the java app.",
"type": "boolean"
},
"logLevelSettings": {
"description": "Settings of the log level for the java app.",
"type": "array",
"items": {
"$ref": "#/definitions/LogLevelSetting"
},
"x-ms-identifiers": [
"logger",
"level"
]
"logging": {
"description": "Capabilities on the java logging scenario.",
"type": "object",
"properties": {
"loggerSettings": {
"description": "Settings of the logger for the java app.",
"type": "array",
"items": {
"$ref": "#/definitions/LoggerSetting"
},
"x-ms-identifiers": [
"logger",
"level"
]
}
}
}
}
}
Expand All @@ -947,8 +953,8 @@
}
}
},
"LogLevelSetting": {
"description": "Log level settings for java workloads.",
"LoggerSetting": {
"description": "Logger settings for java workloads.",
"type": "object",
"required": [
"logger",
Expand All @@ -961,7 +967,19 @@
},
"level": {
"description": "The specified logger's log level.",
"type": "string"
"enum": [
"off",
"error",
"info",
"debug",
"trace",
"warn"
],
"type": "string",
"x-ms-enum": {
"name": "level",
"modelAsString": true
}
}
}
},
Expand Down
42 changes: 24 additions & 18 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 @@ -96,12 +96,14 @@
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
"logging": {
"loggerSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
}
},
"dotnet": {
Expand Down Expand Up @@ -292,12 +294,14 @@
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
"logging": {
"loggerSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
}
},
"dotnet": {
Expand Down Expand Up @@ -446,12 +450,14 @@
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
"logging": {
"loggerSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
}
},
"dotnet": {
Expand Down
42 changes: 24 additions & 18 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 @@ -99,12 +99,14 @@
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
"logging": {
"loggerSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
}
},
"dotnet": {
Expand Down Expand Up @@ -249,12 +251,14 @@
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
"logging": {
"loggerSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
}
},
"dotnet": {
Expand Down Expand Up @@ -371,12 +375,14 @@
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
"logging": {
"loggerSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
}
},
"dotnet": {
Expand Down
14 changes: 8 additions & 6 deletions ...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 @@ -81,12 +81,14 @@
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
"logging": {
"loggerSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
}
},
"dotnet": {
Expand Down
14 changes: 8 additions & 6 deletions .../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 @@ -82,12 +82,14 @@
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
"logging": {
"loggerSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
}
},
"dotnet": {
Expand Down
14 changes: 8 additions & 6 deletions ...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 @@ -81,12 +81,14 @@
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
"logging": {
"loggerSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
}
},
"dotnet": {
Expand Down
28 changes: 16 additions & 12 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 @@ -66,12 +66,14 @@
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
"logging": {
"loggerSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
}
},
"dotnet": {
Expand Down Expand Up @@ -219,12 +221,14 @@
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
"logging": {
"loggerSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
}
},
"dotnet": {
Expand Down
14 changes: 8 additions & 6 deletions ...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 @@ -78,12 +78,14 @@
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
"logging": {
"loggerSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
}
},
"dotnet": {
Expand Down
14 changes: 8 additions & 6 deletions ...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 @@ -78,12 +78,14 @@
"enableMetrics": true,
"javaAgent": {
"enabled": true,
"logLevelSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
"logging": {
"loggerSettings": [
{
"logger": "org.springframework.boot",
"level": "debug"
}
]
}
}
},
"dotnet": {
Expand Down