Skip to content
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

Align span subtype for SqlServer #2112

Merged
merged 4 commits into from
Sep 13, 2021
Merged

Align span subtype for SqlServer #2112

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f28861
use 'mssql' instead of 'sqlserver'
SylvainJuge Sep 8, 2021
9d4ddf8
fix integration tests
SylvainJuge Sep 8, 2021
2bd796c
fix typo
SylvainJuge Sep 8, 2021
cc34a71
update changelog
SylvainJuge Sep 13, 2021
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
2 changes: 1 addition & 1 deletion apm-agent-core/src/test/java/co/elastic/apm/agent/MockReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ private void verifySpanType(Span span) {
}
} else {
if (!allowUnlistedSubtype && hasSubtypes) {
getMandatoryJson(subTypesJson, subType, String.format("span subtype '%s' is not allowed by the sped for type '%s'", subType, type));
getMandatoryJson(subTypesJson, subType, String.format("span subtype '%s' is not allowed by the spec for type '%s'", subType, type));
}
}

Expand Down
6 changes: 3 additions & 3 deletions apm-agent-core/src/test/resources/json-specs/span_types.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@
"mssql": {
"__description": "Microsoft SQL Server",
"__used_by": [
"nodejs"
"nodejs",
"java"
]
},
"mysql": {
Expand Down Expand Up @@ -183,9 +184,8 @@
]
},
"sqlserver": {
"__description": "Microsoft SQL Server",
"__description": "Microsoft SQL Server (deprecated, use mssql instead)",
"__used_by": [
"java"
]
},
"unknown": {
Expand Down
2 changes: 1 addition & 1 deletion ...ns/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/ConnectionMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ ConnectionMetaData parse(String connectionUrl, String instance, String user) {
if (indexOfInstance > 0) {
host = host.substring(0, indexOfInstance);
}
return new ConnectionMetaData(dbVendor, host, port, instance, user);
return new ConnectionMetaData("mssql", host, port, instance, user);
}
},

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/JdbcDbIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static Iterable<Object[]> data() {
{"jdbc:tc:postgresql:9://hostname/databasename", "postgresql"},
{"jdbc:tc:postgresql:10://hostname/databasename", "postgresql"},
{"jdbc:tc:mariadb:10://hostname/databasename", "mariadb"},
{"jdbc:tc:sqlserver:2017-CU12://hostname/databasename", "sqlserver"},
{"jdbc:tc:sqlserver:2017-CU12://hostname/databasename", "mssql"},
{"jdbc:tc:db2:11.5.0.0a://hostname/databasename", "db2"},
{"jdbc:tc:oracle://hostname/databasename", "oracle"},
});
Expand Down
32 changes: 16 additions & 16 deletions ...pm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/helper/ConnectionMetaDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,23 +234,23 @@ void testMariadb() {
@Test
void testSqlserver() {
// https://docs.microsoft.com/en-us/sql/connect/jdbc/building-the-connection-url?view=sql-server-ver15
testUrl("jdbc:sqlserver://myhost\\instance:666", "sqlserver", "myhost", 666);
testUrl("jdbc:sqlserver://myhost\\instance:666;prop1=val1;prop2=val2", "sqlserver", "myhost", 666);
testUrl("jdbc:sqlserver://myhost:666", "sqlserver", "myhost", 666);
testUrl("jdbc:sqlserver://myhost:666;prop1=val1;prop2=val2", "sqlserver", "myhost", 666);
testUrl("jdbc:sqlserver://myhost\\instance", "sqlserver", "myhost", 1433);
testUrl("jdbc:sqlserver://myhost\\instance;prop1=val1;prop2=val2", "sqlserver", "myhost", 1433);
testUrl("jdbc:sqlserver://myhost", "sqlserver", "myhost", 1433);
testUrl("jdbc:sqlserver://myhost;prop1=val1;prop2=val2", "sqlserver", "myhost", 1433);
testUrl("jdbc:sqlserver://", "sqlserver", "localhost", 1433);
testUrl("jdbc:sqlserver://;prop1=val1;prop2=val2", "sqlserver", "localhost", 1433);
testUrl("jdbc:sqlserver://;", "sqlserver", "localhost", 1433);
testUrl("jdbc:sqlserver://;serverName=myhost", "sqlserver", "myhost", 1433);
testUrl("jdbc:sqlserver://;prop1=val1;serverName=myhost", "sqlserver", "myhost", 1433);
testUrl("jdbc:sqlserver://;serverName=myhost;prop1=val1", "sqlserver", "myhost", 1433);
testUrl("jdbc:sqlserver://;serverName=myhost\\instance;prop1=val1", "sqlserver", "myhost", 1433);
testUrl("jdbc:sqlserver://myhost\\instance:666", "mssql", "myhost", 666);
testUrl("jdbc:sqlserver://myhost\\instance:666;prop1=val1;prop2=val2", "mssql", "myhost", 666);
testUrl("jdbc:sqlserver://myhost:666", "mssql", "myhost", 666);
testUrl("jdbc:sqlserver://myhost:666;prop1=val1;prop2=val2", "mssql", "myhost", 666);
testUrl("jdbc:sqlserver://myhost\\instance", "mssql", "myhost", 1433);
testUrl("jdbc:sqlserver://myhost\\instance;prop1=val1;prop2=val2", "mssql", "myhost", 1433);
testUrl("jdbc:sqlserver://myhost", "mssql", "myhost", 1433);
testUrl("jdbc:sqlserver://myhost;prop1=val1;prop2=val2", "mssql", "myhost", 1433);
testUrl("jdbc:sqlserver://", "mssql", "localhost", 1433);
testUrl("jdbc:sqlserver://;prop1=val1;prop2=val2", "mssql", "localhost", 1433);
testUrl("jdbc:sqlserver://;", "mssql", "localhost", 1433);
testUrl("jdbc:sqlserver://;serverName=myhost", "mssql", "myhost", 1433);
testUrl("jdbc:sqlserver://;prop1=val1;serverName=myhost", "mssql", "myhost", 1433);
testUrl("jdbc:sqlserver://;serverName=myhost;prop1=val1", "mssql", "myhost", 1433);
testUrl("jdbc:sqlserver://;serverName=myhost\\instance;prop1=val1", "mssql", "myhost", 1433);
testUrl("jdbc:sqlserver://;serverName=3ffe:8311:eeee:f70f:0:5eae:10.203.31.9\\instance;prop1=val1",
"sqlserver", "3ffe:8311:eeee:f70f:0:5eae:10.203.31.9", 1433);
"mssql", "3ffe:8311:eeee:f70f:0:5eae:10.203.31.9", 1433);
}

@Test
Expand Down