From aa145f27f8f7e1245b8fd63e3b4378f98184f1a6 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Fri, 16 Feb 2024 23:10:58 -0800 Subject: [PATCH] fix new lines --- .../opentelemetry/semconv/http_attributes.py | 2 - .../semconv/v1_23_1/container_attributes.py | 1 - .../semconv/v1_23_1/db_attributes.py | 1 - .../semconv/v1_23_1/db_metrics.py | 18 ------- .../semconv/v1_23_1/faas_metrics.py | 18 ------- .../semconv/v1_23_1/http_metrics.py | 14 ----- .../semconv/v1_23_1/jvm_metrics.py | 36 ------------- .../semconv/v1_23_1/rpc_attributes.py | 4 -- .../semconv/v1_23_1/rpc_metrics.py | 20 ------- .../semconv/v1_23_1/system_metrics.py | 54 ------------------- .../semconv/templates/semantic_attributes.j2 | 2 +- scripts/semconv/templates/semantic_metrics.j2 | 6 +-- 12 files changed, 4 insertions(+), 172 deletions(-) diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/http_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/http_attributes.py index df046b28624..42189dcd5aa 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/http_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/http_attributes.py @@ -19,7 +19,6 @@ HTTP_REQUEST_HEADER_TEMPLATE = "http.request.header" - """ HTTP request headers, `` being the normalized HTTP Header name (lowercase), the value being the header values. Note: Instrumentations SHOULD require an explicit configuration of which headers are to be captured. Including all request headers can be a security risk - explicit configuration helps avoid leaking sensitive information. @@ -62,7 +61,6 @@ HTTP_RESPONSE_HEADER_TEMPLATE = "http.response.header" - """ HTTP response headers, `` being the normalized HTTP Header name (lowercase), the value being the header values. Note: Instrumentations SHOULD require an explicit configuration of which headers are to be captured. Including all response headers can be a security risk - explicit configuration helps avoid leaking sensitive information. diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/container_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/container_attributes.py index e8df3771fe1..e36e71ad18f 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/container_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/container_attributes.py @@ -70,7 +70,6 @@ CONTAINER_LABELS_TEMPLATE = "container.labels" - """ Container labels, `` being the label name, the value being the label value. """ diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/db_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/db_attributes.py index d4c09eeee55..61a203df42a 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/db_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/db_attributes.py @@ -128,7 +128,6 @@ DB_ELASTICSEARCH_PATH_PARTS_TEMPLATE = "db.elasticsearch.path_parts" - """ A dynamic value in the url path. Note: Many Elasticsearch url paths allow dynamic values. These SHOULD be recorded in span attributes in the format `db.elasticsearch.path_parts.`, where `` is the url path part name. The implementation SHOULD reference the [elasticsearch schema](https://raw.githubusercontent.com/elastic/elasticsearch-specification/main/output/schema/schema.json) in order to map the path part values to their names. diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/db_metrics.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/db_metrics.py index 1f9853479f4..304cb660493 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/db_metrics.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/db_metrics.py @@ -28,9 +28,7 @@ class DbMetrics: The time it took to create a new connection """ @staticmethod - def create_db_client_connections_create_time(meter: Meter) -> Histogram: - return meter.create_histogram( name="db.client.connections.create_time", description="The time it took to create a new connection", @@ -42,9 +40,7 @@ def create_db_client_connections_create_time(meter: Meter) -> Histogram: The maximum number of idle open connections allowed """ @staticmethod - def create_db_client_connections_idle_max(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="db.client.connections.idle.max", description="The maximum number of idle open connections allowed", @@ -56,9 +52,7 @@ def create_db_client_connections_idle_max(meter: Meter) -> UpDownCounter: The minimum number of idle open connections allowed """ @staticmethod - def create_db_client_connections_idle_min(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="db.client.connections.idle.min", description="The minimum number of idle open connections allowed", @@ -70,9 +64,7 @@ def create_db_client_connections_idle_min(meter: Meter) -> UpDownCounter: The maximum number of open connections allowed """ @staticmethod - def create_db_client_connections_max(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="db.client.connections.max", description="The maximum number of open connections allowed", @@ -84,9 +76,7 @@ def create_db_client_connections_max(meter: Meter) -> UpDownCounter: The number of pending requests for an open connection, cumulative for the entire pool """ @staticmethod - def create_db_client_connections_pending_requests(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="db.client.connections.pending_requests", description="The number of pending requests for an open connection, cumulative for the entire pool", @@ -98,9 +88,7 @@ def create_db_client_connections_pending_requests(meter: Meter) -> UpDownCounter The number of connection timeouts that have occurred trying to obtain a connection from the pool """ @staticmethod - def create_db_client_connections_timeouts(meter: Meter) -> Counter: - return meter.create_counter( name="db.client.connections.timeouts", description="The number of connection timeouts that have occurred trying to obtain a connection from the pool", @@ -112,9 +100,7 @@ def create_db_client_connections_timeouts(meter: Meter) -> Counter: The number of connections that are currently in state described by the `state` attribute """ @staticmethod - def create_db_client_connections_usage(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="db.client.connections.usage", description="The number of connections that are currently in state described by the `state` attribute", @@ -126,9 +112,7 @@ def create_db_client_connections_usage(meter: Meter) -> UpDownCounter: The time between borrowing a connection and returning it to the pool """ @staticmethod - def create_db_client_connections_use_time(meter: Meter) -> Histogram: - return meter.create_histogram( name="db.client.connections.use_time", description="The time between borrowing a connection and returning it to the pool", @@ -140,9 +124,7 @@ def create_db_client_connections_use_time(meter: Meter) -> Histogram: The time it took to obtain an open connection from the pool """ @staticmethod - def create_db_client_connections_wait_time(meter: Meter) -> Histogram: - return meter.create_histogram( name="db.client.connections.wait_time", description="The time it took to obtain an open connection from the pool", diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/faas_metrics.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/faas_metrics.py index 9665f0aef97..6808480f011 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/faas_metrics.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/faas_metrics.py @@ -28,9 +28,7 @@ class FaasMetrics: Number of invocation cold starts """ @staticmethod - def create_faas_coldstarts(meter: Meter) -> Counter: - return meter.create_counter( name="faas.coldstarts", description="Number of invocation cold starts", @@ -42,9 +40,7 @@ def create_faas_coldstarts(meter: Meter) -> Counter: Distribution of CPU usage per invocation """ @staticmethod - def create_faas_cpu_usage(meter: Meter) -> Histogram: - return meter.create_histogram( name="faas.cpu_usage", description="Distribution of CPU usage per invocation", @@ -56,9 +52,7 @@ def create_faas_cpu_usage(meter: Meter) -> Histogram: Number of invocation errors """ @staticmethod - def create_faas_errors(meter: Meter) -> Counter: - return meter.create_counter( name="faas.errors", description="Number of invocation errors", @@ -70,9 +64,7 @@ def create_faas_errors(meter: Meter) -> Counter: Measures the duration of the function's initialization, such as a cold start """ @staticmethod - def create_faas_init_duration(meter: Meter) -> Histogram: - return meter.create_histogram( name="faas.init_duration", description="Measures the duration of the function's initialization, such as a cold start", @@ -84,9 +76,7 @@ def create_faas_init_duration(meter: Meter) -> Histogram: Number of successful invocations """ @staticmethod - def create_faas_invocations(meter: Meter) -> Counter: - return meter.create_counter( name="faas.invocations", description="Number of successful invocations", @@ -98,9 +88,7 @@ def create_faas_invocations(meter: Meter) -> Counter: Measures the duration of the function's logic execution """ @staticmethod - def create_faas_invoke_duration(meter: Meter) -> Histogram: - return meter.create_histogram( name="faas.invoke_duration", description="Measures the duration of the function's logic execution", @@ -112,9 +100,7 @@ def create_faas_invoke_duration(meter: Meter) -> Histogram: Distribution of max memory usage per invocation """ @staticmethod - def create_faas_mem_usage(meter: Meter) -> Histogram: - return meter.create_histogram( name="faas.mem_usage", description="Distribution of max memory usage per invocation", @@ -126,9 +112,7 @@ def create_faas_mem_usage(meter: Meter) -> Histogram: Distribution of net I/O usage per invocation """ @staticmethod - def create_faas_net_io(meter: Meter) -> Histogram: - return meter.create_histogram( name="faas.net_io", description="Distribution of net I/O usage per invocation", @@ -140,9 +124,7 @@ def create_faas_net_io(meter: Meter) -> Histogram: Number of invocation timeouts """ @staticmethod - def create_faas_timeouts(meter: Meter) -> Counter: - return meter.create_counter( name="faas.timeouts", description="Number of invocation timeouts", diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/http_metrics.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/http_metrics.py index f0861291962..a0e1a09b18d 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/http_metrics.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/http_metrics.py @@ -28,9 +28,7 @@ class HttpMetrics: Size of HTTP client request bodies """ @staticmethod - def create_http_client_request_body_size(meter: Meter) -> Histogram: - return meter.create_histogram( name="http.client.request.body.size", description="Size of HTTP client request bodies.", @@ -42,9 +40,7 @@ def create_http_client_request_body_size(meter: Meter) -> Histogram: Duration of HTTP client requests """ @staticmethod - def create_http_client_request_duration(meter: Meter) -> Histogram: - return meter.create_histogram( name="http.client.request.duration", description="Duration of HTTP client requests.", @@ -56,9 +52,7 @@ def create_http_client_request_duration(meter: Meter) -> Histogram: Size of HTTP client response bodies """ @staticmethod - def create_http_client_response_body_size(meter: Meter) -> Histogram: - return meter.create_histogram( name="http.client.response.body.size", description="Size of HTTP client response bodies.", @@ -70,9 +64,7 @@ def create_http_client_response_body_size(meter: Meter) -> Histogram: Number of active HTTP server requests """ @staticmethod - def create_http_server_active_requests(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="http.server.active_requests", description="Number of active HTTP server requests.", @@ -84,9 +76,7 @@ def create_http_server_active_requests(meter: Meter) -> UpDownCounter: Size of HTTP server request bodies """ @staticmethod - def create_http_server_request_body_size(meter: Meter) -> Histogram: - return meter.create_histogram( name="http.server.request.body.size", description="Size of HTTP server request bodies.", @@ -98,9 +88,7 @@ def create_http_server_request_body_size(meter: Meter) -> Histogram: Duration of HTTP server requests """ @staticmethod - def create_http_server_request_duration(meter: Meter) -> Histogram: - return meter.create_histogram( name="http.server.request.duration", description="Duration of HTTP server requests.", @@ -112,9 +100,7 @@ def create_http_server_request_duration(meter: Meter) -> Histogram: Size of HTTP server response bodies """ @staticmethod - def create_http_server_response_body_size(meter: Meter) -> Histogram: - return meter.create_histogram( name="http.server.response.body.size", description="Size of HTTP server response bodies.", diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/jvm_metrics.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/jvm_metrics.py index f32147c286c..798b4b19a7d 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/jvm_metrics.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/jvm_metrics.py @@ -28,9 +28,7 @@ class JvmMetrics: Number of buffers in the pool """ @staticmethod - def create_jvm_buffer_count(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="jvm.buffer.count", description="Number of buffers in the pool.", @@ -42,9 +40,7 @@ def create_jvm_buffer_count(meter: Meter) -> UpDownCounter: Measure of total memory capacity of buffers """ @staticmethod - def create_jvm_buffer_memory_limit(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="jvm.buffer.memory.limit", description="Measure of total memory capacity of buffers.", @@ -56,9 +52,7 @@ def create_jvm_buffer_memory_limit(meter: Meter) -> UpDownCounter: Measure of memory used by buffers """ @staticmethod - def create_jvm_buffer_memory_usage(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="jvm.buffer.memory.usage", description="Measure of memory used by buffers.", @@ -70,9 +64,7 @@ def create_jvm_buffer_memory_usage(meter: Meter) -> UpDownCounter: Number of classes currently loaded """ @staticmethod - def create_jvm_class_count(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="jvm.class.count", description="Number of classes currently loaded.", @@ -84,9 +76,7 @@ def create_jvm_class_count(meter: Meter) -> UpDownCounter: Number of classes loaded since JVM start """ @staticmethod - def create_jvm_class_loaded(meter: Meter) -> Counter: - return meter.create_counter( name="jvm.class.loaded", description="Number of classes loaded since JVM start.", @@ -98,9 +88,7 @@ def create_jvm_class_loaded(meter: Meter) -> Counter: Number of classes unloaded since JVM start """ @staticmethod - def create_jvm_class_unloaded(meter: Meter) -> Counter: - return meter.create_counter( name="jvm.class.unloaded", description="Number of classes unloaded since JVM start.", @@ -112,9 +100,7 @@ def create_jvm_class_unloaded(meter: Meter) -> Counter: Number of processors available to the Java virtual machine """ @staticmethod - def create_jvm_cpu_count(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="jvm.cpu.count", description="Number of processors available to the Java virtual machine.", @@ -126,9 +112,7 @@ def create_jvm_cpu_count(meter: Meter) -> UpDownCounter: Recent CPU utilization for the process as reported by the JVM """ @staticmethod - def create_jvm_cpu_recent_utilization(meter: Meter, callback: Sequence[Callable]) -> ObservableGauge: - return meter.create_observable_gauge( name="jvm.cpu.recent_utilization", callback=callback, @@ -141,9 +125,7 @@ def create_jvm_cpu_recent_utilization(meter: Meter, callback: Sequence[Callable] CPU time used by the process as reported by the JVM """ @staticmethod - def create_jvm_cpu_time(meter: Meter) -> Counter: - return meter.create_counter( name="jvm.cpu.time", description="CPU time used by the process as reported by the JVM.", @@ -155,9 +137,7 @@ def create_jvm_cpu_time(meter: Meter) -> Counter: Duration of JVM garbage collection actions """ @staticmethod - def create_jvm_gc_duration(meter: Meter) -> Histogram: - return meter.create_histogram( name="jvm.gc.duration", description="Duration of JVM garbage collection actions.", @@ -169,9 +149,7 @@ def create_jvm_gc_duration(meter: Meter) -> Histogram: Measure of memory committed """ @staticmethod - def create_jvm_memory_committed(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="jvm.memory.committed", description="Measure of memory committed.", @@ -183,9 +161,7 @@ def create_jvm_memory_committed(meter: Meter) -> UpDownCounter: Measure of initial memory requested """ @staticmethod - def create_jvm_memory_init(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="jvm.memory.init", description="Measure of initial memory requested.", @@ -197,9 +173,7 @@ def create_jvm_memory_init(meter: Meter) -> UpDownCounter: Measure of max obtainable memory """ @staticmethod - def create_jvm_memory_limit(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="jvm.memory.limit", description="Measure of max obtainable memory.", @@ -211,9 +185,7 @@ def create_jvm_memory_limit(meter: Meter) -> UpDownCounter: Measure of memory used """ @staticmethod - def create_jvm_memory_usage(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="jvm.memory.usage", description="Measure of memory used.", @@ -225,9 +197,7 @@ def create_jvm_memory_usage(meter: Meter) -> UpDownCounter: Measure of memory used, as measured after the most recent garbage collection event on this pool """ @staticmethod - def create_jvm_memory_usage_after_last_gc(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="jvm.memory.usage_after_last_gc", description="Measure of memory used, as measured after the most recent garbage collection event on this pool.", @@ -239,9 +209,7 @@ def create_jvm_memory_usage_after_last_gc(meter: Meter) -> UpDownCounter: Average CPU load of the whole system for the last minute as reported by the JVM """ @staticmethod - def create_jvm_system_cpu_load_1m(meter: Meter, callback: Sequence[Callable]) -> ObservableGauge: - return meter.create_observable_gauge( name="jvm.system.cpu.load_1m", callback=callback, @@ -254,9 +222,7 @@ def create_jvm_system_cpu_load_1m(meter: Meter, callback: Sequence[Callable]) -> Recent CPU utilization for the whole system as reported by the JVM """ @staticmethod - def create_jvm_system_cpu_utilization(meter: Meter, callback: Sequence[Callable]) -> ObservableGauge: - return meter.create_observable_gauge( name="jvm.system.cpu.utilization", callback=callback, @@ -269,9 +235,7 @@ def create_jvm_system_cpu_utilization(meter: Meter, callback: Sequence[Callable] Number of executing platform threads """ @staticmethod - def create_jvm_thread_count(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="jvm.thread.count", description="Number of executing platform threads.", diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/rpc_attributes.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/rpc_attributes.py index 0a9c79cf2b7..76301db6729 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/rpc_attributes.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/rpc_attributes.py @@ -25,7 +25,6 @@ RPC_CONNECT_RPC_REQUEST_METADATA_TEMPLATE = "rpc.connect_rpc.request.metadata" - """ Connect request metadata, `` being the normalized Connect Metadata key (lowercase), the value being the metadata values. Note: Instrumentations SHOULD require an explicit configuration of which metadata values are to be captured. Including all request metadata values can be a security risk - explicit configuration helps avoid leaking sensitive information. @@ -33,7 +32,6 @@ RPC_CONNECT_RPC_RESPONSE_METADATA_TEMPLATE = "rpc.connect_rpc.response.metadata" - """ Connect response metadata, `` being the normalized Connect Metadata key (lowercase), the value being the metadata values. Note: Instrumentations SHOULD require an explicit configuration of which metadata values are to be captured. Including all response metadata values can be a security risk - explicit configuration helps avoid leaking sensitive information. @@ -41,7 +39,6 @@ RPC_GRPC_REQUEST_METADATA_TEMPLATE = "rpc.grpc.request.metadata" - """ gRPC request metadata, `` being the normalized gRPC Metadata key (lowercase), the value being the metadata values. Note: Instrumentations SHOULD require an explicit configuration of which metadata values are to be captured. Including all request metadata values can be a security risk - explicit configuration helps avoid leaking sensitive information. @@ -49,7 +46,6 @@ RPC_GRPC_RESPONSE_METADATA_TEMPLATE = "rpc.grpc.response.metadata" - """ gRPC response metadata, `` being the normalized gRPC Metadata key (lowercase), the value being the metadata values. Note: Instrumentations SHOULD require an explicit configuration of which metadata values are to be captured. Including all response metadata values can be a security risk - explicit configuration helps avoid leaking sensitive information. diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/rpc_metrics.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/rpc_metrics.py index 92689cf9de8..c9c21f79493 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/rpc_metrics.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/rpc_metrics.py @@ -28,9 +28,7 @@ class RpcMetrics: Measures the duration of outbound RPC """ @staticmethod - def create_rpc_client_duration(meter: Meter) -> Histogram: - return meter.create_histogram( name="rpc.client.duration", description="Measures the duration of outbound RPC.", @@ -42,9 +40,7 @@ def create_rpc_client_duration(meter: Meter) -> Histogram: Measures the size of RPC request messages (uncompressed) """ @staticmethod - def create_rpc_client_request_size(meter: Meter) -> Histogram: - return meter.create_histogram( name="rpc.client.request.size", description="Measures the size of RPC request messages (uncompressed).", @@ -56,9 +52,7 @@ def create_rpc_client_request_size(meter: Meter) -> Histogram: Measures the number of messages received per RPC """ @staticmethod - def create_rpc_client_requests_per_rpc(meter: Meter) -> Histogram: - return meter.create_histogram( name="rpc.client.requests_per_rpc", description="Measures the number of messages received per RPC.", @@ -70,9 +64,7 @@ def create_rpc_client_requests_per_rpc(meter: Meter) -> Histogram: Measures the size of RPC response messages (uncompressed) """ @staticmethod - def create_rpc_client_response_size(meter: Meter) -> Histogram: - return meter.create_histogram( name="rpc.client.response.size", description="Measures the size of RPC response messages (uncompressed).", @@ -84,9 +76,7 @@ def create_rpc_client_response_size(meter: Meter) -> Histogram: Measures the number of messages sent per RPC """ @staticmethod - def create_rpc_client_responses_per_rpc(meter: Meter) -> Histogram: - return meter.create_histogram( name="rpc.client.responses_per_rpc", description="Measures the number of messages sent per RPC.", @@ -98,9 +88,7 @@ def create_rpc_client_responses_per_rpc(meter: Meter) -> Histogram: Measures the duration of inbound RPC """ @staticmethod - def create_rpc_server_duration(meter: Meter) -> Histogram: - return meter.create_histogram( name="rpc.server.duration", description="Measures the duration of inbound RPC.", @@ -112,9 +100,7 @@ def create_rpc_server_duration(meter: Meter) -> Histogram: Measures the size of RPC request messages (uncompressed) """ @staticmethod - def create_rpc_server_request_size(meter: Meter) -> Histogram: - return meter.create_histogram( name="rpc.server.request.size", description="Measures the size of RPC request messages (uncompressed).", @@ -126,9 +112,7 @@ def create_rpc_server_request_size(meter: Meter) -> Histogram: Measures the number of messages received per RPC """ @staticmethod - def create_rpc_server_requests_per_rpc(meter: Meter) -> Histogram: - return meter.create_histogram( name="rpc.server.requests_per_rpc", description="Measures the number of messages received per RPC.", @@ -140,9 +124,7 @@ def create_rpc_server_requests_per_rpc(meter: Meter) -> Histogram: Measures the size of RPC response messages (uncompressed) """ @staticmethod - def create_rpc_server_response_size(meter: Meter) -> Histogram: - return meter.create_histogram( name="rpc.server.response.size", description="Measures the size of RPC response messages (uncompressed).", @@ -154,9 +136,7 @@ def create_rpc_server_response_size(meter: Meter) -> Histogram: Measures the number of messages sent per RPC """ @staticmethod - def create_rpc_server_responses_per_rpc(meter: Meter) -> Histogram: - return meter.create_histogram( name="rpc.server.responses_per_rpc", description="Measures the number of messages sent per RPC.", diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/system_metrics.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/system_metrics.py index fe76274e089..88411f9b651 100644 --- a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/system_metrics.py +++ b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/v1_23_1/system_metrics.py @@ -28,9 +28,7 @@ class SystemMetrics: Reports the current frequency of the CPU in Hz """ @staticmethod - def create_system_cpu_frequency(meter: Meter, callback: Sequence[Callable]) -> ObservableGauge: - return meter.create_observable_gauge( name="system.cpu.frequency", callback=callback, @@ -43,9 +41,7 @@ def create_system_cpu_frequency(meter: Meter, callback: Sequence[Callable]) -> O Reports the number of logical (virtual) processor cores created by the operating system to manage multitasking """ @staticmethod - def create_system_cpu_logical_count(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="system.cpu.logical.count", description="Reports the number of logical (virtual) processor cores created by the operating system to manage multitasking", @@ -57,9 +53,7 @@ def create_system_cpu_logical_count(meter: Meter) -> UpDownCounter: Reports the number of actual physical processor cores on the hardware """ @staticmethod - def create_system_cpu_physical_count(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="system.cpu.physical.count", description="Reports the number of actual physical processor cores on the hardware", @@ -71,9 +65,7 @@ def create_system_cpu_physical_count(meter: Meter) -> UpDownCounter: Seconds each logical CPU spent on each mode """ @staticmethod - def create_system_cpu_time(meter: Meter) -> Counter: - return meter.create_counter( name="system.cpu.time", description="Seconds each logical CPU spent on each mode", @@ -85,9 +77,7 @@ def create_system_cpu_time(meter: Meter) -> Counter: Difference in system.cpu.time since the last measurement, divided by the elapsed time and number of logical CPUs """ @staticmethod - def create_system_cpu_utilization(meter: Meter, callback: Sequence[Callable]) -> ObservableGauge: - return meter.create_observable_gauge( name="system.cpu.utilization", callback=callback, @@ -100,9 +90,7 @@ def create_system_cpu_utilization(meter: Meter, callback: Sequence[Callable]) -> """ @staticmethod - def create_system_disk_io(meter: Meter) -> Counter: - return meter.create_counter( name="system.disk.io", description="", @@ -114,9 +102,7 @@ def create_system_disk_io(meter: Meter) -> Counter: Time disk spent activated """ @staticmethod - def create_system_disk_io_time(meter: Meter) -> Counter: - return meter.create_counter( name="system.disk.io_time", description="Time disk spent activated", @@ -128,9 +114,7 @@ def create_system_disk_io_time(meter: Meter) -> Counter: """ @staticmethod - def create_system_disk_merged(meter: Meter) -> Counter: - return meter.create_counter( name="system.disk.merged", description="", @@ -142,9 +126,7 @@ def create_system_disk_merged(meter: Meter) -> Counter: Sum of the time each operation took to complete """ @staticmethod - def create_system_disk_operation_time(meter: Meter) -> Counter: - return meter.create_counter( name="system.disk.operation_time", description="Sum of the time each operation took to complete", @@ -156,9 +138,7 @@ def create_system_disk_operation_time(meter: Meter) -> Counter: """ @staticmethod - def create_system_disk_operations(meter: Meter) -> Counter: - return meter.create_counter( name="system.disk.operations", description="", @@ -170,9 +150,7 @@ def create_system_disk_operations(meter: Meter) -> Counter: """ @staticmethod - def create_system_filesystem_usage(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="system.filesystem.usage", description="", @@ -184,9 +162,7 @@ def create_system_filesystem_usage(meter: Meter) -> UpDownCounter: """ @staticmethod - def create_system_filesystem_utilization(meter: Meter, callback: Sequence[Callable]) -> ObservableGauge: - return meter.create_observable_gauge( name="system.filesystem.utilization", callback=callback, @@ -199,9 +175,7 @@ def create_system_filesystem_utilization(meter: Meter, callback: Sequence[Callab An estimate of how much memory is available for starting new applications, without causing swapping """ @staticmethod - def create_system_linux_memory_available(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="system.linux.memory.available", description="An estimate of how much memory is available for starting new applications, without causing swapping", @@ -213,9 +187,7 @@ def create_system_linux_memory_available(meter: Meter) -> UpDownCounter: Total memory available in the system """ @staticmethod - def create_system_memory_limit(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="system.memory.limit", description="Total memory available in the system.", @@ -227,9 +199,7 @@ def create_system_memory_limit(meter: Meter) -> UpDownCounter: Reports memory in use by state """ @staticmethod - def create_system_memory_usage(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="system.memory.usage", description="Reports memory in use by state.", @@ -241,9 +211,7 @@ def create_system_memory_usage(meter: Meter) -> UpDownCounter: """ @staticmethod - def create_system_memory_utilization(meter: Meter, callback: Sequence[Callable]) -> ObservableGauge: - return meter.create_observable_gauge( name="system.memory.utilization", callback=callback, @@ -256,9 +224,7 @@ def create_system_memory_utilization(meter: Meter, callback: Sequence[Callable]) """ @staticmethod - def create_system_network_connections(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="system.network.connections", description="", @@ -270,9 +236,7 @@ def create_system_network_connections(meter: Meter) -> UpDownCounter: Count of packets that are dropped or discarded even though there was no error """ @staticmethod - def create_system_network_dropped(meter: Meter) -> Counter: - return meter.create_counter( name="system.network.dropped", description="Count of packets that are dropped or discarded even though there was no error", @@ -284,9 +248,7 @@ def create_system_network_dropped(meter: Meter) -> Counter: Count of network errors detected """ @staticmethod - def create_system_network_errors(meter: Meter) -> Counter: - return meter.create_counter( name="system.network.errors", description="Count of network errors detected", @@ -298,9 +260,7 @@ def create_system_network_errors(meter: Meter) -> Counter: """ @staticmethod - def create_system_network_io(meter: Meter) -> Counter: - return meter.create_counter( name="system.network.io", description="", @@ -312,9 +272,7 @@ def create_system_network_io(meter: Meter) -> Counter: """ @staticmethod - def create_system_network_packets(meter: Meter) -> Counter: - return meter.create_counter( name="system.network.packets", description="", @@ -326,9 +284,7 @@ def create_system_network_packets(meter: Meter) -> Counter: """ @staticmethod - def create_system_paging_faults(meter: Meter) -> Counter: - return meter.create_counter( name="system.paging.faults", description="", @@ -340,9 +296,7 @@ def create_system_paging_faults(meter: Meter) -> Counter: """ @staticmethod - def create_system_paging_operations(meter: Meter) -> Counter: - return meter.create_counter( name="system.paging.operations", description="", @@ -354,9 +308,7 @@ def create_system_paging_operations(meter: Meter) -> Counter: Unix swap or windows pagefile usage """ @staticmethod - def create_system_paging_usage(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="system.paging.usage", description="Unix swap or windows pagefile usage", @@ -368,9 +320,7 @@ def create_system_paging_usage(meter: Meter) -> UpDownCounter: """ @staticmethod - def create_system_paging_utilization(meter: Meter, callback: Sequence[Callable]) -> ObservableGauge: - return meter.create_observable_gauge( name="system.paging.utilization", callback=callback, @@ -383,9 +333,7 @@ def create_system_paging_utilization(meter: Meter, callback: Sequence[Callable]) Total number of processes in each state """ @staticmethod - def create_system_processes_count(meter: Meter) -> UpDownCounter: - return meter.create_up_down_counter( name="system.processes.count", description="Total number of processes in each state", @@ -397,9 +345,7 @@ def create_system_processes_count(meter: Meter) -> UpDownCounter: Total number of processes created over uptime of the host """ @staticmethod - def create_system_processes_created(meter: Meter) -> Counter: - return meter.create_counter( name="system.processes.created", description="Total number of processes created over uptime of the host", diff --git a/scripts/semconv/templates/semantic_attributes.j2 b/scripts/semconv/templates/semantic_attributes.j2 index 6a9955973ed..80e55d5703a 100644 --- a/scripts/semconv/templates/semantic_attributes.j2 +++ b/scripts/semconv/templates/semantic_attributes.j2 @@ -30,7 +30,7 @@ from enum import Enum {% if attribute | is_template %} {{attribute.fqn | to_const_name}}_TEMPLATE = "{{attribute.fqn}}" -{% else %} +{%- else %} {{attribute.fqn | to_const_name}} = "{{attribute.fqn}}" {%- endif %} """ diff --git a/scripts/semconv/templates/semantic_metrics.j2 b/scripts/semconv/templates/semantic_metrics.j2 index 217c54b6392..96f549ca020 100644 --- a/scripts/semconv/templates/semantic_metrics.j2 +++ b/scripts/semconv/templates/semantic_metrics.j2 @@ -52,11 +52,11 @@ class {{ root_namespace | to_camelcase(True) }}Metrics: {{metric.brief | to_doc_brief}} """ @staticmethod - {% if metric.instrument == "gauge" %} + {%- if metric.instrument == "gauge" %} def create_{{ metric.metric_name | replace(".", "_") }}(meter: Meter, callback: Sequence[Callable]) -> {{to_python_instrument_type(metric.instrument)}}: - {% else %} + {%- else %} def create_{{ metric.metric_name | replace(".", "_") }}(meter: Meter) -> {{to_python_instrument_type(metric.instrument)}}: - {% endif %} + {%- endif %} return meter.create_{{to_python_instrument_factory(metric.instrument)}}( name="{{ metric.metric_name }}", {%- if metric.instrument == "gauge" %}