Skip to content

Commit 83d7533

Browse files
committed
Removing oracle-xe container test and updating configuration.ascii
1 parent 0cd251f commit 83d7533

File tree

4 files changed

+2
-9
lines changed

4 files changed

+2
-9
lines changed

apm-agent-plugins/apm-jdbc-plugin/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@
5353
<artifactId>mssqlserver</artifactId>
5454
<scope>test</scope>
5555
</dependency>
56-
<dependency>
57-
<groupId>org.testcontainers</groupId>
58-
<artifactId>oracle-xe</artifactId>
59-
<scope>test</scope>
60-
</dependency>
6156

6257
<!--JDBC drivers-->
6358
<dependency>

apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/JdbcDbIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public static Iterable<Object[]> data() {
4444
{"jdbc:tc:postgresql:10://hostname/databasename", "postgresql"},
4545
{"jdbc:tc:mariadb:10://hostname/databasename", "mariadb"},
4646
{"jdbc:tc:sqlserver:2017-CU12://hostname/databasename", "sqlserver"},
47-
{"jdbc:tc:oracle://hostname/databasename", "oracle"},
4847
});
4948
}
5049

apm-agent-plugins/apm-jdbc-plugin/src/test/resources/testcontainers.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/configuration.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ you should add an additional entry to this list (make sure to also include the d
252252
==== `disable_instrumentations`
253253

254254
A list of instrumentations which should be disabled.
255-
Valid options are `annotations`, `apache-httpclient`, `concurrent`, `dispatcher-servlet`, `elasticsearch-restclient`, `executor`, `http-client`, `incubating`, `jax-rs`, `jax-rs-annotations`, `jdbc`, `jsf`, `okhttp`, `opentracing`, `public-api`, `render`, `servlet-api`, `servlet-api-async`, `spring-mvc`, `spring-resttemplate`, `urlconnection`.
255+
Valid options are `annotations`, `apache-httpclient`, `concurrent`, `dispatcher-servlet`, `elasticsearch-restclient`, `executor`, `http-client`, `incubating`, `jax-rs`, `jax-ws`, `jdbc`, `jsf`, `okhttp`, `opentracing`, `public-api`, `render`, `servlet-api`, `servlet-api-async`, `spring-mvc`, `spring-resttemplate`, `urlconnection`.
256256
If you want to try out incubating features,
257257
set the value to an empty string.
258258

@@ -1059,7 +1059,7 @@ The default unit for this option is `ms`
10591059
# sanitize_field_names=password,passwd,pwd,secret,*key,*token*,*session*,*credit*,*card*,authorization,set-cookie
10601060
10611061
# A list of instrumentations which should be disabled.
1062-
# Valid options are `annotations`, `apache-httpclient`, `concurrent`, `dispatcher-servlet`, `elasticsearch-restclient`, `executor`, `http-client`, `incubating`, `jax-rs`, `jax-rs-annotations`, `jdbc`, `jsf`, `okhttp`, `opentracing`, `public-api`, `render`, `servlet-api`, `servlet-api-async`, `spring-mvc`, `spring-resttemplate`, `urlconnection`.
1062+
# Valid options are `annotations`, `apache-httpclient`, `concurrent`, `dispatcher-servlet`, `elasticsearch-restclient`, `executor`, `http-client`, `incubating`, `jax-rs`, `jax-ws`, `jdbc`, `jsf`, `okhttp`, `opentracing`, `public-api`, `render`, `servlet-api`, `servlet-api-async`, `spring-mvc`, `spring-resttemplate`, `urlconnection`.
10631063
# If you want to try out incubating features,
10641064
# set the value to an empty string.
10651065
#

0 commit comments

Comments
 (0)