Add context.http.url to spans.

implements elastic#777
simitt · Jun 27, 2018 · 9658a6e · 9658a6e
1 parent 8a7016a
commit 9658a6e
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 5 deletions.
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 for the correlating 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",