Skip to content

Commit f095272

Browse files
elaaissaouiabdessamadelaaissaouiabdessamad
committed
Implementing JFR and Open Telemetry providers for monitoring UCP(resolved comments)
1 parent 9cb4b41 commit f095272

File tree

12 files changed

+1072
-1064
lines changed

12 files changed

+1072
-1064
lines changed

‎ojdbc-provider-observability/pom.xml‎

Lines changed: 42 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,31 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>com.oracle.database.jdbc</groupId>
9-
<artifactId>ojdbc-extensions</artifactId>
10-
<version>1.0.3</version>
8+
<groupId>com.oracle.database.jdbc</groupId>
9+
<artifactId>ojdbc-extensions</artifactId>
10+
<version>1.0.3</version>
1111
</parent>
1212

1313
<name>Oracle JDBC Observability Provider</name>
1414
<groupId>com.oracle.database.jdbc</groupId>
1515
<artifactId>ojdbc-provider-observability</artifactId>
1616

1717
<properties>
18-
<opentelemetry.version>1.44.1</opentelemetry.version>
19-
<maven.compiler.source>11</maven.compiler.source>
20-
<maven.compiler.target>11</maven.compiler.target>
18+
<opentelemetry.version>1.44.1</opentelemetry.version>
19+
<maven.compiler.source>11</maven.compiler.source>
20+
<maven.compiler.target>11</maven.compiler.target>
2121
</properties>
2222

2323
<dependencies>
24+
<dependency>
25+
<groupId>com.oracle.database.jdbc</groupId>
26+
<artifactId>ojdbc11</artifactId>
27+
</dependency>
28+
<!-- The new UCP jar hasn't been released yet. Please download it from the VM and install it to your local repo. -->
2429
<dependency>
2530
<groupId>com.oracle</groupId>
26-
<artifactId>ojdbc</artifactId>
27-
<version>11.2.0.4</version> <!-- Change to your version -->
28-
<scope>system</scope>
29-
<systemPath>/Users/abdessamadelaaissaoui/Desktop/ojdbc11.jar</systemPath>
31+
<artifactId>ucp</artifactId>
32+
<version>11.2.0.4-SNAPSHOT</version>
3033
</dependency>
3134
<dependency>
3235
<groupId>io.opentelemetry</groupId>
@@ -49,65 +52,46 @@
4952
<scope>test</scope>
5053
</dependency>
5154
<dependency>
52-
<artifactId>ojdbc-provider-common</artifactId>
53-
<groupId>com.oracle.database.jdbc</groupId>
54-
<classifier>tests</classifier>
55-
<type>test-jar</type>
56-
</dependency>
57-
<dependency>
58-
<groupId>com.oracle</groupId>
59-
<artifactId>ucp</artifactId>
60-
<version>11.2.0.4</version>
61-
<scope>system</scope>
62-
<systemPath>/Users/abdessamadelaaissaoui/Desktop/ucp11.jar</systemPath>
63-
</dependency>
64-
<dependency>
65-
<groupId>com.oracle.database.security</groupId>
66-
<artifactId>oraclepki</artifactId>
67-
<version>23.3.0.23.09</version>
68-
</dependency>
69-
<dependency>
70-
<groupId>com.oracle.database.ha</groupId>
71-
<artifactId>ons</artifactId>
72-
<version>23.9.0.25.07</version>
73-
</dependency>
74-
<dependency>
75-
<groupId>io.opentelemetry</groupId>
76-
<artifactId>opentelemetry-api</artifactId>
77-
<version>1.32.0</version>
55+
<groupId>junit</groupId>
56+
<artifactId>junit</artifactId>
57+
<version>4.13.2</version>
58+
<scope>test</scope>
7859
</dependency>
7960
<dependency>
8061
<groupId>io.opentelemetry</groupId>
8162
<artifactId>opentelemetry-sdk</artifactId>
82-
<version>1.32.0</version>
63+
<version>${opentelemetry.version}</version>
64+
<scope>test</scope>
8365
</dependency>
8466
<dependency>
8567
<groupId>io.opentelemetry</groupId>
86-
<artifactId>opentelemetry-exporter-prometheus</artifactId>
87-
<version>1.32.0-alpha</version>
68+
<artifactId>opentelemetry-sdk-testing</artifactId>
69+
<version>1.32.0</version>
70+
<scope>test</scope>
8871
</dependency>
8972
<dependency>
90-
<groupId>io.opentelemetry</groupId>
91-
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
92-
<version>1.32.0</version>
73+
<artifactId>ojdbc-provider-common</artifactId>
74+
<groupId>com.oracle.database.jdbc</groupId>
75+
<classifier>tests</classifier>
76+
<type>test-jar</type>
9377
</dependency>
9478
</dependencies>
9579
<build>
96-
<plugins>
97-
<plugin>
98-
<groupId>org.apache.maven.plugins</groupId>
99-
<artifactId>maven-surefire-plugin</artifactId>
100-
<configuration>
101-
<!--
102-
ObservabilityConfigurationTest must run first and alone since it depends on
103-
ObservabilityConfiguration being started with system properties set on the
104-
test.
105-
Running tests alphabetical and single threaded ensures that.
106-
-->
107-
<parallel>none</parallel>
108-
<runOrder>alphabetical</runOrder>
109-
</configuration>
110-
</plugin>
111-
</plugins>
80+
<plugins>
81+
<plugin>
82+
<groupId>org.apache.maven.plugins</groupId>
83+
<artifactId>maven-surefire-plugin</artifactId>
84+
<configuration>
85+
<!--
86+
ObservabilityConfigurationTest must run first and alone since it depends on
87+
ObservabilityConfiguration being started with system properties set on the
88+
test.
89+
Running tests alphabetical and single threaded ensures that.
90+
-->
91+
<parallel>none</parallel>
92+
<runOrder>alphabetical</runOrder>
93+
</configuration>
94+
</plugin>
95+
</plugins>
11296
</build>
11397
</project>

‎ojdbc-provider-observability/prometheus.yml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎ojdbc-provider-observability/src/main/java/oracle/ucp/provider/observability/logging/LoggingUCPEventListenerProvider.java‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎ojdbc-provider-observability/src/main/java/oracle/ucp/provider/observability/logging/UCPEventPrinter.java‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎ojdbc-provider-observability/src/main/java/oracle/ucp/provider/observability/otel/OpenTelemetryConfig.java‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)