Add context.http.url to spans.

simitt · simitt · commit 1d492ebeb260 · 2018-06-27T18:01:04.000+02:00
implements #777
diff --git a/docs/data/elasticsearch/span.json b/docs/data/elasticsearch/span.json
@@ -6,6 +6,9 @@
             "type": "sql",
             "user": "readonly_user"
         },
+        "http": {
+            "url": "http://localhost:8000"
+        },
         "service": {
             "agent": {
                 "name": "elastic-node",
diff --git a/docs/data/intake-api/generated/transaction/payload.json b/docs/data/intake-api/generated/transaction/payload.json
@@ -163,6 +163,9 @@
                             "statement": "SELECT * FROM product_types WHERE user_id=?",
                             "type": "sql",
                             "user": "readonly_user"
+                        },
+                        "http": {
+                            "url": "http://localhost:8000"
                         }
                     }
                 },
diff --git a/docs/spec/transactions/span.json b/docs/spec/transactions/span.json
@@ -31,6 +31,16 @@
                            "description": "Username for accessing database"
                         }
                     }
+                },
+                "http": {
+                    "type": ["object", "null"],
+                    "description": "An object containing contextual data of the related http request.",
+                    "properties": {
+                        "url": {
+                            "type": ["string", "null"],
+                            "description": "The raw url of the correlating http request."
+                        }
+                    }
                 }
             }
         },
diff --git a/processor/transaction/package_tests/TestProcessTransactionFrontend.approved.json b/processor/transaction/package_tests/TestProcessTransactionFrontend.approved.json
@@ -24,16 +24,18 @@
                     "unloadEventEnd": 32,
                     "unloadEventStart": 32
                 },
+                "http": {
+                    "url": {
+                        "location": "http://localhost:8000/test/e2e/general-usecase/"
+                    }
+                },
                 "service": {
                     "agent": {
                         "name": "apm-js",
                         "version": "0.0.0"
                     },
                     "name": "apm-agent-js",
                     "version": "1.0.0"
-                },
-                "url": {
-                    "location": "http://localhost:8000/test/e2e/general-usecase/"
                 }
             },
             "processor": {
diff --git a/processor/transaction/package_tests/TestProcessTransactionFull.approved.json b/processor/transaction/package_tests/TestProcessTransactionFull.approved.json
@@ -148,6 +148,9 @@
                     "type": "sql",
                     "user": "readonly_user"
                 },
+                "http": {
+                    "url": "http://localhost:8000"
+                },
                 "service": {
                     "agent": {
                         "name": "elastic-node",
diff --git a/processor/transaction/schema.go b/processor/transaction/schema.go
@@ -396,6 +396,16 @@ var transactionSchema = `{
                            "description": "Username for accessing database"
                         }
                     }
+                },
+                "http": {
+                    "type": ["object", "null"],
+                    "description": "An object containing contextual data of the related http request.",
+                    "properties": {
+                        "url": {
+                            "type": ["string", "null"],
+                            "description": "The raw url of the correlating http request."
+                        }
+                    }
                 }
             }
         },
diff --git a/testdata/transaction/frontend.json b/testdata/transaction/frontend.json
@@ -59,8 +59,10 @@
                     "loadEventStart": 645,
                     "loadEventEnd": 648
                 },
-                "url": {
-                    "location": "http://localhost:8000/test/e2e/general-usecase/"
+                "http": {
+                    "url": {
+                        "location": "http://localhost:8000/test/e2e/general-usecase/"
+                    }
                 }
             },
             "unknownName": true
diff --git a/testdata/transaction/payload.json b/testdata/transaction/payload.json
@@ -163,6 +163,9 @@
                             "statement": "SELECT * FROM product_types WHERE user_id=?",
                             "type": "sql",
                             "user": "readonly_user"
+                        },
+                        "http": {
+                            "url": "http://localhost:8000"
                         }
                     }
                 },
diff --git a/tests/fields.go b/tests/fields.go
@@ -42,6 +42,7 @@ func TestEventAttrsDocumentedInFields(t *testing.T, fieldPaths []string, fn proc
 		"context.db.type",
 		"context.db.instance",
 		"context.db.user",
+		"context.http",
 		"sourcemap",
 		"transaction.marks.another_mark",
 		"transaction.marks.another_mark.some_long",

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,9 @@`
`163`	`163`	`"statement": "SELECT * FROM product_types WHERE user_id=?",`
`164`	`164`	`"type": "sql",`
`165`	`165`	`"user": "readonly_user"`
	`166`	`+ },`
	`167`	`+ "http": {`
	`168`	`+ "url": "http://localhost:8000"`
`166`	`169`	`}`
`167`	`170`	`}`
`168`	`171`	`},`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,16 @@`
`31`	`31`	`"description": "Username for accessing database"`
`32`	`32`	`}`
`33`	`33`	`}`
	`34`	`+ },`
	`35`	`+ "http": {`
	`36`	`+ "type": ["object", "null"],`
	`37`	`+ "description": "An object containing contextual data of the related http request.",`
	`38`	`+ "properties": {`
	`39`	`+ "url": {`
	`40`	`+ "type": ["string", "null"],`
	`41`	`+ "description": "The raw url of the correlating http request."`
	`42`	`+ }`
	`43`	`+ }`
`34`	`44`	`}`
`35`	`45`	`}`
`36`	`46`	`},`
Original file line number	Diff line number	Diff line change
@@ -396,6 +396,16 @@ var transactionSchema = `{
`396`	`396`	`"description": "Username for accessing database"`
`397`	`397`	`}`
`398`	`398`	`}`
	`399`	`+ },`
	`400`	`+ "http": {`
	`401`	`+ "type": ["object", "null"],`
	`402`	`+ "description": "An object containing contextual data of the related http request.",`
	`403`	`+ "properties": {`
	`404`	`+ "url": {`
	`405`	`+ "type": ["string", "null"],`
	`406`	`+ "description": "The raw url of the correlating http request."`
	`407`	`+ }`
	`408`	`+ }`
`399`	`409`	`}`
`400`	`410`	`}`
`401`	`411`	`},`