Merge pull request #267171 from heyams/heya/update-docs-for-3.5-ga

Update sampling overrides

Author: JamesJBarnett

articles/azure-monitor/app/java-standalone-sampling-overrides.md

@@ -11,7 +11,7 @@ ms.reviewer: mmcc
 # Sampling overrides (preview) - Azure Monitor Application Insights for Java
 
 > [!NOTE]
-> The sampling overrides feature is in preview, starting from 3.0.3.
+> The sampling overrides feature is in GA, starting from 3.5.0.
 
 Sampling overrides allow you to override the [default sampling percentage](./java-standalone-config.md#sampling),
 for example:
@@ -43,26 +43,22 @@ To begin, create a configuration file named *applicationinsights.json*. Save it
   "connectionString": "...",
   "sampling": {
     "percentage": 10
-  },
-  "preview": {
-    "sampling": {
-      "overrides": [
-        {
-          "telemetryType": "request",
-          "attributes": [
-            ...
-          ],
-          "percentage": 0
-        },
-        {
-          "telemetryType": "request",
-          "attributes": [
-            ...
-          ],
-          "percentage": 100
-        }
-      ]
-    }
+    "overrides": [
+      {
+        "telemetryType": "request",
+        "attributes": [
+          ...
+        ],
+        "percentage": 0
+      },
+      {
+        "telemetryType": "request",
+        "attributes": [
+          ...
+        ],
+        "percentage": 100
+      }
+    ]
   }
 }
 ```
@@ -100,22 +96,20 @@ This example also suppresses collecting any downstream spans (dependencies) that
 ```json
 {
   "connectionString": "...",
-  "preview": {
-    "sampling": {
-      "overrides": [
-        {
-          "telemetryType": "request",
-          "attributes": [
-            {
-              "key": "http.url",
-              "value": "https?://[^/]+/health-check",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        }
-      ]
-    }
+  "sampling": {
+    "overrides": [
+      {
+        "telemetryType": "request",
+        "attributes": [
+          {
+            "key": "url.path",
+            "value": "/health-check",
+            "matchType": "strict"
+          }
+        ],
+        "percentage": 0
+      }
+    ]
   }
 }
 ```
@@ -127,27 +121,25 @@ This example suppresses collecting telemetry for all `GET my-noisy-key` redis ca
 ```json
 {
   "connectionString": "...",
-  "preview": {
-    "sampling": {
-      "overrides": [
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.system",
-              "value": "redis",
-              "matchType": "strict"
-            },
-            {
-              "key": "db.statement",
-              "value": "GET my-noisy-key",
-              "matchType": "strict"
-            }
-          ],
-          "percentage": 0
-        }
-      ]
-    }
+  "sampling": {
+    "overrides": [
+      {
+        "telemetryType": "dependency",
+        "attributes": [
+          {
+            "key": "db.system",
+            "value": "redis",
+            "matchType": "strict"
+          },
+          {
+            "key": "db.statement",
+            "value": "GET my-noisy-key",
+            "matchType": "strict"
+          }
+        ],
+        "percentage": 0
+      }
+    ]
   }
 }
 ```
@@ -166,22 +158,20 @@ those are also collected for all '/login' requests.
   "sampling": {
     "percentage": 10
   },
-  "preview": {
-    "sampling": {
-      "overrides": [
-        {
-          "telemetryType": "request",
-          "attributes": [
-            {
-              "key": "http.url",
-              "value": "https?://[^/]+/login",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 100
-        }
-      ]
-    }
+  "sampling": {
+    "overrides": [
+      {
+        "telemetryType": "request",
+        "attributes": [
+          {
+            "key": "url.path",
+            "value": "/login",
+            "matchType": "strict"
+          }
+        ],
+        "percentage": 100
+      }
+    ]
   }
 }
 ```

articles/azure-monitor/app/java-standalone-telemetry-processors-examples.md

@@ -22,9 +22,9 @@ This section shows how to include spans for an attribute processor. The processo
 A match requires the span name to be equal to `spanA` or `spanB`. 
 
 These spans match the include properties, and the processor actions are applied:
-* Span1 Name: 'spanA' Attributes: {env: dev, test_request: 123, credit_card: 1234}
-* Span2 Name: 'spanB' Attributes: {env: dev, test_request: false}
-* Span3 Name: 'spanA' Attributes: {env: 1, test_request: dev, credit_card: 1234}
+* `Span1` Name: 'spanA' Attributes: {env: dev, test_request: 123, credit_card: 1234}
+* `Span2` Name: 'spanB' Attributes: {env: dev, test_request: false}
+* `Span3` Name: 'spanA' Attributes: {env: 1, test_request: dev, credit_card: 1234}
 
 This span doesn't match the include properties, and the processor actions aren't applied:
 * Span4 Name: 'spanC' Attributes: {env: dev, test_request: false}
@@ -62,9 +62,9 @@ This section demonstrates how to exclude spans for an attribute processor. This
 A match requires the span name to be equal to `spanA` or `spanB`.
 
 The following spans match the exclude properties, and the processor actions aren't applied:
-* Span1 Name: 'spanA' Attributes: {env: dev, test_request: 123, credit_card: 1234}
-* Span2 Name: 'spanB' Attributes: {env: dev, test_request: false}
-* Span3 Name: 'spanA' Attributes: {env: 1, test_request: dev, credit_card: 1234}
+* `Span1` Name: 'spanA' Attributes: {env: dev, test_request: 123, credit_card: 1234}
+* `Span2` Name: 'spanB' Attributes: {env: dev, test_request: false}
+* `Span3` Name: 'spanA' Attributes: {env: 1, test_request: dev, credit_card: 1234}
 
 This span doesn't match the exclude properties, and the processor actions are applied:
 * Span4 Name: 'spanC' Attributes: {env: dev, test_request: false}
@@ -104,11 +104,11 @@ A match requires the following conditions to be met:
 * The span must have an attribute that has key `test_request`.
 
 The following spans match the exclude properties, and the processor actions aren't applied.
-* Span1 Name: 'spanB' Attributes: {env: dev, test_request: 123, credit_card: 1234}
-* Span2 Name: 'spanA' Attributes: {env: dev, test_request: false}
+* `Span1` Name: 'spanB' Attributes: {env: dev, test_request: 123, credit_card: 1234}
+* `Span2` Name: 'spanA' Attributes: {env: dev, test_request: false}
 
 The following span doesn't match the exclude properties, and the processor actions are applied:
-* Span3 Name: 'spanB' Attributes: {env: 1, test_request: dev, credit_card: 1234}
+* `Span3` Name: 'spanB' Attributes: {env: 1, test_request: dev, credit_card: 1234}
 * Span4 Name: 'spanC' Attributes: {env: dev, dev_request: false}
 
 
@@ -155,11 +155,11 @@ properties indicate which spans should be processed. The exclude properties filt
 
 In the following configuration, these spans match the properties, and processor actions are applied:
 
-* Span1 Name: 'spanB' Attributes: {env: production, test_request: 123, credit_card: 1234, redact_trace: "false"}
-* Span2 Name: 'spanA' Attributes: {env: staging, test_request: false, redact_trace: true}
+* `Span1` Name: 'spanB' Attributes: {env: production, test_request: 123, credit_card: 1234, redact_trace: "false"}
+* `Span2` Name: 'spanA' Attributes: {env: staging, test_request: false, redact_trace: true}
 
 These spans don't match the include properties, and processor actions aren't applied:
-* Span3 Name: 'spanB' Attributes: {env: production, test_request: true, credit_card: 1234, redact_trace: false}
+* `Span3` Name: 'spanB' Attributes: {env: production, test_request: true, credit_card: 1234, redact_trace: false}
 * Span4 Name: 'spanC' Attributes: {env: dev, test_request: false}
 
 ```json
@@ -329,12 +329,12 @@ The following sample shows how to hash existing attribute values.
 ### Extract
 
 The following sample shows how to use a regular expression (regex) to create new attributes based on the value of another attribute.
-For example, given `http.url = http://example.com/path?queryParam1=value1,queryParam2=value2`, the following attributes are inserted:
+For example, given `url.path = /path?queryParam1=value1,queryParam2=value2`, the following attributes are inserted:
 * httpProtocol: `http`
 * httpDomain: `example.com`
 * httpPath: `path`
 * httpQueryParams: `queryParam1=value1,queryParam2=value2`
-* http.url: *no* change
+* url.path: *no* change
 
 ```json
 {
@@ -345,7 +345,7 @@ For example, given `http.url = http://example.com/path?queryParam1=value1,queryP
         "type": "attribute",
         "actions": [
           {
-            "key": "http.url",
+            "key": "url.path",
             "pattern": "^(?<httpProtocol>.*):\\/\\/(?<httpDomain>.*)\\/(?<httpPath>.*)(\\?|\\&)(?<httpQueryParams>.*)",
             "action": "extract"
           }
@@ -358,7 +358,7 @@ For example, given `http.url = http://example.com/path?queryParam1=value1,queryP
 
 ### Mask
 
-For example, given `http.url = https://example.com/user/12345622` is updated to `http.url = https://example.com/user/****` using either of the below configurations.
+For example, given `url.path = https://example.com/user/12345622` is updated to `url.path = https://example.com/user/****` using either of the below configurations.
 
 
 First configuration example:
@@ -372,7 +372,7 @@ First configuration example:
         "type": "attribute",
         "actions": [
           {
-            "key": "http.url",
+            "key": "url.path",
             "pattern": "user\\/\\d+",
             "replace": "user\\/****",
             "action": "mask"
@@ -396,7 +396,7 @@ Second configuration example with regular expression group name:
         "type": "attribute",
         "actions": [
           {
-            "key": "http.url",
+            "key": "url.path",
             "pattern": "^(?<userGroupName>[a-zA-Z.:\/]+)\d+",
             "replace": "${userGroupName}**",
             "action": "mask"
@@ -407,9 +407,9 @@ Second configuration example with regular expression group name:
   }
 }
 ```
-### Non-string typed attributes samples
+### Nonstring typed attributes samples
 
-Starting 3.4.19 GA, telemetry processors support non-string typed attributes:
+Starting 3.4.19 GA, telemetry processors support nonstring typed attributes:
 `boolean`, `double`, `long`, `boolean-array`, `double-array`, `long-array`, and `string-array`.
 
 When `attributes.type` is not provided in the json, it's default to `string`.
@@ -461,7 +461,7 @@ The following sample inserts the new attribute `{"newAttributeKeyStrict": "newAt
 
 ```
 
-Additionally, non-string typed attributes support `regexp`. 
+Additionally, nonstring typed attributes support `regexp`.
 
 The following sample inserts the new attribute `{"newAttributeKeyRegexp": "newAttributeValueRegexp"}` into spans and logs where the attribute `longRegexpAttributeKey` matches the value from `400` to `499`.
 

articles/azure-monitor/app/java-standalone-telemetry-processors.md

@@ -397,11 +397,11 @@ This section lists some common span attributes that telemetry processors can use
 
 | Attribute  | Type | Description | 
 |---|---|---|
-| `http.method` | string | HTTP request method.|
-| `http.url` | string | Full HTTP request URL in the form `scheme://host[:port]/path?query[#fragment]`. The fragment isn't usually transmitted over HTTP. But if the fragment is known, it should be included.|
-| `http.status_code` | number | [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6).|
-| `http.flavor` | string | Type of HTTP protocol. |
-| `http.user_agent` | string | Value of the [HTTP User-Agent](https://tools.ietf.org/html/rfc7231#section-5.5.3) header sent by the client. |
+| `http.request.method` (used to be `http.method`) | string | HTTP request method.|
+| `url.full` (client span) or `url.path` (server span) (used to be `http.url`) | string | Full HTTP request URL in the form `scheme://host[:port]/path?query[#fragment]`. The fragment isn't usually transmitted over HTTP. But if the fragment is known, it should be included.|
+| `http.response.status_code` (used to be `http.status_code`) | number | [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6).|
+| `network.protocol.version` (used to be `http.flavor`) | string | Type of HTTP protocol. |
+| `user_agent.original` (used to be `http.user_agent`) | string | Value of the [HTTP User-Agent](https://tools.ietf.org/html/rfc7231#section-5.5.3) header sent by the client. |
 
 ### JDBC spans
 

articles/azure-monitor/app/java-standalone-upgrade-from-2x.md

@@ -85,9 +85,9 @@ The telemetry processors perform the following actions (in order):
    which means it applies to all telemetry that has attributes
    (currently `requests` and `dependencies`, but soon also `traces`).
 
-   It matches any telemetry that has attributes named `http.method` and `http.url`.
+   It matches any telemetry that has attributes named `http.request.method` and `url.path`.
 
-   Then it extracts the path portion of the `http.url` attribute into a new attribute named `tempName`.
+   Then it extracts `url.path` attribute into a new attribute named `tempName`.
 
 2. The second telemetry processor is a span processor (has type `span`),
    which means it applies to `requests` and `dependencies`.
@@ -111,13 +111,13 @@ The telemetry processors perform the following actions (in order):
         "include": {
           "matchType": "strict",
           "attributes": [
-            { "key": "http.method" },
-            { "key": "http.url" }
+            { "key": "http.request.method" },
+            { "key": "url.path" }
           ]
         },
         "actions": [
           {
-            "key": "http.url",
+            "key": "url.path",
             "pattern": "https?://[^/]+(?<tempPath>/[^?]*)",
             "action": "extract"
           }
@@ -132,7 +132,7 @@ The telemetry processors perform the following actions (in order):
           ]
         },
         "name": {
-          "fromAttributes": [ "http.method", "tempPath" ],
+          "fromAttributes": [ "http.request.method", "tempPath" ],
           "separator": " "
         }
       },

articles/azure-monitor/app/opentelemetry-enable.md

@@ -83,6 +83,7 @@ Download the [applicationinsights-agent-3.5.0.jar](https://github.com/microsoft/
 > [!WARNING]
 >
 > If you are upgrading from an earlier 3.x version, you may be impacted by changing defaults or slight differences in the data we collect. For more information, see the migration section in the release notes.
+> [3.5.0](https://github.com/microsoft/ApplicationInsights-Java/releases/tag/3.5.0),
 > [3.4.0](https://github.com/microsoft/ApplicationInsights-Java/releases/tag/3.4.0),
 > [3.3.0](https://github.com/microsoft/ApplicationInsights-Java/releases/tag/3.3.0),
 > [3.2.0](https://github.com/microsoft/ApplicationInsights-Java/releases/tag/3.2.0), and