Merge branch 'main' into doc/typescript-build-and-facet

cap-js · Sep 17, 2024 · f095167 · f095167
2 parents 0725a7d + 503bd07
commit f095167
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -2,12 +2,12 @@
 
 # General content
 * @smahati
-## * @renejeglinsky
+* @renejeglinsky
 
 # Infra
 .github/    @chgeo @swaldmann
 .vitepress/ @chgeo @swaldmann
 
 # allow dependencies updates through renovate w/o code owners
 package.json
-package-lock.json
+package-lock.json
diff --git a/get-started/in-a-nutshell.md b/get-started/in-a-nutshell.md
@@ -5,6 +5,7 @@ synopsis: >
 notebook: true
 status: released
 uacp: This page is linked from the Help Portal at https://help.sap.com/products/BTP/65de2977205c403bbc107264b8eccf4b/29c25e504fdb4752b0383d3c407f52a6.html
+redirect_from: get-started/
 impl-variants: true
 ---
 

diff --git a/java/operating-applications/observability.md b/java/operating-applications/observability.md
@@ -268,7 +268,11 @@ Configure your application to enable the Open Telemetry Java Agent by adding or
   # ...
   properties:
     # ...
-    JBP_CONFIG_JAVA_OPTS: "[from_environment: false, java_opts: '-javaagent:META-INF/.sap_java_buildpack/otel_agent/opentelemetry-javaagent.jar -Dotel.javaagent.extensions=META-INF/.sap_java_buildpack/otel_agent_extension/otel-agent-ext-java.jar']"
+    JBP_CONFIG_JAVA_OPTS: 
+      from_environment: false
+      java_opts: >
+        -javaagent:META-INF/.sap_java_buildpack/otel_agent/opentelemetry-javaagent.jar 
+        -Dotel.javaagent.extensions=META-INF/.sap_java_buildpack/otel_agent_extension/otel-agent-ext-java.jar
 ```
 :::
 
@@ -318,6 +322,7 @@ Open Telemetry support using SAP BTP Cloud Logging Service leverages the [Open T
        # ...
        OTEL_METRICS_EXPORTER: cloud-logging
        OTEL_TRACES_EXPORTER: cloud-logging
+       OTEL_LOGS_EXPORTER: none
    ```
    :::
 

diff --git a/node.js/cds-ql.md b/node.js/cds-ql.md
@@ -698,15 +698,16 @@ INSERT.into (Books) .columns (
    [ 252, 'Eleonora', 150, 234 ]
 )
 ```
-### as() {.method}
+### from() {.method #from}
 
 
 Constructs a _INSERT into SELECT_ statement.
 ```js
-INSERT.into('Bar') .as (SELECT.from('Foo'))
+INSERT.into('Bar') .from (SELECT.from('Foo'))
 ```
+### as() {.method}
 
-
+The use of _.as()_ method is deprecated. Please use [_.from()_](#from) method instead.
 
 
 ## UPSERT {.class}