Consolidate model.HTTP and model.Http (#5764) (#5776)

For a long time we have had two distinct types, model.HTTP and model.Http, for span (outgoing) and transaction (incoming) HTTP fields. Consolidate these two into one type, to simplify the model and transformation to documents. There is a minor change in precedence for handling context.http.status_code and context.http.response.status_code. This should not matter; the values should be the same, and if they're not then that's on the agent. (cherry picked from commit 46f214e) Co-authored-by: Andrew Wilkins <[email protected]>
elastic · Jul 21, 2021 · 645bd71 · 645bd71
1 parent 526d4ec
commit 645bd71
Show file tree

Hide file tree

Showing 42 changed files with 638 additions and 525 deletions.
diff --git a/apmpackage/apm/docs/README.md b/apmpackage/apm/docs/README.md
@@ -310,7 +310,9 @@ Traces are written to `traces-apm.*` indices.
     "outcome": "unknown"
   },
   "http": {
-    "request.method": "GET",
+    "request": {
+      "method": "GET"
+    },
     "response": {
       "status_code": 200
     }
@@ -354,11 +356,9 @@ Traces are written to `traces-apm.*` indices.
       "method": "GET",
       "response": {
         "status_code": 200
-      },
-      "url": {
-        "original": "http://localhost:8000"
       }
     },
+    "http.url.original": "http://localhost:8000",
     "id": "0aaaaaaaaaaaaaaa",
     "name": "SELECT FROM product_types",
     "stacktrace": [

diff --git a/beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json
@@ -231,9 +231,7 @@
             },
             "http": {
                 "request": {
-                    "body": {
-                        "original": "Hello World"
-                    },
+                    "body.original": "Hello World",
                     "cookies": {
                         "c1": "v1",
                         "c2": "v2"

diff --git a/beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json
@@ -153,9 +153,7 @@
             },
             "http": {
                 "request": {
-                    "body": {
-                        "original": "HelloWorld"
-                    },
+                    "body.original": "HelloWorld",
                     "cookies": {
                         "c1": "v1",
                         "c2": "v2"
@@ -315,9 +313,11 @@
                 }
             },
             "http": {
-                "request.method": "GET",
+                "request": {
+                    "method": "GET"
+                },
                 "response": {
-                    "status_code": 200
+                    "status_code": 302
                 }
             },
             "kubernetes": {
@@ -402,13 +402,11 @@
                                 "application/json"
                             ]
                         },
-                        "status_code": 200,
+                        "status_code": 302,
                         "transfer_size": 300.12
-                    },
-                    "url": {
-                        "original": "http://localhost:8000"
                     }
                 },
+                "http.url.original": "http://localhost:8000",
                 "id": "1234567890aaaade",
                 "name": "GET users-authenticated",
                 "stacktrace": [
@@ -481,14 +479,12 @@
             },
             "http": {
                 "request": {
-                    "body": {
-                        "original": {
-                            "additional": {
-                                "bar": 123,
-                                "req": "additionalinformation"
-                            },
-                            "string": "helloworld"
-                        }
+                    "body.original": {
+                        "additional": {
+                            "bar": 123,
+                            "req": "additionalinformation"
+                        },
+                        "string": "helloworld"
                     },
                     "cookies": {
                         "c1": "v1",

diff --git a/beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json
@@ -585,7 +585,9 @@
                 }
             },
             "http": {
-                "request.method": "GET",
+                "request": {
+                    "method": "GET"
+                },
                 "response": {
                     "status_code": 200
                 }
@@ -676,11 +678,9 @@
                         "encoded_body_size": 356,
                         "status_code": 200,
                         "transfer_size": 300.12
-                    },
-                    "url": {
-                        "original": "http://localhost:8000"
                     }
                 },
+                "http.url.original": "http://localhost:8000",
                 "id": "1234567890aaaade",
                 "name": "SELECT FROM product_types",
                 "stacktrace": [

diff --git a/beater/test_approved_es_documents/TestPublishIntegrationTransactions.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationTransactions.approved.json
@@ -181,14 +181,12 @@
             },
             "http": {
                 "request": {
-                    "body": {
-                        "original": {
-                            "additional": {
-                                "bar": 123,
-                                "req": "additional information"
-                            },
-                            "str": "hello world"
-                        }
+                    "body.original": {
+                        "additional": {
+                            "bar": 123,
+                            "req": "additional information"
+                        },
+                        "str": "hello world"
                     },
                     "cookies": {
                         "c1": "v1",

diff --git a/docs/data/elasticsearch/generated/errors.json b/docs/data/elasticsearch/generated/errors.json
@@ -281,9 +281,7 @@
         },
         "http": {
             "request": {
-                "body": {
-                    "original": "Hello World"
-                },
+                "body.original": "Hello World",
                 "cookies": {
                     "c1": "v1",
                     "c2": "v2"

diff --git a/docs/data/elasticsearch/generated/spans.json b/docs/data/elasticsearch/generated/spans.json
@@ -12,7 +12,9 @@
             "outcome": "unknown"
         },
         "http": {
-            "request.method": "GET",
+            "request": {
+                "method": "GET"
+            },
             "response": {
                 "status_code": 200
             }
@@ -56,11 +58,9 @@
                 "method": "GET",
                 "response": {
                     "status_code": 200
-                },
-                "url": {
-                    "original": "http://localhost:8000"
                 }
             },
+            "http.url.original": "http://localhost:8000",
             "id": "0aaaaaaaaaaaaaaa",
             "name": "SELECT FROM product_types",
             "stacktrace": [

diff --git a/docs/data/elasticsearch/generated/transactions.json b/docs/data/elasticsearch/generated/transactions.json
@@ -325,14 +325,12 @@
         },
         "http": {
             "request": {
-                "body": {
-                    "original": {
-                        "additional": {
-                            "bar": 123,
-                            "req": "additional information"
-                        },
-                        "str": "hello world"
-                    }
+                "body.original": {
+                    "additional": {
+                        "bar": 123,
+                        "req": "additional information"
+                    },
+                    "str": "hello world"
                 },
                 "cookies": {
                     "c1": "v1",