Skip to content

multi-db via config work and fixes #20

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 16 commits into from
May 5, 2023
Merged

multi-db via config work and fixes #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
920705b
add list of default metrics in readme
paulparkinson Mar 23, 2022
76303d0
Merge remote-tracking branch 'upstream/main'
paulparkinson May 31, 2022
56f42d9
Merge remote-tracking branch 'upstream/main'
paulparkinson Jun 19, 2022
56903fe
readme updates
paulparkinson Jun 19, 2022
24d22c6
various updates
paulparkinson Jun 30, 2022
574e61a
README.md updates
paulparkinson Jul 3, 2022
dafa355
README.md updates
paulparkinson Jul 3, 2022
0b6b4fc
Merge remote-tracking branch 'upstream/main'
paulparkinson Jul 3, 2022
72a2c4a
basic example
paulparkinson Aug 3, 2022
0e1030d
Merge remote-tracking branch 'upstream/main'
paulparkinson Aug 3, 2022
9e1649a
adds... 1. ability to specify DATA_SOURCE_USER, DATA_SOURCE_PASSWORD,…
paulparkinson Apr 27, 2023
1036918
Merge remote-tracking branch 'upstream/main'
paulparkinson Apr 27, 2023
50124f3
adds multi-datasource support based on configuration which includes O…
paulparkinson May 4, 2023
ea80496
Merge remote-tracking branch 'upstream/main'
paulparkinson May 4, 2023
2325c31
Merge remote-tracking branch 'upstream/main'
paulparkinson May 4, 2023
e22b9a3
adds multi-datasource support based on configuration which includes O…
paulparkinson May 4, 2023
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
5 changes: 0 additions & 5 deletions src/main/java/oracle/observability/ObservabilityExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,6 @@ public PoolDataSource getPoolDataSource(String dataSourceName, boolean isScrapeB
} else {
if(dataSourceNameToDataSourceMap.containsKey(dataSourceName) && dataSourceNameToDataSourceMap.get(dataSourceName) != null)
return dataSourceNameToDataSourceMap.get(dataSourceName);

System.out.println("putting dataSourceName:" + dataSourceName + " isScrapeByName:" + isScrapeByName +
" ObservabilityExporter.dataSourceNameToDataSourceConfigMap.get(dataSourceName):"+
ObservabilityExporter.dataSourceNameToDataSourceConfigMap.get(dataSourceName));
PoolDataSource poolDataSource = isScrapeByName?
getDataSource(ObservabilityExporter.dataSourceNameToDataSourceConfigMap.get(dataSourceName))
:getDataSource(dataSourceName);
Expand Down Expand Up @@ -115,7 +111,6 @@ private PoolDataSource getDataSource(DataSourceConfig dataSourceConfig) throws S
private PoolDataSource getPoolDataSource(
String dataSourceName, String user, String pw, String serviceName, String tnsAdmin,
String vaultSecretOcid, String ociConfigFile, String ociProfile, String ociRegion, boolean isScrapeByName) throws SQLException {
System.out.println("getPoolDataSource dataSourceName = " + dataSourceName + ", user = " + user + ", pw = " + pw + ", serviceName = " + serviceName + ", vaultSecretOcid = " + vaultSecretOcid + ", ociConfigFile = " + ociConfigFile + ", ociProfile = " + ociProfile + ", ociRegion = " + ociRegion + ", isScrapeByName = " + isScrapeByName);
PoolDataSource poolDataSource = PoolDataSourceFactory.getPoolDataSource();
poolDataSource.setConnectionFactoryClassName("oracle.jdbc.pool.OracleDataSource");
String url = "jdbc:oracle:thin:@" + serviceName + "?TNS_ADMIN=" + tnsAdmin;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/oracle/observability/metrics/MetricsExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public String scrapeByConfigName(@RequestParam("name") String name) throws Excep
@PostConstruct
public void init() throws Exception {
boolean isGlobalDataSourceSpecified = DATA_SOURCE_NAME != null && !DATA_SOURCE_NAME.trim().equals("");
boolean isMultiDataSourceConfigSpecified = MULTI_DATASOURCE_CONFIG != null || !MULTI_DATASOURCE_CONFIG.trim().equals("");
boolean isMultiDataSourceConfigSpecified = MULTI_DATASOURCE_CONFIG != null && !MULTI_DATASOURCE_CONFIG.trim().equals("");
if (!isMultiDataSourceConfigSpecified && !isGlobalDataSourceSpecified)
throw new Exception(
"Neither global datasource (DATA_SOURCE_NAME) nor multi-datasource (MULTI_DATASOURCE_CONFIG) " +
Expand Down