-
Notifications
You must be signed in to change notification settings - Fork 205
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.
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
Load the correct logback file for the http json service respecting the deployment situation #9938
Conversation
…e deployment situation changelog_begin [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars changelog_end
So proof that with this fix it works correctly (just to track that this manual test succeeded):
|
@@ -46,7 +46,12 @@ object Main { | |||
case LogEncoder.Plain => () // This is the default | |||
case LogEncoder.Json => | |||
Logging.setUseJsonLogEncoderSystemProp() | |||
Logging.reconfigure(getClass, "logback.xml") | |||
val path: PathKind = |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fact that you only do this in the JSON API seems a bit worrying. We handle logback files the same for all components. Should we move the logic into reconfigure
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was my thought too, but so far I see only the json api does this because no other service spits out json logs yet if I remember correctly.
Considering that the system prop is named same for every other service I think this should be safe to move there 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I’m hoping that the fact that no other sevrice supports this is a temporary state and eventually everything produces json logs :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok adressed with e795cfc
fine for you @cocreature ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm with one suggestion
This PR has been created by a script, which is not very smart and does not have all the context. Please do double-check that the version prefix is correct before merging. @stefanobaghino-da is in charge of this release. Commit log: ``` adeba20 DPP-403 log flyway progress (#9964) 401069e prepare for upgrade to Scalaz 7.3.3 (#9997) 3ad9cd5 [JSON-API] Log templateId & choice name (if present) on command submissions in the json API (#10005) af144e8 LF: Structure package loading errors (#9980) 3583fd1 [JSON-API] Log source and path of incoming http requests & the response with info level (#10007) e49c7c8 [In-memory fan-out] BufferedTransactionsReader implementation [DPP-413] [DPP-414] (#9882) acb7733 Release 1.14 RC 2 (#10006) 3d2d4b9 Don't duplicate log failed futures in the http json api (commandservice specific ones) (#9990) 0c32cf2 Clarify the semantics of DIV_INT64 in LF spec. (#10003) b79e739 Fix Type (#10004) 998f106 Drop pkgIds argument from Engine.validatePackages (#9986) ae5010f [Mutable state cache] Start cache from latest ledger head (#9998) dd42a5a update maven_install_2.12.json (#9999) 66d38cd Storage query abstraction first sketch (#9959) c750136 Just print out the operator name for the operation logging in CommandService.scala (#9989) b6faace Changing oracle backend from using varray to json array (#9943) 603a4a4 Add date to log statements in the HTTP JSON service (#9988) 836a82a Add proper error handling for missing contract keys (#9972) 85667af Address npm vulnerabilities (#9978) d7d6e37 LF: Structure Engine Errors. (#9971) 0adbbdc update Daml Hub auth in create-daml-app (#9973) 997a7d4 Use symlinks on Windows (#9969) e4258e6 docs: tweak Exception intro (#9967) b2c4ef8 rotate release duty after 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9933) de7a462 Log call to submitAndWaitRequest with the command id provided in the log ctx (#9940) 630d021 Collect build-event-stream (#9831) 26e199a Rerelease 1.11.2 snapshot (#9965) 8399039 Remove broken dep from release job (#9963) e1db529 DPP-390 configurable event decoding parallelism (#9931) cc7af93 [docs] Remove link to the #daml-contributors (#9928) f7ac3ba Release 1.11.2 snapshot attempt 2 (#9962) 4634147 Adds Indexer state to GRPC health checks [DPP-434] (#9951) 28c567b Release SDK 1.11.2 (#9957) 5f0f575 Define IncompleteTransaction for use by scenario-service (#9952) b7fd833 Increase `eventually` timeout when waiting for queue to be killed (#9955) ca0fb16 Fix collect_build_data job (#9956) 42030b2 Skip Scala_2_12 job on releases (#9954) 5e1ddfb LF: Fix specification of ArithmeticError (#9949) 3093a98 Forward port additional contract keys validation tests (#9944) e541558 update NOTICES file (#9946) db792a9 Proxy ledger API health endpoint in JSON API health endpoint (#9945) 13767b5 Load the correct logback file for the http json service respecting the deployment situation (#9938) 4e49cf6 `ledger-api-bench-tool` - Active contracts stream, completions stream [DPP-398, DPP-399] (#9857) fce8e54 release 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9932) ab55fb2 Handle module-prefixes in Java codegen (#9929) 7375e28 Force resolution for css what to 5.0.1 (#9925) ``` Changelog: ``` - [JSON API] The template id & choice name (if present) are now logged on command submissions in the Json API (at trace level) - [JSON-API] The source and the path for incoming http requests are now logged - [JSON-API] The http response for a request is now logged - [JSON API] Errors which arise from the CommandService are not logged twice anymore (thus reducing noise) - [JSON API] log statements now include the date next to the time - [HTTP-JSON] Calls which trigger a submitAndWaitRequest are logged with the command id provided in the log ctx [Integration Kit] The state of the participant indexer can now be checked via the GRPC health endpoint - [JSON API] The healthcheck endpoint on the JSON API now proxies the health check endpoint on the underlying ledger. Previously it only queried for ledger end to determine ledger health. [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars - [Integration Kit] - ledger-api-bench-tool - reading active contract streams - [Integration Kit] - ledger-api-bench-tool - Reading completions stream - [Java Codegen] The Java codegen will now pick up the `module-prefixes` field from `daml.yaml` which can be used to handle module name collisions between different DALFs. ``` CHANGELOG_BEGIN CHANGELOG_END
This PR has been created by a script, which is not very smart and does not have all the context. Please do double-check that the version prefix is correct before merging. @stefanobaghino-da is in charge of this release. Commit log: ``` adeba20 DPP-403 log flyway progress (#9964) 401069e prepare for upgrade to Scalaz 7.3.3 (#9997) 3ad9cd5 [JSON-API] Log templateId & choice name (if present) on command submissions in the json API (#10005) af144e8 LF: Structure package loading errors (#9980) 3583fd1 [JSON-API] Log source and path of incoming http requests & the response with info level (#10007) e49c7c8 [In-memory fan-out] BufferedTransactionsReader implementation [DPP-413] [DPP-414] (#9882) acb7733 Release 1.14 RC 2 (#10006) 3d2d4b9 Don't duplicate log failed futures in the http json api (commandservice specific ones) (#9990) 0c32cf2 Clarify the semantics of DIV_INT64 in LF spec. (#10003) b79e739 Fix Type (#10004) 998f106 Drop pkgIds argument from Engine.validatePackages (#9986) ae5010f [Mutable state cache] Start cache from latest ledger head (#9998) dd42a5a update maven_install_2.12.json (#9999) 66d38cd Storage query abstraction first sketch (#9959) c750136 Just print out the operator name for the operation logging in CommandService.scala (#9989) b6faace Changing oracle backend from using varray to json array (#9943) 603a4a4 Add date to log statements in the HTTP JSON service (#9988) 836a82a Add proper error handling for missing contract keys (#9972) 85667af Address npm vulnerabilities (#9978) d7d6e37 LF: Structure Engine Errors. (#9971) 0adbbdc update Daml Hub auth in create-daml-app (#9973) 997a7d4 Use symlinks on Windows (#9969) e4258e6 docs: tweak Exception intro (#9967) b2c4ef8 rotate release duty after 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9933) de7a462 Log call to submitAndWaitRequest with the command id provided in the log ctx (#9940) 630d021 Collect build-event-stream (#9831) 26e199a Rerelease 1.11.2 snapshot (#9965) 8399039 Remove broken dep from release job (#9963) e1db529 DPP-390 configurable event decoding parallelism (#9931) cc7af93 [docs] Remove link to the #daml-contributors (#9928) f7ac3ba Release 1.11.2 snapshot attempt 2 (#9962) 4634147 Adds Indexer state to GRPC health checks [DPP-434] (#9951) 28c567b Release SDK 1.11.2 (#9957) 5f0f575 Define IncompleteTransaction for use by scenario-service (#9952) b7fd833 Increase `eventually` timeout when waiting for queue to be killed (#9955) ca0fb16 Fix collect_build_data job (#9956) 42030b2 Skip Scala_2_12 job on releases (#9954) 5e1ddfb LF: Fix specification of ArithmeticError (#9949) 3093a98 Forward port additional contract keys validation tests (#9944) e541558 update NOTICES file (#9946) db792a9 Proxy ledger API health endpoint in JSON API health endpoint (#9945) 13767b5 Load the correct logback file for the http json service respecting the deployment situation (#9938) 4e49cf6 `ledger-api-bench-tool` - Active contracts stream, completions stream [DPP-398, DPP-399] (#9857) fce8e54 release 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9932) ab55fb2 Handle module-prefixes in Java codegen (#9929) 7375e28 Force resolution for css what to 5.0.1 (#9925) ``` Changelog: ``` - [JSON API] The template id & choice name (if present) are now logged on command submissions in the Json API (at trace level) - [JSON-API] The source and the path for incoming http requests are now logged - [JSON-API] The http response for a request is now logged - [JSON API] Errors which arise from the CommandService are not logged twice anymore (thus reducing noise) - [JSON API] log statements now include the date next to the time - [HTTP-JSON] Calls which trigger a submitAndWaitRequest are logged with the command id provided in the log ctx [Integration Kit] The state of the participant indexer can now be checked via the GRPC health endpoint - [JSON API] The healthcheck endpoint on the JSON API now proxies the health check endpoint on the underlying ledger. Previously it only queried for ledger end to determine ledger health. [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars - [Integration Kit] - ledger-api-bench-tool - reading active contract streams - [Integration Kit] - ledger-api-bench-tool - Reading completions stream - [Java Codegen] The Java codegen will now pick up the `module-prefixes` field from `daml.yaml` which can be used to handle module name collisions between different DALFs. ``` CHANGELOG_BEGIN CHANGELOG_END Co-authored-by: Azure Pipelines DAML Build <[email protected]>
This PR has been created by a script, which is not very smart and does not have all the context. Please do double-check that the version prefix is correct before merging. @stefanobaghino-da is in charge of this release. Commit log: ``` adeba20 DPP-403 log flyway progress (#9964) 401069e prepare for upgrade to Scalaz 7.3.3 (#9997) 3ad9cd5 [JSON-API] Log templateId & choice name (if present) on command submissions in the json API (#10005) af144e8 LF: Structure package loading errors (#9980) 3583fd1 [JSON-API] Log source and path of incoming http requests & the response with info level (#10007) e49c7c8 [In-memory fan-out] BufferedTransactionsReader implementation [DPP-413] [DPP-414] (#9882) acb7733 Release 1.14 RC 2 (#10006) 3d2d4b9 Don't duplicate log failed futures in the http json api (commandservice specific ones) (#9990) 0c32cf2 Clarify the semantics of DIV_INT64 in LF spec. (#10003) b79e739 Fix Type (#10004) 998f106 Drop pkgIds argument from Engine.validatePackages (#9986) ae5010f [Mutable state cache] Start cache from latest ledger head (#9998) dd42a5a update maven_install_2.12.json (#9999) 66d38cd Storage query abstraction first sketch (#9959) c750136 Just print out the operator name for the operation logging in CommandService.scala (#9989) b6faace Changing oracle backend from using varray to json array (#9943) 603a4a4 Add date to log statements in the HTTP JSON service (#9988) 836a82a Add proper error handling for missing contract keys (#9972) 85667af Address npm vulnerabilities (#9978) d7d6e37 LF: Structure Engine Errors. (#9971) 0adbbdc update Daml Hub auth in create-daml-app (#9973) 997a7d4 Use symlinks on Windows (#9969) e4258e6 docs: tweak Exception intro (#9967) b2c4ef8 rotate release duty after 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9933) de7a462 Log call to submitAndWaitRequest with the command id provided in the log ctx (#9940) 630d021 Collect build-event-stream (#9831) 26e199a Rerelease 1.11.2 snapshot (#9965) 8399039 Remove broken dep from release job (#9963) e1db529 DPP-390 configurable event decoding parallelism (#9931) cc7af93 [docs] Remove link to the #daml-contributors (#9928) f7ac3ba Release 1.11.2 snapshot attempt 2 (#9962) 4634147 Adds Indexer state to GRPC health checks [DPP-434] (#9951) 28c567b Release SDK 1.11.2 (#9957) 5f0f575 Define IncompleteTransaction for use by scenario-service (#9952) b7fd833 Increase `eventually` timeout when waiting for queue to be killed (#9955) ca0fb16 Fix collect_build_data job (#9956) 42030b2 Skip Scala_2_12 job on releases (#9954) 5e1ddfb LF: Fix specification of ArithmeticError (#9949) 3093a98 Forward port additional contract keys validation tests (#9944) e541558 update NOTICES file (#9946) db792a9 Proxy ledger API health endpoint in JSON API health endpoint (#9945) 13767b5 Load the correct logback file for the http json service respecting the deployment situation (#9938) 4e49cf6 `ledger-api-bench-tool` - Active contracts stream, completions stream [DPP-398, DPP-399] (#9857) fce8e54 release 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9932) ab55fb2 Handle module-prefixes in Java codegen (#9929) 7375e28 Force resolution for css what to 5.0.1 (#9925) ``` Changelog: ``` - [JSON API] The template id & choice name (if present) are now logged on command submissions in the Json API (at trace level) - [JSON-API] The source and the path for incoming http requests are now logged - [JSON-API] The http response for a request is now logged - [JSON API] Errors which arise from the CommandService are not logged twice anymore (thus reducing noise) - [JSON API] log statements now include the date next to the time - [HTTP-JSON] Calls which trigger a submitAndWaitRequest are logged with the command id provided in the log ctx [Integration Kit] The state of the participant indexer can now be checked via the GRPC health endpoint - [JSON API] The healthcheck endpoint on the JSON API now proxies the health check endpoint on the underlying ledger. Previously it only queried for ledger end to determine ledger health. [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars - [Integration Kit] - ledger-api-bench-tool - reading active contract streams - [Integration Kit] - ledger-api-bench-tool - Reading completions stream - [Java Codegen] The Java codegen will now pick up the `module-prefixes` field from `daml.yaml` which can be used to handle module name collisions between different DALFs. ``` CHANGELOG_BEGIN CHANGELOG_END
Commit log: ``` adeba20 DPP-403 log flyway progress (#9964) 401069e prepare for upgrade to Scalaz 7.3.3 (#9997) 3ad9cd5 [JSON-API] Log templateId & choice name (if present) on command submissions in the json API (#10005) af144e8 LF: Structure package loading errors (#9980) 3583fd1 [JSON-API] Log source and path of incoming http requests & the response with info level (#10007) e49c7c8 [In-memory fan-out] BufferedTransactionsReader implementation [DPP-413] [DPP-414] (#9882) acb7733 Release 1.14 RC 2 (#10006) 3d2d4b9 Don't duplicate log failed futures in the http json api (commandservice specific ones) (#9990) 0c32cf2 Clarify the semantics of DIV_INT64 in LF spec. (#10003) b79e739 Fix Type (#10004) 998f106 Drop pkgIds argument from Engine.validatePackages (#9986) ae5010f [Mutable state cache] Start cache from latest ledger head (#9998) dd42a5a update maven_install_2.12.json (#9999) 66d38cd Storage query abstraction first sketch (#9959) c750136 Just print out the operator name for the operation logging in CommandService.scala (#9989) b6faace Changing oracle backend from using varray to json array (#9943) 603a4a4 Add date to log statements in the HTTP JSON service (#9988) 836a82a Add proper error handling for missing contract keys (#9972) 85667af Address npm vulnerabilities (#9978) d7d6e37 LF: Structure Engine Errors. (#9971) 0adbbdc update Daml Hub auth in create-daml-app (#9973) 997a7d4 Use symlinks on Windows (#9969) e4258e6 docs: tweak Exception intro (#9967) b2c4ef8 rotate release duty after 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9933) de7a462 Log call to submitAndWaitRequest with the command id provided in the log ctx (#9940) 630d021 Collect build-event-stream (#9831) 26e199a Rerelease 1.11.2 snapshot (#9965) 8399039 Remove broken dep from release job (#9963) e1db529 DPP-390 configurable event decoding parallelism (#9931) cc7af93 [docs] Remove link to the #daml-contributors (#9928) f7ac3ba Release 1.11.2 snapshot attempt 2 (#9962) 4634147 Adds Indexer state to GRPC health checks [DPP-434] (#9951) 28c567b Release SDK 1.11.2 (#9957) 5f0f575 Define IncompleteTransaction for use by scenario-service (#9952) b7fd833 Increase `eventually` timeout when waiting for queue to be killed (#9955) ca0fb16 Fix collect_build_data job (#9956) 42030b2 Skip Scala_2_12 job on releases (#9954) 5e1ddfb LF: Fix specification of ArithmeticError (#9949) 3093a98 Forward port additional contract keys validation tests (#9944) e541558 update NOTICES file (#9946) db792a9 Proxy ledger API health endpoint in JSON API health endpoint (#9945) 13767b5 Load the correct logback file for the http json service respecting the deployment situation (#9938) 4e49cf6 `ledger-api-bench-tool` - Active contracts stream, completions stream [DPP-398, DPP-399] (#9857) fce8e54 release 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9932) ab55fb2 Handle module-prefixes in Java codegen (#9929) 7375e28 Force resolution for css what to 5.0.1 (#9925) ``` Changelog: ``` - [JSON API] The template id & choice name (if present) are now logged on command submissions in the Json API (at trace level) - [JSON-API] The source and the path for incoming http requests are now logged - [JSON-API] The http response for a request is now logged - [JSON API] Errors which arise from the CommandService are not logged twice anymore (thus reducing noise) - [JSON API] log statements now include the date next to the time - [HTTP-JSON] Calls which trigger a submitAndWaitRequest are logged with the command id provided in the log ctx [Integration Kit] The state of the participant indexer can now be checked via the GRPC health endpoint - [JSON API] The healthcheck endpoint on the JSON API now proxies the health check endpoint on the underlying ledger. Previously it only queried for ledger end to determine ledger health. [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars - [Integration Kit] - ledger-api-bench-tool - reading active contract streams - [Integration Kit] - ledger-api-bench-tool - Reading completions stream - [Java Codegen] The Java codegen will now pick up the `module-prefixes` field from `daml.yaml` which can be used to handle module name collisions between different DALFs. ``` CHANGELOG_BEGIN CHANGELOG_END
Commit log: ``` adeba20 DPP-403 log flyway progress (#9964) 401069e prepare for upgrade to Scalaz 7.3.3 (#9997) 3ad9cd5 [JSON-API] Log templateId & choice name (if present) on command submissions in the json API (#10005) af144e8 LF: Structure package loading errors (#9980) 3583fd1 [JSON-API] Log source and path of incoming http requests & the response with info level (#10007) e49c7c8 [In-memory fan-out] BufferedTransactionsReader implementation [DPP-413] [DPP-414] (#9882) acb7733 Release 1.14 RC 2 (#10006) 3d2d4b9 Don't duplicate log failed futures in the http json api (commandservice specific ones) (#9990) 0c32cf2 Clarify the semantics of DIV_INT64 in LF spec. (#10003) b79e739 Fix Type (#10004) 998f106 Drop pkgIds argument from Engine.validatePackages (#9986) ae5010f [Mutable state cache] Start cache from latest ledger head (#9998) dd42a5a update maven_install_2.12.json (#9999) 66d38cd Storage query abstraction first sketch (#9959) c750136 Just print out the operator name for the operation logging in CommandService.scala (#9989) b6faace Changing oracle backend from using varray to json array (#9943) 603a4a4 Add date to log statements in the HTTP JSON service (#9988) 836a82a Add proper error handling for missing contract keys (#9972) 85667af Address npm vulnerabilities (#9978) d7d6e37 LF: Structure Engine Errors. (#9971) 0adbbdc update Daml Hub auth in create-daml-app (#9973) 997a7d4 Use symlinks on Windows (#9969) e4258e6 docs: tweak Exception intro (#9967) b2c4ef8 rotate release duty after 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9933) de7a462 Log call to submitAndWaitRequest with the command id provided in the log ctx (#9940) 630d021 Collect build-event-stream (#9831) 26e199a Rerelease 1.11.2 snapshot (#9965) 8399039 Remove broken dep from release job (#9963) e1db529 DPP-390 configurable event decoding parallelism (#9931) cc7af93 [docs] Remove link to the #daml-contributors (#9928) f7ac3ba Release 1.11.2 snapshot attempt 2 (#9962) 4634147 Adds Indexer state to GRPC health checks [DPP-434] (#9951) 28c567b Release SDK 1.11.2 (#9957) 5f0f575 Define IncompleteTransaction for use by scenario-service (#9952) b7fd833 Increase `eventually` timeout when waiting for queue to be killed (#9955) ca0fb16 Fix collect_build_data job (#9956) 42030b2 Skip Scala_2_12 job on releases (#9954) 5e1ddfb LF: Fix specification of ArithmeticError (#9949) 3093a98 Forward port additional contract keys validation tests (#9944) e541558 update NOTICES file (#9946) db792a9 Proxy ledger API health endpoint in JSON API health endpoint (#9945) 13767b5 Load the correct logback file for the http json service respecting the deployment situation (#9938) 4e49cf6 `ledger-api-bench-tool` - Active contracts stream, completions stream [DPP-398, DPP-399] (#9857) fce8e54 release 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9932) ab55fb2 Handle module-prefixes in Java codegen (#9929) 7375e28 Force resolution for css what to 5.0.1 (#9925) ``` Changelog: ``` - [JSON API] The template id & choice name (if present) are now logged on command submissions in the Json API (at trace level) - [JSON-API] The source and the path for incoming http requests are now logged - [JSON-API] The http response for a request is now logged - [JSON API] Errors which arise from the CommandService are not logged twice anymore (thus reducing noise) - [JSON API] log statements now include the date next to the time - [HTTP-JSON] Calls which trigger a submitAndWaitRequest are logged with the command id provided in the log ctx [Integration Kit] The state of the participant indexer can now be checked via the GRPC health endpoint - [JSON API] The healthcheck endpoint on the JSON API now proxies the health check endpoint on the underlying ledger. Previously it only queried for ledger end to determine ledger health. [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars - [Integration Kit] - ledger-api-bench-tool - reading active contract streams - [Integration Kit] - ledger-api-bench-tool - Reading completions stream - [Java Codegen] The Java codegen will now pick up the `module-prefixes` field from `daml.yaml` which can be used to handle module name collisions between different DALFs. ``` CHANGELOG_BEGIN CHANGELOG_END
Commit log: ``` adeba20 DPP-403 log flyway progress (#9964) 401069e prepare for upgrade to Scalaz 7.3.3 (#9997) 3ad9cd5 [JSON-API] Log templateId & choice name (if present) on command submissions in the json API (#10005) af144e8 LF: Structure package loading errors (#9980) 3583fd1 [JSON-API] Log source and path of incoming http requests & the response with info level (#10007) e49c7c8 [In-memory fan-out] BufferedTransactionsReader implementation [DPP-413] [DPP-414] (#9882) acb7733 Release 1.14 RC 2 (#10006) 3d2d4b9 Don't duplicate log failed futures in the http json api (commandservice specific ones) (#9990) 0c32cf2 Clarify the semantics of DIV_INT64 in LF spec. (#10003) b79e739 Fix Type (#10004) 998f106 Drop pkgIds argument from Engine.validatePackages (#9986) ae5010f [Mutable state cache] Start cache from latest ledger head (#9998) dd42a5a update maven_install_2.12.json (#9999) 66d38cd Storage query abstraction first sketch (#9959) c750136 Just print out the operator name for the operation logging in CommandService.scala (#9989) b6faace Changing oracle backend from using varray to json array (#9943) 603a4a4 Add date to log statements in the HTTP JSON service (#9988) 836a82a Add proper error handling for missing contract keys (#9972) 85667af Address npm vulnerabilities (#9978) d7d6e37 LF: Structure Engine Errors. (#9971) 0adbbdc update Daml Hub auth in create-daml-app (#9973) 997a7d4 Use symlinks on Windows (#9969) e4258e6 docs: tweak Exception intro (#9967) b2c4ef8 rotate release duty after 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9933) de7a462 Log call to submitAndWaitRequest with the command id provided in the log ctx (#9940) 630d021 Collect build-event-stream (#9831) 26e199a Rerelease 1.11.2 snapshot (#9965) 8399039 Remove broken dep from release job (#9963) e1db529 DPP-390 configurable event decoding parallelism (#9931) cc7af93 [docs] Remove link to the #daml-contributors (#9928) f7ac3ba Release 1.11.2 snapshot attempt 2 (#9962) 4634147 Adds Indexer state to GRPC health checks [DPP-434] (#9951) 28c567b Release SDK 1.11.2 (#9957) 5f0f575 Define IncompleteTransaction for use by scenario-service (#9952) b7fd833 Increase `eventually` timeout when waiting for queue to be killed (#9955) ca0fb16 Fix collect_build_data job (#9956) 42030b2 Skip Scala_2_12 job on releases (#9954) 5e1ddfb LF: Fix specification of ArithmeticError (#9949) 3093a98 Forward port additional contract keys validation tests (#9944) e541558 update NOTICES file (#9946) db792a9 Proxy ledger API health endpoint in JSON API health endpoint (#9945) 13767b5 Load the correct logback file for the http json service respecting the deployment situation (#9938) 4e49cf6 `ledger-api-bench-tool` - Active contracts stream, completions stream [DPP-398, DPP-399] (#9857) fce8e54 release 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9932) ab55fb2 Handle module-prefixes in Java codegen (#9929) 7375e28 Force resolution for css what to 5.0.1 (#9925) ``` Changelog: ``` - [JSON API] The template id & choice name (if present) are now logged on command submissions in the Json API (at trace level) - [JSON-API] The source and the path for incoming http requests are now logged - [JSON-API] The http response for a request is now logged - [JSON API] Errors which arise from the CommandService are not logged twice anymore (thus reducing noise) - [JSON API] log statements now include the date next to the time - [HTTP-JSON] Calls which trigger a submitAndWaitRequest are logged with the command id provided in the log ctx [Integration Kit] The state of the participant indexer can now be checked via the GRPC health endpoint - [JSON API] The healthcheck endpoint on the JSON API now proxies the health check endpoint on the underlying ledger. Previously it only queried for ledger end to determine ledger health. [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars - [Integration Kit] - ledger-api-bench-tool - reading active contract streams - [Integration Kit] - ledger-api-bench-tool - Reading completions stream - [Java Codegen] The Java codegen will now pick up the `module-prefixes` field from `daml.yaml` which can be used to handle module name collisions between different DALFs. ``` CHANGELOG_BEGIN CHANGELOG_END
Commit log: ``` adeba20 DPP-403 log flyway progress (#9964) 401069e prepare for upgrade to Scalaz 7.3.3 (#9997) 3ad9cd5 [JSON-API] Log templateId & choice name (if present) on command submissions in the json API (#10005) af144e8 LF: Structure package loading errors (#9980) 3583fd1 [JSON-API] Log source and path of incoming http requests & the response with info level (#10007) e49c7c8 [In-memory fan-out] BufferedTransactionsReader implementation [DPP-413] [DPP-414] (#9882) acb7733 Release 1.14 RC 2 (#10006) 3d2d4b9 Don't duplicate log failed futures in the http json api (commandservice specific ones) (#9990) 0c32cf2 Clarify the semantics of DIV_INT64 in LF spec. (#10003) b79e739 Fix Type (#10004) 998f106 Drop pkgIds argument from Engine.validatePackages (#9986) ae5010f [Mutable state cache] Start cache from latest ledger head (#9998) dd42a5a update maven_install_2.12.json (#9999) 66d38cd Storage query abstraction first sketch (#9959) c750136 Just print out the operator name for the operation logging in CommandService.scala (#9989) b6faace Changing oracle backend from using varray to json array (#9943) 603a4a4 Add date to log statements in the HTTP JSON service (#9988) 836a82a Add proper error handling for missing contract keys (#9972) 85667af Address npm vulnerabilities (#9978) d7d6e37 LF: Structure Engine Errors. (#9971) 0adbbdc update Daml Hub auth in create-daml-app (#9973) 997a7d4 Use symlinks on Windows (#9969) e4258e6 docs: tweak Exception intro (#9967) b2c4ef8 rotate release duty after 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9933) de7a462 Log call to submitAndWaitRequest with the command id provided in the log ctx (#9940) 630d021 Collect build-event-stream (#9831) 26e199a Rerelease 1.11.2 snapshot (#9965) 8399039 Remove broken dep from release job (#9963) e1db529 DPP-390 configurable event decoding parallelism (#9931) cc7af93 [docs] Remove link to the #daml-contributors (#9928) f7ac3ba Release 1.11.2 snapshot attempt 2 (#9962) 4634147 Adds Indexer state to GRPC health checks [DPP-434] (#9951) 28c567b Release SDK 1.11.2 (#9957) 5f0f575 Define IncompleteTransaction for use by scenario-service (#9952) b7fd833 Increase `eventually` timeout when waiting for queue to be killed (#9955) ca0fb16 Fix collect_build_data job (#9956) 42030b2 Skip Scala_2_12 job on releases (#9954) 5e1ddfb LF: Fix specification of ArithmeticError (#9949) 3093a98 Forward port additional contract keys validation tests (#9944) e541558 update NOTICES file (#9946) db792a9 Proxy ledger API health endpoint in JSON API health endpoint (#9945) 13767b5 Load the correct logback file for the http json service respecting the deployment situation (#9938) 4e49cf6 `ledger-api-bench-tool` - Active contracts stream, completions stream [DPP-398, DPP-399] (#9857) fce8e54 release 1.14.0-snapshot.20210608.7123.0.3cb8d5c2 (#9932) ab55fb2 Handle module-prefixes in Java codegen (#9929) 7375e28 Force resolution for css what to 5.0.1 (#9925) ``` Changelog: ``` - [JSON API] The template id & choice name (if present) are now logged on command submissions in the Json API (at trace level) - [JSON-API] The source and the path for incoming http requests are now logged - [JSON-API] The http response for a request is now logged - [JSON API] Errors which arise from the CommandService are not logged twice anymore (thus reducing noise) - [JSON API] log statements now include the date next to the time - [HTTP-JSON] Calls which trigger a submitAndWaitRequest are logged with the command id provided in the log ctx [Integration Kit] The state of the participant indexer can now be checked via the GRPC health endpoint - [JSON API] The healthcheck endpoint on the JSON API now proxies the health check endpoint on the underlying ledger. Previously it only queried for ledger end to determine ledger health. [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars - [Integration Kit] - ledger-api-bench-tool - reading active contract streams - [Integration Kit] - ledger-api-bench-tool - Reading completions stream - [Java Codegen] The Java codegen will now pick up the `module-prefixes` field from `daml.yaml` which can be used to handle module name collisions between different DALFs. ``` CHANGELOG_BEGIN CHANGELOG_END
…e deployment situation (#9938) * Load the correct logback file for the http json service respecting the deployment situation changelog_begin [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars changelog_end * Move import statement, remove some braces and reformat * Move system prop dependend logic to cliopts Logging.scala * Remove PathKind type in cliopts Logging.scala as it's not necessary anymore
* Load the correct logback file for the http json service respecting the deployment situation (#9938) * Load the correct logback file for the http json service respecting the deployment situation changelog_begin [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars changelog_end * Move import statement, remove some braces and reformat * Move system prop dependend logic to cliopts Logging.scala * Remove PathKind type in cliopts Logging.scala as it's not necessary anymore * Log call to submitAndWaitRequest with the command id provided in the log ctx (#9940) * Log call to submitAndWaitRequest with the command id provided in the log ctx changelog_begin - [HTTP-JSON] Calls which trigger a submitAndWaitRequest are logged with the command id provided in the log ctx changelog_end * Require the request id to be also in the log ctx * Log command kind in submitAndWaitRequest of CommandService.scala * Update ledger-service/http-json/src/main/scala/com/digitalasset/http/CommandService.scala Co-authored-by: Moritz Kiefer <[email protected]> Co-authored-by: Moritz Kiefer <[email protected]> * Just print out the operator name for the operation logging in CommandService.scala (#9989) changelog_begin changelog_end * Don't duplicate log failed futures in the http json api (commandservice specific ones) (#9990) * Don't duplicate log failed futures in the http json api (commandservice specific) changelog_begin - [JSON API] Errors which arise from the CommandService are not logged twice anymore (thus reducing noise) changelog_end * Fix duplicate logging of a failed future differently via adding another error case in CommandService.scala * Restore old formatting * Improve comment * Remove the wrong changes I accidentally made, the functions are quite similar xD * remove the additional type and just make the id optional & remove unecessary comment * [JSON-API] Log source and path of incoming http requests & the response with info level (#10007) changelog_begin - [JSON-API] The source and the path for incoming http requests are now logged - [JSON-API] The http response for a request is now logged changelog_end * [JSON-API] Log templateId & choice name (if present) on command submissions in the json API (#10005) * Log templateId & choice name (if present) on command submissions in the json API changelog_begin - [JSON API] The template id & choice name (if present) are now logged on command submissions in the Json API (at trace level) changelog_end * Move the template id & the choice into the logging context * Update ledger-service/http-json/src/main/scala/com/digitalasset/http/CommandService.scala Co-authored-by: Stefano Baghino <[email protected]> * Update ledger-service/http-json/src/main/scala/com/digitalasset/http/CommandService.scala Co-authored-by: Stefano Baghino <[email protected]> * Fix compile error due to scala 2.12 collection differences Co-authored-by: Stefano Baghino <[email protected]> * [JSON-API] Add information from the jwtpayload to the logging context (#9995) * Add information from the jwtpayload to the logging context changelog_begin - [JSON API] For applicable requests actAs, readAs, applicationId & ledgerId are included in the log context changelog_end * Update ledger-service/http-json/src/main/scala/com/digitalasset/http/Endpoints.scala Co-authored-by: Stephen Compall <[email protected]> * Update ledger-service/http-json/src/main/scala/com/digitalasset/http/Endpoints.scala Co-authored-by: Stephen Compall <[email protected]> * Revert changes to make the function generic * Create JwtPayloadG trait from which both payload variants inherit * Reduce code duplication in Endpoints.scala * Apply review suggestion * Update test name to reflect field name changes * Update ledger-service/http-json/src/main/scala/com/digitalasset/http/Endpoints.scala Co-authored-by: Moritz Kiefer <[email protected]> Co-authored-by: Stephen Compall <[email protected]> Co-authored-by: Moritz Kiefer <[email protected]> * Add date to log statements in the HTTP JSON service (#9988) changelog_begin - [JSON API] log statements now include the date next to the time changelog_end Co-authored-by: Moritz Kiefer <[email protected]> Co-authored-by: Stefano Baghino <[email protected]> Co-authored-by: Stephen Compall <[email protected]>
…e deployment situation (#9938) * Load the correct logback file for the http json service respecting the deployment situation changelog_begin [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars changelog_end * Move import statement, remove some braces and reformat * Move system prop dependend logic to cliopts Logging.scala * Remove PathKind type in cliopts Logging.scala as it's not necessary anymore
…e deployment situation (#9938) * Load the correct logback file for the http json service respecting the deployment situation changelog_begin [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars changelog_end * Move import statement, remove some braces and reformat * Move system prop dependend logic to cliopts Logging.scala * Remove PathKind type in cliopts Logging.scala as it's not necessary anymore
…e deployment situation (#9938) * Load the correct logback file for the http json service respecting the deployment situation changelog_begin [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars changelog_end * Move import statement, remove some braces and reformat * Move system prop dependend logic to cliopts Logging.scala * Remove PathKind type in cliopts Logging.scala as it's not necessary anymore
…e deployment situation (#9938) * Load the correct logback file for the http json service respecting the deployment situation changelog_begin [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars changelog_end * Move import statement, remove some braces and reformat * Move system prop dependend logic to cliopts Logging.scala * Remove PathKind type in cliopts Logging.scala as it's not necessary anymore
…e deployment situation (#9938) * Load the correct logback file for the http json service respecting the deployment situation changelog_begin [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars changelog_end * Move import statement, remove some braces and reformat * Move system prop dependend logic to cliopts Logging.scala * Remove PathKind type in cliopts Logging.scala as it's not necessary anymore
…ng for the json api (#11717) * Add cli option & system property to enable json only logging for http json service (#9725) changelog_begin - [Ledger HTTP Json Service] Logging output can now be in JSON either via providing the cli option `--log-encoder json` or via setting the env var `LOG_FORMAT_JSON=true` changelog_end * Load the correct logback file for the http json service respecting the deployment situation (#9938) * Load the correct logback file for the http json service respecting the deployment situation changelog_begin [HTTP-JSON] - fixed that json log output could not be enabled via cli options except via usage of env vars changelog_end * Move import statement, remove some braces and reformat * Move system prop dependend logic to cliopts Logging.scala * Remove PathKind type in cliopts Logging.scala as it's not necessary anymore
Prior it was not possible to enable json logging for the packaged daml sdk, because of a bug in how we reload the logback.xml for configuration changes. These changes now make use of an env var which exists for the case of being packaged with the daml sdk to retrieve the absolute path to the logback file and handing it over for the reload.
changelog_begin
[HTTP-JSON]
changelog_end
Pull Request Checklist
CHANGELOG_BEGIN
andCHANGELOG_END
tagsNOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with
/AzurePipelines run
totrigger the build.