Fix too many app map nodes for Redis/etc

trask · trask · commit ba653bf9c05a · 2020-04-15T16:44:48.000-07:00
diff --git a/agent/exporter/src/main/java/com/microsoft/applicationinsights/agent/Exporter.java b/agent/exporter/src/main/java/com/microsoft/applicationinsights/agent/Exporter.java
@@ -366,7 +366,13 @@ private void applyDatabaseQuerySpan(SpanData span, RemoteDependencyTelemetry tel
         }
         telemetry.setType(type);
         telemetry.setCommandName(getString(span, "db.statement"));
-        telemetry.setTarget(getString(span, "db.url"));
+        String dbUrl = getString(span, "db.url");
+        if (dbUrl == null) {
+            // this is needed until all database instrumentation captures the required db.url
+            telemetry.setTarget(type);
+        } else {
+            telemetry.setTarget(dbUrl);
+        }
         // TODO put db.instance somewhere
     }
 
diff --git a/opentelemetry-auto-instr-java b/opentelemetry-auto-instr-java
@@ -1 +1 @@
-Subproject commit b9ff2cf28675f3d1ffd4524531ca1d5db51d6782
+Subproject commit 09c44087a19d071973ac5b456237642da70a12fc

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,13 @@ private void applyDatabaseQuerySpan(SpanData span, RemoteDependencyTelemetry tel`
`366`	`366`	`}`
`367`	`367`	`telemetry.setType(type);`
`368`	`368`	`telemetry.setCommandName(getString(span, "db.statement"));`
`369`		`- telemetry.setTarget(getString(span, "db.url"));`
	`369`	`+ String dbUrl = getString(span, "db.url");`
	`370`	`+ if (dbUrl == null) {`
	`371`	`+ // this is needed until all database instrumentation captures the required db.url`
	`372`	`+ telemetry.setTarget(type);`
	`373`	`+ } else {`
	`374`	`+ telemetry.setTarget(dbUrl);`
	`375`	`+ }`
`370`	`376`	`// TODO put db.instance somewhere`
`371`	`377`	`}`
`372`	`378`