Merge branch 'main' into dmisca-pip-264-broker-connection-metrics

apache · Jun 18, 2024 · 2942490 · 2942490
2 parents 9aac689 + db3cdeb
commit 2942490
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 18 deletions.
diff --git a/docs/reference-metrics-opentelemetry.md b/docs/reference-metrics-opentelemetry.md
@@ -424,6 +424,65 @@ The maximum number of pending topic load operations in the broker. Equal to "max
 * Type: UpDownCounter
 * Unit: `{operation}`
 
+### Producer metrics
+
+#### pulsar.broker.producer.message.incoming.count
+The total number of messages received from this producer.
+* Type: Counter
+* Unit: `{message}`
+* Attributes:
+  * `pulsar.domain` - The domain of the topic. Can be one of:
+    * `persistent`
+    * `non-persistent`
+  * `pulsar.tenant` - The topic tenant.
+  * `pulsar.namespace` - The topic namespace.
+  * `pulsar.topic` - The topic name.
+  * `pulsar.producer.name` - The name of the producer.
+  * `pulsar.producer.id` - The ID of the producer.
+  * `pulsar.producer.access_mode` - The access mode of the producer. Can be one of:
+    * `shared`
+    * `exclusive`
+    * `wait_for_exclusive`
+    * `exclusive_with_fencing`
+
+#### pulsar.broker.producer.message.incoming.size
+The total number of messages bytes received from this producer.
+* Type: Counter
+* Unit: `By`
+* Attributes:
+  * `pulsar.domain` - The domain of the topic. Can be one of:
+    * `persistent`
+    * `non-persistent`
+  * `pulsar.tenant` - The topic tenant.
+  * `pulsar.namespace` - The topic namespace.
+  * `pulsar.topic` - The topic name.
+  * `pulsar.producer.name` - The name of the producer.
+  * `pulsar.producer.id` - The ID of the producer.
+  * `pulsar.producer.access_mode` - The access mode of the producer. Can be one of:
+    * `shared`
+    * `exclusive`
+    * `wait_for_exclusive`
+    * `exclusive_with_fencing`
+
+#### pulsar.broker.producer.message.drop.count
+The total number of messages dropped from this producer.
+* Type: Counter
+* Unit: `{message}`
+* Attributes:
+  * `pulsar.domain` - The domain of the topic. Can be one of:
+    * `persistent`
+    * `non-persistent`
+  * `pulsar.tenant` - The topic tenant.
+  * `pulsar.namespace` - The topic namespace.
+  * `pulsar.topic` - The topic name.
+  * `pulsar.producer.name` - The name of the producer.
+  * `pulsar.producer.id` - The ID of the producer.
+  * `pulsar.producer.access_mode` - The access mode of the producer. Can be one of:
+    * `shared`
+    * `exclusive`
+    * `wait_for_exclusive`
+    * `exclusive_with_fencing`
+
 ### Schema Registry Metrics
 
 #### pulsar.broker.request.schema_registry.duration

diff --git a/static/swagger/master/swagger.json b/static/swagger/master/swagger.json
@@ -482,7 +482,7 @@
                     "type": "string"
                 },
                 "tlsAllowInsecureConnection": {
-                    "description": "Allow TLS connections to servers whose certificate cannot be be verified to have been signed by a trusted certificate authority.",
+                    "description": "Allow TLS connections to servers whose certificate cannot be verified to have been signed by a trusted certificate authority.",
                     "type": "boolean"
                 }
             },
@@ -1853,6 +1853,10 @@
                     "format": "int64",
                     "type": "integer"
                 },
+                "bytesOutInternalCounter": {
+                    "format": "int64",
+                    "type": "integer"
+                },
                 "committedTxnCount": {
                     "format": "int64",
                     "type": "integer"
@@ -1978,6 +1982,10 @@
                     "readOnly": true,
                     "type": "object"
                 },
+                "systemTopicBytesInCounter": {
+                    "format": "int64",
+                    "type": "integer"
+                },
                 "topicEpoch": {
                     "format": "int64",
                     "type": "integer"
@@ -2286,6 +2294,10 @@
                     "format": "int64",
                     "type": "integer"
                 },
+                "bytesOutInternalCounter": {
+                    "format": "int64",
+                    "type": "integer"
+                },
                 "committedTxnCount": {
                     "format": "int64",
                     "type": "integer"
@@ -2402,6 +2414,10 @@
                     "readOnly": true,
                     "type": "object"
                 },
+                "systemTopicBytesInCounter": {
+                    "format": "int64",
+                    "type": "integer"
+                },
                 "topicEpoch": {
                     "format": "int64",
                     "type": "integer"
@@ -2769,6 +2785,10 @@
                     "format": "int64",
                     "type": "integer"
                 },
+                "bytesOutInternalCounter": {
+                    "format": "int64",
+                    "type": "integer"
+                },
                 "committedTxnCount": {
                     "format": "int64",
                     "type": "integer"
@@ -2887,6 +2907,10 @@
                     },
                     "type": "object"
                 },
