Add context.http.url to spans. (#1037)

* Add context.http.url to spans. implements #777
elastic · Jun 28, 2018 · 2665a0d · 2665a0d
1 parent 64f0b32
commit 2665a0d
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 1 deletion.
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/generated/schema/payload.go b/processor/transaction/generated/schema/payload.go
@@ -392,6 +392,16 @@ const PayloadSchema = `{
                            "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
@@ -52,6 +52,9 @@
         {
             "@timestamp": "-",
             "context": {
+                "http": {
+                    "url": "http://localhost:8000/test/e2e/general-usecase/span"
+                },
                 "service": {
                     "agent": {
                         "name": "apm-js",

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/testdata/transaction/frontend.json b/testdata/transaction/frontend.json
@@ -33,7 +33,12 @@
                             "lineno": 1,
                            "colno": 18
                         }
-                    ]
+                    ],
+                    "context": {
+                        "http": {
+                            "url": "http://localhost:8000/test/e2e/general-usecase/span"
+                        }
+                    }
                 }
             ],
             "context": {

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",

diff --git a/tests/system/spans.approved.json b/tests/system/spans.approved.json
@@ -198,6 +198,9 @@
                     "user": "readonly_user",
                     "statement": "SELECT * FROM product_types WHERE user_id=?"
                 },
+                "http": {
+                    "url": "http://localhost:8000"
+                },
                 "service": {
                     "name": "1234_service-12a3",
                     "agent": {