Skip to content

Fix oracle lower case tns url parse error. (#11399) #621

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 2 commits into from
Oct 13, 2023
Merged

Fix oracle lower case tns url parse error. (#11399) #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
100ef12
Fix oracle lower case tns url parse error. (#11399)
Builder34 Oct 11, 2023
553cd8e
Update CHANGES.md (#11399)
Builder34 Oct 13, 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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Release Notes.
* Add max length configurations in `agent.config` file for service_name and instance_name
* Optimize spring-cloud-gateway 2.1.x, 3.x witness class.
* Support report MongoDB instance info in Mongodb 4.x plugin.
* To compatible upper and lower case Oracle TNS url parse.

#### Documentation

Expand Down
42 changes: 25 additions & 17 deletions ...main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/OracleURLParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@

package org.apache.skywalking.apm.plugin.jdbc.connectionurl.parser;

import java.util.ArrayList;
import java.util.List;
import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo;
import org.apache.skywalking.apm.util.StringUtil;

import java.util.ArrayList;
import java.util.List;

/**
* {@link OracleURLParser} presents that how to parse oracle connection url.
* <p>
Expand All @@ -36,9 +37,16 @@ public class OracleURLParser extends AbstractURLParser {
private static final int DEFAULT_PORT = 1521;
public static final String SERVICE_NAME_FLAG = "@//";
public static final String TNSNAME_URL_FLAG = "DESCRIPTION";
public static final String SERVICE_NAME_FIELD = "SERVICE_NAME";
public static final String HOST_FIELD = "HOST";
public static final String PORT_FIELD = "PORT";

// only use to indexOf TNS url keyword
private final String upperUrl;

public OracleURLParser(String url) {
super(url);
upperUrl = url == null ? null : url.toUpperCase();
}

@Override
Expand All @@ -63,24 +71,24 @@ protected URLLocation fetchDatabaseHostsIndexRange() {
@Override
protected URLLocation fetchDatabaseNameIndexRange() {
int hostLabelStartIndex;
int hostLabelEndIndex = url.length();
int hostLabelEndIndex = upperUrl.length();
if (isServiceNameURL()) {
hostLabelStartIndex = url.lastIndexOf("/") + 1;
hostLabelStartIndex = upperUrl.lastIndexOf("/") + 1;
} else if (isTNSNameURL()) {
hostLabelStartIndex = url.indexOf("=", url.indexOf("SERVICE_NAME")) + 1;
hostLabelEndIndex = url.indexOf(")", hostLabelStartIndex);
hostLabelStartIndex = upperUrl.indexOf("=", upperUrl.indexOf(SERVICE_NAME_FIELD)) + 1;
hostLabelEndIndex = upperUrl.indexOf(")", hostLabelStartIndex);
} else {
hostLabelStartIndex = url.lastIndexOf(":") + 1;
hostLabelStartIndex = upperUrl.lastIndexOf(":") + 1;
}
return new URLLocation(hostLabelStartIndex, hostLabelEndIndex);
}

private boolean isServiceNameURL() {
return url.contains(SERVICE_NAME_FLAG);
return upperUrl.contains(SERVICE_NAME_FLAG);
}

private boolean isTNSNameURL() {
return url.contains(TNSNAME_URL_FLAG);
return upperUrl.contains(TNSNAME_URL_FLAG);
}

@Override
Expand Down Expand Up @@ -110,23 +118,23 @@ private ConnectionInfo tnsNameURLParse() {
}

private String parseDatabaseHostsFromURL() {
int beginIndex = url.indexOf("DESCRIPTION");
int beginIndex = upperUrl.indexOf(TNSNAME_URL_FLAG);
List<String> hosts = new ArrayList<String>();
do {
int hostStartIndex = url.indexOf("HOST", beginIndex);
int hostStartIndex = upperUrl.indexOf(HOST_FIELD, beginIndex);
if (hostStartIndex == -1) {
break;
}
int equalStartIndex = url.indexOf("=", hostStartIndex);
int hostEndIndex = url.indexOf(")", hostStartIndex);
int equalStartIndex = upperUrl.indexOf("=", hostStartIndex);
int hostEndIndex = upperUrl.indexOf(")", hostStartIndex);
String host = url.substring(equalStartIndex + 1, hostEndIndex);

int port = DEFAULT_PORT;
int portStartIndex = url.indexOf("PORT", hostEndIndex);
int portEndIndex = url.length();
int portStartIndex = upperUrl.indexOf(PORT_FIELD, hostEndIndex);
int portEndIndex = upperUrl.length();
if (portStartIndex != -1) {
int portEqualStartIndex = url.indexOf("=", portStartIndex);
portEndIndex = url.indexOf(")", portEqualStartIndex);
int portEqualStartIndex = upperUrl.indexOf("=", portStartIndex);
portEndIndex = upperUrl.indexOf(")", portEqualStartIndex);
port = Integer.parseInt(url.substring(portEqualStartIndex + 1, portEndIndex).trim());
}
hosts.add(host.trim() + ":" + port);
Expand Down
8 changes: 8 additions & 0 deletions ...c/test/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,14 @@ public void testParseOracleTNSName() {
assertThat(connectionInfo.getDatabasePeer(), is("localhost:1521"));
}

@Test
public void testParseOracleLowerTNSName() {
ConnectionInfo connectionInfo = new URLParser().parser("jdbc:oracle:thin:@(description=(address=(protocol=tcp)(host= localhost )(port= 1521))(connect_data=(server=dedicated)(service_name=orcl)))");
assertThat(connectionInfo.getDBType(), is("Oracle"));
assertThat(connectionInfo.getDatabaseName(), is("orcl"));
assertThat(connectionInfo.getDatabasePeer(), is("localhost:1521"));
}

@Test
public void testParseOracleTNSNameWithMultiAddress() {
ConnectionInfo connectionInfo = new URLParser().parser("jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL= TCP)(HOST=hostA)(PORT= 1523 ))(ADDRESS=(PROTOCOL=TCP)(HOST=hostB)(PORT= 1521 )))(SOURCE_ROUTE=yes)(CONNECT_DATA=(SERVICE_NAME=orcl)))");
Expand Down