+                "systemTopicBytesInCounter": {
+                    "format": "int64",
+                    "type": "integer"
+                },
                 "topicEpoch": {
                     "format": "int64",
                     "type": "integer"

diff --git a/static/swagger/master/v2/swagger.json b/static/swagger/master/v2/swagger.json
@@ -482,7 +482,7 @@
                     "type": "string"
                 },
                 "tlsAllowInsecureConnection": {
-                    "description": "Allow TLS connections to servers whose certificate cannot be be verified to have been signed by a trusted certificate authority.",
+                    "description": "Allow TLS connections to servers whose certificate cannot be verified to have been signed by a trusted certificate authority.",
                     "type": "boolean"
                 }
             },
@@ -1853,6 +1853,10 @@
                     "format": "int64",
                     "type": "integer"
                 },
+                "bytesOutInternalCounter": {
+                    "format": "int64",
+                    "type": "integer"
+                },
                 "committedTxnCount": {
                     "format": "int64",
                     "type": "integer"
@@ -1978,6 +1982,10 @@
                     "readOnly": true,
                     "type": "object"
                 },
+                "systemTopicBytesInCounter": {
+                    "format": "int64",
+                    "type": "integer"
+                },
                 "topicEpoch": {
                     "format": "int64",
                     "type": "integer"
@@ -2286,6 +2294,10 @@
                     "format": "int64",
                     "type": "integer"
                 },
+                "bytesOutInternalCounter": {
+                    "format": "int64",
+                    "type": "integer"
+                },
                 "committedTxnCount": {
                     "format": "int64",
                     "type": "integer"
@@ -2402,6 +2414,10 @@
                     "readOnly": true,
                     "type": "object"
                 },
+                "systemTopicBytesInCounter": {
+                    "format": "int64",
+                    "type": "integer"
+                },
                 "topicEpoch": {
                     "format": "int64",
                     "type": "integer"
@@ -2769,6 +2785,10 @@
                     "format": "int64",
                     "type": "integer"
                 },
+                "bytesOutInternalCounter": {
+                    "format": "int64",
+                    "type": "integer"
+                },
                 "committedTxnCount": {
                     "format": "int64",
                     "type": "integer"
@@ -2887,6 +2907,10 @@
                     },
                     "type": "object"
                 },
+                "systemTopicBytesInCounter": {
+                    "format": "int64",
+                    "type": "integer"
+                },
                 "topicEpoch": {
                     "format": "int64",
                     "type": "integer"

diff --git a/tools/pytools/poetry.lock b/tools/pytools/poetry.lock
diff --git a/yarn.lock b/yarn.lock
@@ -4833,11 +4833,11 @@ __metadata:
   linkType: hard
 
 "braces@npm:^3.0.2, braces@npm:~3.0.2":
-  version: 3.0.2
-  resolution: "braces@npm:3.0.2"
+  version: 3.0.3
+  resolution: "braces@npm:3.0.3"
   dependencies:
-    fill-range: ^7.0.1
-  checksum: e2a8e769a863f3d4ee887b5fe21f63193a891c68b612ddb4b68d82d1b5f3ff9073af066c343e9867a393fe4c2555dcb33e89b937195feb9c1613d259edfcd459
+    fill-range: ^7.1.1
+  checksum: b95aa0b3bd909f6cd1720ffcf031aeaf46154dd88b4da01f9a1d3f7ea866a79eba76a6d01cbc3c422b2ee5cdc39a4f02491058d5df0d7bf6e6a162a832df1f69
   languageName: node
   linkType: hard
 
@@ -6875,12 +6875,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fill-range@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "fill-range@npm:7.0.1"
+"fill-range@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "fill-range@npm:7.1.1"
   dependencies:
     to-regex-range: ^5.0.1
-  checksum: cc283f4e65b504259e64fd969bcf4def4eb08d85565e906b7d36516e87819db52029a76b6363d0f02d0d532f0033c9603b9e2d943d56ee3b0d4f7ad3328ff917
+  checksum: b4abfbca3839a3d55e4ae5ec62e131e2e356bf4859ce8480c64c4876100f4df292a63e5bb1618e1d7460282ca2b305653064f01654474aa35c68000980f17798
   languageName: node
   linkType: hard
 
@@ -15230,8 +15230,8 @@ __metadata:
   linkType: hard
 
 "ws@npm:^7.3.1":
-  version: 7.5.9
-  resolution: "ws@npm:7.5.9"
+  version: 7.5.10
+  resolution: "ws@npm:7.5.10"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ^5.0.2
@@ -15240,7 +15240,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138
+  checksum: f9bb062abf54cc8f02d94ca86dcd349c3945d63851f5d07a3a61c2fcb755b15a88e943a63cf580cbdb5b74436d67ef6b67f745b8f7c0814e411379138e1863cb
   languageName: node
   linkType: hard