Skip to content

Commit

Permalink
Merge pull request #20 from pagopa/PAGOPA-2253-pagopa-gpd-reporting-a…
Browse files Browse the repository at this point in the history
…nalysis

feat(logging): sampling
  • Loading branch information
jacopocarlini authored Oct 15, 2024
2 parents 57ac338 + e7d8e64 commit 8efcaa0
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .devops/code-review-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ steps:
mavenVersionOption: 'Default'
mavenAuthenticateFeed: false
javaHomeOption: 'JDKVersion'
jdkVersionOption: '1.11'
jdkVersionOption: '1.17'
publishJUnitResults: true
testResultsFiles: '**/surefire-reports/TEST-*.xml'
goals: 'clean verify'
Expand Down
2 changes: 1 addition & 1 deletion .devops/deploy-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ stages:
mavenPomFile: 'pom.xml'
publishJUnitResults: false
javaHomeOption: 'JDKVersion'
jdkVersionOption: '1.11'
jdkVersionOption: '1.17'
mavenVersionOption: 'Default'
mavenOptions: '-Xmx3072m $(MAVEN_OPTS)'
mavenAuthenticateFeed: false
Expand Down
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11
17
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG JAVA_VERSION=11
ARG JAVA_VERSION=17
# This image additionally contains function core tools – useful when using custom extensions
#FROM mcr.microsoft.com/azure-functions/java:4.0-java$JAVA_VERSION-core-tools AS installer-env
FROM mcr.microsoft.com/azure-functions/java:4.0-java$JAVA_VERSION-build AS installer-env
Expand All @@ -11,7 +11,8 @@ RUN cd /src/java-function-app && \
cd $(ls -d */|head -n 1) && \
cp -a . /home/site/wwwroot

FROM mcr.microsoft.com/azure-functions/java:4.0-java$JAVA_VERSION
# This image is ssh enabled
FROM mcr.microsoft.com/azure-functions/java:4-java$JAVA_VERSION

ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
AzureFunctionsJobHost__Logging__Console__IsEnabled=true
Expand Down
10 changes: 6 additions & 4 deletions host.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
}
},
"logging": {
"fileLoggingMode": "always",
"fileLoggingMode": "debugOnly",
"logLevel": {
"default": "Information",
"default": "None",
"Host.Results": "Error",
"Function": "Information",
"Host.Aggregator": "Trace"
"Function.GetFlow": "Information",
"Function.FunctionName": "Information",
"Host.Aggregator": "Error",
"Host": "Error"
},
"applicationInsights": {
"samplingSettings": {
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version>
<java.version>17</java.version>
<azure.functions.maven.plugin.version>1.27.0</azure.functions.maven.plugin.version>
<azure.functions.java.library.version>3.1.0</azure.functions.java.library.version>
<azure.storage.table.version>8.6.6</azure.storage.table.version>
Expand Down Expand Up @@ -197,7 +197,7 @@
<region>westus</region>
<runtime>
<os>windows</os>
<javaVersion>11</javaVersion>
<javaVersion>17</javaVersion>
</runtime>
</configuration>
<executions>
Expand Down

0 comments on commit 8efcaa0

Please sign in to comment.