Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
only°夏至besos
Pinpoint
提交
635cb472
P
Pinpoint
项目概览
only°夏至besos
/
Pinpoint
与 Fork 源项目一致
Fork自
Zero.Ki / Pinpoint
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Pinpoint
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
635cb472
编写于
4月 05, 2021
作者:
G
Ga Lam CHOI
提交者:
ga-ram
4月 06, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[#7666] Added oracle container wait strategy
上级
6f3fda9e
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
67 addition
and
14 deletion
+67
-14
plugins-it/oracledb-it/pom.xml
plugins-it/oracledb-it/pom.xml
+1
-0
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle11_Ojdbc6_IT.java
...rcorp/pinpoint/plugin/jdbc/oracle/Oracle11_Ojdbc6_IT.java
+1
-1
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle12_18_Ojdbc8_IT.java
...rp/pinpoint/plugin/jdbc/oracle/Oracle12_18_Ojdbc8_IT.java
+6
-2
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc10_IT.java
...corp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc10_IT.java
+4
-2
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc10_IT_ConnectWithGssCredential_IT.java
...acle/Oracle19_Ojdbc10_IT_ConnectWithGssCredential_IT.java
+2
-1
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc8_ConnectWithGssCredential_IT.java
...c/oracle/Oracle19_Ojdbc8_ConnectWithGssCredential_IT.java
+4
-2
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc8_IT.java
...rcorp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc8_IT.java
+4
-2
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/OracleContainerWithWait.java
.../pinpoint/plugin/jdbc/oracle/OracleContainerWithWait.java
+22
-0
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle_IT_Base.java
...navercorp/pinpoint/plugin/jdbc/oracle/Oracle_IT_Base.java
+23
-4
未找到文件。
plugins-it/oracledb-it/pom.xml
浏览文件 @
635cb472
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
<properties>
<properties>
<jdk.version>
1.8
</jdk.version>
<jdk.version>
1.8
</jdk.version>
<jdk.home>
${env.JAVA_8_HOME}
</jdk.home>
<jdk.home>
${env.JAVA_8_HOME}
</jdk.home>
<plugin.animal-sniffer.skip>
true
</plugin.animal-sniffer.skip>
</properties>
</properties>
<dependencies>
<dependencies>
...
...
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle11_Ojdbc6_IT.java
浏览文件 @
635cb472
...
@@ -40,7 +40,7 @@ public class Oracle11_Ojdbc6_IT extends Oracle_IT_Base {
...
@@ -40,7 +40,7 @@ public class Oracle11_Ojdbc6_IT extends Oracle_IT_Base {
@BeforeClass
@BeforeClass
public
static
void
setup
()
throws
Exception
{
public
static
void
setup
()
throws
Exception
{
logger
.
info
(
"Setting up oracle db..."
);
logger
.
info
(
"Setting up oracle db..."
);
startOracleDB
(
OracleITConstants
.
ORACLE_11_X_IMAGE
,
logger
);
startOracleDB
(
OracleITConstants
.
ORACLE_11_X_IMAGE
);
helper
.
create
(
JDBC_API
);
helper
.
create
(
JDBC_API
);
}
}
...
...
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle12_18_Ojdbc8_IT.java
浏览文件 @
635cb472
...
@@ -18,10 +18,12 @@ package com.navercorp.pinpoint.plugin.jdbc.oracle;
...
@@ -18,10 +18,12 @@ package com.navercorp.pinpoint.plugin.jdbc.oracle;
import
com.navercorp.pinpoint.pluginit.jdbc.*
;
import
com.navercorp.pinpoint.pluginit.jdbc.*
;
import
com.navercorp.pinpoint.pluginit.utils.AgentPath
;
import
com.navercorp.pinpoint.pluginit.utils.AgentPath
;
import
com.navercorp.pinpoint.test.plugin.*
;
import
com.navercorp.pinpoint.test.plugin.*
;
import
org.junit.*
;
import
org.junit.BeforeClass
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.testcontainers.containers.wait.strategy.Wait
;
@RunWith
(
PinpointPluginTestSuite
.
class
)
@RunWith
(
PinpointPluginTestSuite
.
class
)
@PinpointAgent
(
AgentPath
.
PATH
)
@PinpointAgent
(
AgentPath
.
PATH
)
...
@@ -34,7 +36,9 @@ public class Oracle12_18_Ojdbc8_IT extends Oracle_IT_Base{
...
@@ -34,7 +36,9 @@ public class Oracle12_18_Ojdbc8_IT extends Oracle_IT_Base{
@BeforeClass
@BeforeClass
public
static
void
setup
()
throws
Exception
{
public
static
void
setup
()
throws
Exception
{
logger
.
info
(
"Setting up oracle db..."
);
logger
.
info
(
"Setting up oracle db..."
);
startOracleDB
(
OracleITConstants
.
ORACLE_12_X_IMAGE
,
logger
);
startOracleDB
(
OracleITConstants
.
ORACLE_12_X_IMAGE
,
Wait
.
forLogMessage
(
".*Database ready to use.*\\n"
,
1
));
helper
.
create
(
JDBC_API
);
helper
.
create
(
JDBC_API
);
}
}
...
...
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc10_IT.java
浏览文件 @
635cb472
...
@@ -18,10 +18,12 @@ package com.navercorp.pinpoint.plugin.jdbc.oracle;
...
@@ -18,10 +18,12 @@ package com.navercorp.pinpoint.plugin.jdbc.oracle;
import
com.navercorp.pinpoint.pluginit.jdbc.*
;
import
com.navercorp.pinpoint.pluginit.jdbc.*
;
import
com.navercorp.pinpoint.pluginit.utils.AgentPath
;
import
com.navercorp.pinpoint.pluginit.utils.AgentPath
;
import
com.navercorp.pinpoint.test.plugin.*
;
import
com.navercorp.pinpoint.test.plugin.*
;
import
org.junit.*
;
import
org.junit.BeforeClass
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.testcontainers.containers.wait.strategy.Wait
;
@RunWith
(
PinpointPluginTestSuite
.
class
)
@RunWith
(
PinpointPluginTestSuite
.
class
)
@PinpointAgent
(
AgentPath
.
PATH
)
@PinpointAgent
(
AgentPath
.
PATH
)
...
@@ -35,7 +37,7 @@ public class Oracle19_Ojdbc10_IT extends Oracle_IT_Base {
...
@@ -35,7 +37,7 @@ public class Oracle19_Ojdbc10_IT extends Oracle_IT_Base {
@BeforeClass
@BeforeClass
public
static
void
setup
()
throws
Exception
{
public
static
void
setup
()
throws
Exception
{
logger
.
info
(
"Setting up oracle db..."
);
logger
.
info
(
"Setting up oracle db..."
);
startOracleDB
(
OracleITConstants
.
ORACLE_18_X_IMAGE
,
logger
);
startOracleDB
(
OracleITConstants
.
ORACLE_18_X_IMAGE
,
Wait
.
forLogMessage
(
".*Completed.*"
,
1
)
);
helper
.
create
(
JDBC_API
);
helper
.
create
(
JDBC_API
);
}
}
...
...
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc10_IT_ConnectWithGssCredential_IT.java
浏览文件 @
635cb472
...
@@ -23,6 +23,7 @@ import org.junit.Test;
...
@@ -23,6 +23,7 @@ import org.junit.Test;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.testcontainers.containers.wait.strategy.Wait
;
@RunWith
(
PinpointPluginTestSuite
.
class
)
@RunWith
(
PinpointPluginTestSuite
.
class
)
@PinpointAgent
(
AgentPath
.
PATH
)
@PinpointAgent
(
AgentPath
.
PATH
)
...
@@ -36,7 +37,7 @@ public class Oracle19_Ojdbc10_IT_ConnectWithGssCredential_IT extends Oracle_IT_B
...
@@ -36,7 +37,7 @@ public class Oracle19_Ojdbc10_IT_ConnectWithGssCredential_IT extends Oracle_IT_B
@BeforeClass
@BeforeClass
public
static
void
setup
()
throws
Exception
{
public
static
void
setup
()
throws
Exception
{
logger
.
info
(
"Setting up oracle db..."
);
logger
.
info
(
"Setting up oracle db..."
);
startOracleDB
(
OracleITConstants
.
ORACLE_18_X_IMAGE
,
logger
);
startOracleDB
(
OracleITConstants
.
ORACLE_18_X_IMAGE
,
Wait
.
forLogMessage
(
".*Completed.*"
,
1
)
);
helper
.
create
(
JDBC_API
);
helper
.
create
(
JDBC_API
);
}
}
...
...
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc8_ConnectWithGssCredential_IT.java
浏览文件 @
635cb472
...
@@ -18,10 +18,12 @@ package com.navercorp.pinpoint.plugin.jdbc.oracle;
...
@@ -18,10 +18,12 @@ package com.navercorp.pinpoint.plugin.jdbc.oracle;
import
com.navercorp.pinpoint.pluginit.jdbc.*
;
import
com.navercorp.pinpoint.pluginit.jdbc.*
;
import
com.navercorp.pinpoint.pluginit.utils.AgentPath
;
import
com.navercorp.pinpoint.pluginit.utils.AgentPath
;
import
com.navercorp.pinpoint.test.plugin.*
;
import
com.navercorp.pinpoint.test.plugin.*
;
import
org.junit.*
;
import
org.junit.BeforeClass
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.testcontainers.containers.wait.strategy.Wait
;
@RunWith
(
PinpointPluginTestSuite
.
class
)
@RunWith
(
PinpointPluginTestSuite
.
class
)
@PinpointAgent
(
AgentPath
.
PATH
)
@PinpointAgent
(
AgentPath
.
PATH
)
...
@@ -34,7 +36,7 @@ public class Oracle19_Ojdbc8_ConnectWithGssCredential_IT extends Oracle_IT_Base
...
@@ -34,7 +36,7 @@ public class Oracle19_Ojdbc8_ConnectWithGssCredential_IT extends Oracle_IT_Base
@BeforeClass
@BeforeClass
public
static
void
setup
()
throws
Exception
{
public
static
void
setup
()
throws
Exception
{
logger
.
info
(
"Setting up oracle db..."
);
logger
.
info
(
"Setting up oracle db..."
);
startOracleDB
(
OracleITConstants
.
ORACLE_18_X_IMAGE
,
logger
);
startOracleDB
(
OracleITConstants
.
ORACLE_18_X_IMAGE
,
Wait
.
forLogMessage
(
".*Completed.*"
,
1
)
);
helper
.
create
(
JDBC_API
);
helper
.
create
(
JDBC_API
);
}
}
...
...
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle19_Ojdbc8_IT.java
浏览文件 @
635cb472
...
@@ -18,10 +18,12 @@ package com.navercorp.pinpoint.plugin.jdbc.oracle;
...
@@ -18,10 +18,12 @@ package com.navercorp.pinpoint.plugin.jdbc.oracle;
import
com.navercorp.pinpoint.pluginit.jdbc.*
;
import
com.navercorp.pinpoint.pluginit.jdbc.*
;
import
com.navercorp.pinpoint.pluginit.utils.AgentPath
;
import
com.navercorp.pinpoint.pluginit.utils.AgentPath
;
import
com.navercorp.pinpoint.test.plugin.*
;
import
com.navercorp.pinpoint.test.plugin.*
;
import
org.junit.*
;
import
org.junit.BeforeClass
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.testcontainers.containers.wait.strategy.Wait
;
@RunWith
(
PinpointPluginTestSuite
.
class
)
@RunWith
(
PinpointPluginTestSuite
.
class
)
@PinpointAgent
(
AgentPath
.
PATH
)
@PinpointAgent
(
AgentPath
.
PATH
)
...
@@ -34,7 +36,7 @@ public class Oracle19_Ojdbc8_IT extends Oracle_IT_Base {
...
@@ -34,7 +36,7 @@ public class Oracle19_Ojdbc8_IT extends Oracle_IT_Base {
@BeforeClass
@BeforeClass
public
static
void
setup
()
throws
Exception
{
public
static
void
setup
()
throws
Exception
{
logger
.
info
(
"Setting up oracle db..."
);
logger
.
info
(
"Setting up oracle db..."
);
startOracleDB
(
OracleITConstants
.
ORACLE_18_X_IMAGE
,
logger
);
startOracleDB
(
OracleITConstants
.
ORACLE_18_X_IMAGE
,
Wait
.
forLogMessage
(
".*Completed.*"
,
1
)
);
helper
.
create
(
JDBC_API
);
helper
.
create
(
JDBC_API
);
}
}
...
...
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/OracleContainerWithWait.java
0 → 100644
浏览文件 @
635cb472
package
com.navercorp.pinpoint.plugin.jdbc.oracle
;
import
org.testcontainers.containers.OracleContainer
;
import
org.testcontainers.containers.wait.strategy.WaitStrategy
;
public
class
OracleContainerWithWait
extends
OracleContainer
{
public
OracleContainerWithWait
(
String
dockerImageVersion
)
{
super
(
dockerImageVersion
);
}
@Override
protected
void
waitUntilContainerStarted
()
{
// wait for Oracle to be fully initialized
WaitStrategy
waitStrategy
=
getWaitStrategy
();
if
(
waitStrategy
!=
null
)
{
waitStrategy
.
waitUntilReady
(
this
);
}
// now, the JDBC connection should definitely work without lots of wasteful polling
super
.
waitUntilContainerStarted
();
}
}
plugins-it/oracledb-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/Oracle_IT_Base.java
浏览文件 @
635cb472
...
@@ -23,21 +23,40 @@ import org.junit.Before;
...
@@ -23,21 +23,40 @@ import org.junit.Before;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.testcontainers.DockerClientFactory
;
import
org.testcontainers.DockerClientFactory
;
import
org.testcontainers.containers.OracleContainer
;
import
org.testcontainers.containers.OracleContainer
;
import
org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy
;
import
org.testcontainers.containers.wait.strategy.HostPortWaitStrategy
;
import
org.testcontainers.containers.wait.strategy.WaitStrategy
;
import
java.sql.Driver
;
import
java.sql.Driver
;
import
java.sql.DriverManager
;
import
java.sql.DriverManager
;
import
java.time.Duration
;
import
java.util.Properties
;
import
java.util.Properties
;
public
abstract
class
Oracle_IT_Base
{
public
abstract
class
Oracle_IT_Base
{
private
static
final
JDBCDriverClass
driverClass
=
new
OracleJDBCDriverClass
();
private
static
final
JDBCDriverClass
driverClass
=
new
OracleJDBCDriverClass
();
protected
static
final
OracleJDBCApi
JDBC_API
=
new
OracleJDBCApi
(
driverClass
);
protected
static
final
OracleJDBCApi
JDBC_API
=
new
OracleJDBCApi
(
driverClass
);
protected
static
OracleItHelper
helper
;
protected
static
OracleItHelper
helper
;
public
static
OracleContainer
oracle
;
public
static
OracleContainer
WithWait
oracle
;
public
static
void
startOracleDB
(
String
dockerImageVersion
,
Logger
logger
)
{
public
static
void
startOracleDB
(
String
dockerImageVersion
)
{
Assume
.
assumeTrue
(
"Docker not enabled"
,
DockerClientFactory
.
instance
().
isDockerAvailable
());
oracle
=
new
OracleContainerWithWait
(
dockerImageVersion
);
startOracleDBContainer
();
}
public
static
void
startOracleDB
(
String
dockerImageVersion
,
WaitStrategy
waitStrategy
)
{
oracle
=
new
OracleContainerWithWait
(
dockerImageVersion
);
if
(
waitStrategy
!=
null
)
{
oracle
.
setWaitStrategy
(
waitStrategy
);
oracle
.
withStartupTimeout
(
Duration
.
ofSeconds
(
180
));
oracle
.
withReuse
(
true
);
}
startOracleDBContainer
();
}
oracle
=
new
OracleContainer
(
dockerImageVersion
);
private
static
void
startOracleDBContainer
()
{
Assume
.
assumeTrue
(
"Docker not enabled"
,
DockerClientFactory
.
instance
().
isDockerAvailable
());
oracle
.
start
();
oracle
.
start
();
DriverProperties
driverProperties
=
new
DriverProperties
(
oracle
.
getJdbcUrl
(),
oracle
.
getUsername
(),
oracle
.
getPassword
(),
new
Properties
());
DriverProperties
driverProperties
=
new
DriverProperties
(
oracle
.
getJdbcUrl
(),
oracle
.
getUsername
(),
oracle
.
getPassword
(),
new
Properties
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录