Skip to content

OpenTelemetry Initial Support #626

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
merged 11 commits into from
Nov 23, 2022
Merged

OpenTelemetry Initial Support #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7136d26
Log4J maven version refactoring. Bump version
ggallotti Oct 20, 2022
43110f4
Add log4j json pattern layout support
ggallotti Oct 20, 2022
41092c8
Fix build error
ggallotti Oct 20, 2022
38ec4e6
Merge branch 'master' into opentelemetry-initial-support
ggallotti Oct 20, 2022
0dca8fe
Fix build
ggallotti Oct 20, 2022
59cb65c
Keep using current log4j version in order not to break fullgx comparison
ggallotti Oct 20, 2022
099e62a
Add OpenTelemetry API
ggallotti Oct 20, 2022
d7eaecb
Bump Log4J version
ggallotti Nov 1, 2022
ccb9df7
Merge branch 'master' into opentelemetry-initial-support
ggallotti Nov 1, 2022
5fce21f
Restore logj2 1.2 API
ggallotti Nov 17, 2022
354f529
Merge branch 'master' into opentelemetry-initial-support
ggallotti Nov 23, 2022
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
32 changes: 25 additions & 7 deletions gxawsserverless/src/test/java/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="warn">
<Properties>
<Property name="logPath">logs</Property>
<Property name="logBaseDir">${main:0:-.}${sys:file.separator}logs${sys:file.separator}</Property>

<Property name="logFile">${logBaseDir}client.log</Property>
</Properties>

<Appenders>
<Console name="GeneXusDefaultLogger" target="SYSTEM_OUT">
<PatternLayout pattern="%p\t%d{ISO8601}\t%r\t%c\t[%t]\t%m%n"/>
<RollingFile name="RollingFile" fileName="${logFile}" filePattern="${logBaseDir}old${sys:file.separator}app-%d{yyyy-MM-dd-HH}-%i.log.gz">
<PatternLayout pattern="%d{ISO8601} [%t] %-5p %c - %m%n"/>

<Policies>
<TimeBasedTriggeringPolicy />
<SizeBasedTriggeringPolicy size="10 MB"/>
</Policies>
</RollingFile>

<Console name="ConsoleAppender" target="SYSTEM_OUT">
<PatternLayout pattern="%d{ISO8601} [%t] %-5p %c - %m%n"/>

</Console>

</Appenders>

<Loggers>
<Root level="DEBUG">
<Root level="${env:LOG_LEVEL:-INFO}">
<AppenderRef ref="${env:LOG_OUTPUT:-ConsoleAppender}"/>
</Root>
<!-- For compatibility reasons. All GeneXus Standard Classes log goes to standard output unless Logging Property is enabled -->
<logger name="com.genexus" level="DEBUG" additivity="false">
<AppenderRef ref="GeneXusDefaultLogger"/>
<logger name="com.genexus" level="${env:LOG_LEVEL:-INFO}" additivity="false">
<AppenderRef ref="${env:LOG_OUTPUT:-ConsoleAppender}"/>
</logger>
<!-- User custom Logging !-->
<logger name="GeneXusUserLog" level="${env:LOG_LEVEL_USER:-ALL}" additivity="false">
<AppenderRef ref="${env:LOG_OUTPUT:-ConsoleAppender}"/>
</logger>

</Loggers>
Expand Down
39 changes: 27 additions & 12 deletions java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,22 @@
<artifactId>commons-collections4</artifactId>
<version>4.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<version>2.17.1</version>
</dependency>
<dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
<version>3.0</version>
Expand Down Expand Up @@ -149,15 +159,20 @@
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.0.0</version>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.36.0.3</version>
<scope>test</scope>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.36.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>${io.opentelemetry.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
<junit.version>4.13.2</junit.version>
<com.amazonaws.version>1.12.93</com.amazonaws.version>
<software.awssdk.version>2.17.272</software.awssdk.version>
<log4j.version>2.19.0</log4j.version>
<io.opentelemetry.version>1.19.0</io.opentelemetry.version>
</properties>

<organization>
Expand Down
10 changes: 5 additions & 5 deletions wrappercommon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down