From a69feca6ff65c99fc7a7d131d57714948d5a55fd Mon Sep 17 00:00:00 2001 From: ankitchoudhary111 <35135474+ankitchoudhary111@users.noreply.github.com> Date: Mon, 27 Sep 2021 20:56:08 +0530 Subject: [PATCH] config for attributes (#62) * added config for attributes * snyk-scan fix * fix * fixed indentation issues * resolved comments * Update config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_span_attributes.conf Co-authored-by: SJ <48863181+skjindal93@users.noreply.github.com> * Update config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_span_attributes.conf Co-authored-by: SJ <48863181+skjindal93@users.noreply.github.com> * Update config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_span_attributes.conf Co-authored-by: SJ <48863181+skjindal93@users.noreply.github.com> * Update config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_span_attributes.conf Co-authored-by: SJ <48863181+skjindal93@users.noreply.github.com> * Update config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_span_attributes.conf Co-authored-by: SJ <48863181+skjindal93@users.noreply.github.com> * added internal = false for attributes wherever missing Co-authored-by: Ankit Choudhary Co-authored-by: SJ <48863181+skjindal93@users.noreply.github.com> Co-authored-by: Ankit Choudhary --- config-bootstrapper/build.gradle.kts | 4 +- .../hypertrace_core_event_attributes.conf | 32 ++- .../hypertrace_core_trace_attributes.conf | 30 ++- .../hypertrace/hypertrace_api_attributes.conf | 51 +++-- .../hypertrace_api_trace_attributes.conf | 75 ++++--- .../hypertrace_backend_attributes.conf | 36 ++-- .../hypertrace_backend_trace_attributes.conf | 60 ++++-- .../hypertrace_interaction_attributes.conf | 63 ++++-- .../hypertrace_log_event_attributes.conf | 15 +- .../hypertrace_service_attributes.conf | 32 ++- .../hypertrace_span_attributes.conf | 191 +++++++++++++++++- 11 files changed, 446 insertions(+), 143 deletions(-) diff --git a/config-bootstrapper/build.gradle.kts b/config-bootstrapper/build.gradle.kts index cfc244d..d5c8151 100644 --- a/config-bootstrapper/build.gradle.kts +++ b/config-bootstrapper/build.gradle.kts @@ -153,9 +153,9 @@ dependencies { implementation("commons-codec:commons-codec:1.15") { because("https://snyk.io/vuln/SNYK-JAVA-COMMONSCODEC-561518") } - runtimeOnly("io.netty:netty-codec-http2:4.1.61.Final") { + runtimeOnly("io.netty:netty-codec-http2:4.1.68.Final") { } - runtimeOnly("io.netty:netty-handler-proxy:4.1.61.Final") { + runtimeOnly("io.netty:netty-handler-proxy:4.1.68.Final") { because("https://snyk.io/vuln/SNYK-JAVA-IONETTY-1083991") } } diff --git a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace-core/hypertrace_core_event_attributes.conf b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace-core/hypertrace_core_event_attributes.conf index 334aabe..c087c33 100644 --- a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace-core/hypertrace_core_event_attributes.conf +++ b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace-core/hypertrace_core_event_attributes.conf @@ -16,7 +16,8 @@ commands = [ display_name: Span ID, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Service.name, @@ -26,7 +27,8 @@ commands = [ display_name: Service Name, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Span.start_time_millis, @@ -36,6 +38,7 @@ commands = [ scope: EVENT, sources: [QS], type: ATTRIBUTE, + internal: false, definition: { source_field: SOURCE_FIELD_START_TIME } @@ -48,6 +51,7 @@ commands = [ scope: EVENT, sources: [QS], type: ATTRIBUTE, + internal: false, definition: { source_field: SOURCE_FIELD_END_TIME } @@ -60,7 +64,8 @@ commands = [ display_name: Span Type, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Span.attributes.trace_id, @@ -70,7 +75,8 @@ commands = [ display_name: Trace ID, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Span.metrics.duration_millis, @@ -80,7 +86,8 @@ commands = [ unit: ms, scope: EVENT, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Span.attributes.parent_span_id, @@ -90,7 +97,8 @@ commands = [ display_name: Parent Span ID, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Span.attributes.tags, @@ -99,7 +107,8 @@ commands = [ display_name: Tags, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Span.attributes.status_code, @@ -109,7 +118,8 @@ commands = [ display_name: Status Code, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Span.display_span_name, @@ -119,7 +129,8 @@ commands = [ display_name: Span Name, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Span.space_ids, @@ -128,7 +139,8 @@ commands = [ display_name: Space IDs, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false } ] } diff --git a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace-core/hypertrace_core_trace_attributes.conf b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace-core/hypertrace_core_trace_attributes.conf index 4e40610..558fdbd 100644 --- a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace-core/hypertrace_core_trace_attributes.conf +++ b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace-core/hypertrace_core_trace_attributes.conf @@ -16,7 +16,8 @@ commands = [ display_name: Trace ID, scope: TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Trace.name, @@ -26,7 +27,8 @@ commands = [ display_name: Transaction Name, scope: TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Trace.start_time_millis, @@ -35,7 +37,8 @@ commands = [ display_name: Start Time, scope: TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Trace.end_time_millis, @@ -44,7 +47,8 @@ commands = [ display_name: End Time, scope: TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Trace.attributes.transaction_name, @@ -54,7 +58,8 @@ commands = [ display_name: Transaction Name, scope: TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Trace.attributes.services, @@ -64,7 +69,8 @@ commands = [ display_name: Services, scope: TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Trace.metrics.duration_millis, @@ -74,7 +80,8 @@ commands = [ unit: ms, scope: TRACE, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Trace.metrics.num_services, @@ -84,7 +91,8 @@ commands = [ unit: Services scope: TRACE, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Trace.metrics.num_spans, @@ -94,7 +102,8 @@ commands = [ unit: Spans, scope: TRACE, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Trace.space_ids, @@ -103,7 +112,8 @@ commands = [ display_name: Space IDs, scope: TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false } ] } diff --git a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_api_attributes.conf b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_api_attributes.conf index f49ecd1..3cdf0a5 100644 --- a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_api_attributes.conf +++ b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_api_attributes.conf @@ -26,7 +26,8 @@ commands = [ display_name: Endpoint ID, scope: API, type: ATTRIBUTE, - sources: [QS, EDS] + sources: [QS, EDS], + internal: false }, { fqn: API.name, @@ -36,7 +37,8 @@ commands = [ display_name: Endpoint Name, scope: API, sources: [QS, EDS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: API.apiType, @@ -46,7 +48,8 @@ commands = [ display_name: Endpoint Type, scope: API, type: ATTRIBUTE, - sources: [EDS] + sources: [EDS], + internal: false }, { fqn: API.apiDiscoveryState, @@ -56,7 +59,8 @@ commands = [ display_name: Endpoint Discovery State, scope: API, type: ATTRIBUTE, - sources: [QS, EDS] + sources: [QS, EDS], + internal: false }, { fqn: API.is_external, @@ -65,7 +69,8 @@ commands = [ display_name: Is Endpoint External, scope: API, sources: [QS, EDS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: API.start_time_millis, @@ -74,7 +79,8 @@ commands = [ display_name: Start Time, scope: API, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: API.end_time_millis, @@ -83,7 +89,8 @@ commands = [ display_name: End Time, scope: API, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Service.name, @@ -93,7 +100,8 @@ commands = [ display_name: Service Name, scope: API, sources: [QS, EDS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Service.id, @@ -103,7 +111,8 @@ commands = [ display_name: Service ID, scope: API, sources: [QS, EDS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: API.attributes.namespace, @@ -113,7 +122,8 @@ commands = [ display_name: Namespace, scope: API, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: API.attributes.cluster, @@ -123,7 +133,8 @@ commands = [ display_name: Cluster, scope: API, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: API.metrics.duration_millis, @@ -134,7 +145,8 @@ commands = [ scope: API, sources: [QS], type: METRIC, - labels: [] + labels: [], + internal: false }, { fqn: API.metrics.error_count, @@ -143,7 +155,8 @@ commands = [ display_name: Error Count, scope: API, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: API.metrics.exception_count, @@ -152,7 +165,8 @@ commands = [ display_name: Exception Count, scope: API, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: API.metrics.num_calls, @@ -161,7 +175,8 @@ commands = [ display_name: Call Count, scope: API, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: API.http.method, @@ -171,7 +186,8 @@ commands = [ groupable: false, display_name: HTTP Method, type: ATTRIBUTE, - sources: [EDS] + sources: [EDS], + internal: false }, { fqn: API.http.url, @@ -181,7 +197,8 @@ commands = [ groupable: false, display_name: URL, type: ATTRIBUTE, - sources: [EDS] + sources: [EDS], + internal: false }, ] } diff --git a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_api_trace_attributes.conf b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_api_trace_attributes.conf index 2976a66..91274bc 100644 --- a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_api_trace_attributes.conf +++ b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_api_trace_attributes.conf @@ -16,7 +16,8 @@ commands = [ display_name: Endpoint Trace ID, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.traceId, @@ -26,7 +27,8 @@ commands = [ display_name: Trace ID, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.start_time_millis, @@ -35,7 +37,8 @@ commands = [ display_name: Start Time, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.end_time_millis, @@ -44,7 +47,8 @@ commands = [ display_name: End Time, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Service.name, @@ -54,7 +58,8 @@ commands = [ display_name: Service Name, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Service.id, @@ -64,7 +69,8 @@ commands = [ display_name: Service ID, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: API.name, @@ -74,7 +80,8 @@ commands = [ display_name: Endpoint Name, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: API.id, @@ -84,7 +91,8 @@ commands = [ display_name: Endpoint ID, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: API.apiDiscoveryState, @@ -94,7 +102,8 @@ commands = [ display_name: Endpoint Discovery State, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.metrics.duration_millis, @@ -104,7 +113,8 @@ commands = [ unit: ms, scope: API_TRACE, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Api.Trace.attributes.protocol, @@ -114,7 +124,8 @@ commands = [ display_name: Protocol, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.attributes.status_code, @@ -124,7 +135,8 @@ commands = [ display_name: Status Code, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.api_boundary_type, @@ -134,7 +146,8 @@ commands = [ display_name: Endpoint Boundary Type, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.user_agent, @@ -144,7 +157,8 @@ commands = [ display_name: User Agent, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.tags, @@ -153,7 +167,8 @@ commands = [ display_name: Tags, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.status, @@ -162,7 +177,8 @@ commands = [ display_name: Status, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.status_message, @@ -172,7 +188,8 @@ commands = [ display_name: Status Message, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.calls, @@ -183,7 +200,8 @@ commands = [ sources: [QS], onlyAggregationsAllowed: true, supportedAggregations: [COUNT, AVGRATE] - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.request_method, @@ -193,7 +211,8 @@ commands = [ display_name: HTTP Method, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.request_url, @@ -203,7 +222,8 @@ commands = [ display_name: URL, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.error_count, @@ -213,7 +233,8 @@ commands = [ unit: Errors, scope: API_TRACE, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Api.Trace.space_ids, @@ -222,7 +243,8 @@ commands = [ display_name: Space IDs, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.api_exit_calls, @@ -231,7 +253,8 @@ commands = [ display_name: Api Exit Calls, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.api_callee_name_count, @@ -240,7 +263,8 @@ commands = [ display_name: Api Callee Name Count, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Api.Trace.api_trace_error_span_count, @@ -249,7 +273,8 @@ commands = [ display_name: Api Trace Error Span Count, scope: API_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false } ] } diff --git a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_backend_attributes.conf b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_backend_attributes.conf index 09c5fe3..b4897a3 100644 --- a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_backend_attributes.conf +++ b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_backend_attributes.conf @@ -26,7 +26,8 @@ commands = [ display_name: Backend ID, scope: BACKEND, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.start_time_millis, @@ -35,7 +36,8 @@ commands = [ display_name: Start Time, scope: BACKEND, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.end_time_millis, @@ -44,7 +46,8 @@ commands = [ display_name: End Time, scope: BACKEND, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.duration_millis, @@ -54,7 +57,8 @@ commands = [ unit: ms, scope: BACKEND, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Backend.type, @@ -64,7 +68,8 @@ commands = [ display_name: Backend Type, scope: BACKEND, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.host, @@ -74,7 +79,8 @@ commands = [ display_name: Backend Host, scope: BACKEND, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.port, @@ -84,7 +90,8 @@ commands = [ display_name: Backend Port, scope: BACKEND, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.path, @@ -94,7 +101,8 @@ commands = [ display_name: Backend Path, scope: BACKEND, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.name, @@ -104,7 +112,8 @@ commands = [ display_name: Backend Name, scope: BACKEND, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false } { fqn: Backend.metrics.error_count, @@ -113,7 +122,8 @@ commands = [ display_name: Error Count, scope: BACKEND, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Backend.metrics.exception_count, @@ -122,7 +132,8 @@ commands = [ display_name: Exception Count, scope: BACKEND, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Backend.metrics.num_calls, @@ -131,7 +142,8 @@ commands = [ display_name: Call Count, scope: BACKEND, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, ] } diff --git a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_backend_trace_attributes.conf b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_backend_trace_attributes.conf index a13fd67..9e90183 100644 --- a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_backend_trace_attributes.conf +++ b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_backend_trace_attributes.conf @@ -16,7 +16,8 @@ commands = [ display_name: Backend Trace ID, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.trace_id, @@ -26,7 +27,8 @@ commands = [ display_name: Trace ID, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.caller_service_id, @@ -36,7 +38,8 @@ commands = [ display_name: Caller Service ID, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.caller_api_id, @@ -46,7 +49,8 @@ commands = [ display_name: Caller Endpoint ID, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.id, @@ -56,7 +60,8 @@ commands = [ display_name: Backend ID, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.display_name, @@ -66,7 +71,8 @@ commands = [ display_name: Backend Name, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.operation, @@ -76,7 +82,8 @@ commands = [ display_name: Operation, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.host, @@ -86,7 +93,8 @@ commands = [ display_name: Backend Host, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.port, @@ -96,7 +104,8 @@ commands = [ display_name: Backend Port, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.type, @@ -106,7 +115,8 @@ commands = [ display_name: Backend Type, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.path, @@ -116,7 +126,8 @@ commands = [ display_name: Backend Path, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.start_time_millis, @@ -125,7 +136,8 @@ commands = [ display_name: Start Time, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.end_time_millis, @@ -134,7 +146,8 @@ commands = [ display_name: End Time, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { @@ -145,7 +158,8 @@ commands = [ unit: ms, scope: BACKEND_TRACE, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Backend.Trace.status_code, @@ -155,7 +169,8 @@ commands = [ display_name: Status Code, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.status, @@ -165,7 +180,8 @@ commands = [ display_name: Status, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.status_message, @@ -175,7 +191,8 @@ commands = [ display_name: Status Message, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.tags, @@ -184,7 +201,8 @@ commands = [ display_name: Tags, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.destination, @@ -194,7 +212,8 @@ commands = [ display_name: Destination, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Backend.Trace.space_ids, @@ -203,7 +222,8 @@ commands = [ display_name: Space IDs, scope: BACKEND_TRACE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false } ] } diff --git a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_interaction_attributes.conf b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_interaction_attributes.conf index 584c094..aa387f4 100644 --- a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_interaction_attributes.conf +++ b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_interaction_attributes.conf @@ -16,7 +16,8 @@ commands = [ unit: ms, scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.end_time_millis, @@ -26,7 +27,8 @@ commands = [ unit: ms, scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.from_entity_type, @@ -36,7 +38,8 @@ commands = [ display_name: Caller Type, scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.to_entity_type, @@ -46,7 +49,8 @@ commands = [ display_name: Callee Type, scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.from_entity_id, @@ -56,7 +60,8 @@ commands = [ display_name: Caller Entity, scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.to_entity_id, @@ -66,7 +71,8 @@ commands = [ display_name: Callee Entity, scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.metrics.duration_millis, @@ -76,7 +82,8 @@ commands = [ unit: ms, scope: INTERACTION, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Interaction.metrics.num_calls, @@ -85,7 +92,8 @@ commands = [ display_name: Call Count, scope: INTERACTION, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Interaction.attributes.caller_service_id, @@ -96,7 +104,8 @@ commands = [ unit: "", scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.callee_service_id, @@ -107,7 +116,8 @@ commands = [ unit: "", scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.caller_service, @@ -118,7 +128,8 @@ commands = [ unit: "", scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.callee_service, @@ -129,7 +140,8 @@ commands = [ unit: "", scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.caller_api_id, @@ -140,7 +152,8 @@ commands = [ unit: "", scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.callee_api_id, @@ -151,7 +164,8 @@ commands = [ unit: "", scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.caller_api, @@ -162,7 +176,8 @@ commands = [ unit: "", scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.callee_api, @@ -173,7 +188,8 @@ commands = [ unit: "", scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.callee_backend_id, @@ -184,7 +200,8 @@ commands = [ unit: "", scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.callee_backend, @@ -195,7 +212,8 @@ commands = [ unit: "", scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.metrics.error_count, @@ -204,7 +222,8 @@ commands = [ display_name : Error Count, scope : INTERACTION, sources : [QS], - type : METRIC + type : METRIC, + internal: false }, { fqn: Interaction.attributes.fromSpaceIds, @@ -213,7 +232,8 @@ commands = [ display_name: From Space IDs, scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Interaction.attributes.toSpaceIds, @@ -222,7 +242,8 @@ commands = [ display_name: To Space IDs, scope: INTERACTION, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false } ] } diff --git a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_log_event_attributes.conf b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_log_event_attributes.conf index 3bc4bbe..bda7bbb 100644 --- a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_log_event_attributes.conf +++ b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_log_event_attributes.conf @@ -16,7 +16,8 @@ commands = [ display_name: Timestamp, scope_string: LOG_EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: LOG_EVENT.spanId, @@ -25,7 +26,8 @@ commands = [ display_name: Span ID, scope_string: LOG_EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: LOG_EVENT.traceId, @@ -34,7 +36,8 @@ commands = [ display_name: Trace ID, scope_string: LOG_EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: LOG_EVENT.attributes, @@ -43,7 +46,8 @@ commands = [ display_name: Attributes, scope_string: LOG_EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: LOG_EVENT.summary, @@ -52,7 +56,8 @@ commands = [ display_name: Summary, scope_string: LOG_EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false } ] } diff --git a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_service_attributes.conf b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_service_attributes.conf index aad3862..332d25c 100644 --- a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_service_attributes.conf +++ b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_service_attributes.conf @@ -16,7 +16,8 @@ commands = [ display_name: Service ID, scope: SERVICE, sources: [QS, EDS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Service.type, @@ -26,7 +27,8 @@ commands = [ display_name: Service Type, scope: SERVICE, sources: [EDS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Service.name, @@ -36,6 +38,7 @@ commands = [ scope: SERVICE, sources: [QS, EDS], type: ATTRIBUTE, + internal: false, definition: { source_path: SERVICE_NAME } @@ -49,6 +52,7 @@ commands = [ scope: SERVICE, sources: [QS], type: ATTRIBUTE, + internal: false, definition: { source_path: HTTP_HOST } @@ -60,7 +64,8 @@ commands = [ display_name: Start Time, scope: SERVICE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Service.end_time_millis, @@ -69,7 +74,8 @@ commands = [ display_name: End Time, scope: SERVICE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Service.attributes.namespace, @@ -79,7 +85,8 @@ commands = [ display_name: Namespace, scope: SERVICE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Service.attributes.cluster, @@ -89,7 +96,8 @@ commands = [ display_name: Cluster, scope: SERVICE, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Service.metrics.duration_millis, @@ -100,7 +108,8 @@ commands = [ scope: SERVICE, sources: [QS], type: METRIC, - labels: [] + labels: [], + internal: false }, { fqn: Service.metrics.error_count, @@ -109,7 +118,8 @@ commands = [ display_name: Error Count, scope: SERVICE, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Service.metrics.exception_count, @@ -118,7 +128,8 @@ commands = [ display_name: Exception Count, scope: SERVICE, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Service.metrics.num_calls, @@ -127,7 +138,8 @@ commands = [ display_name: Call Count, scope: SERVICE, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, ] } diff --git a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_span_attributes.conf b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_span_attributes.conf index 377d0bc..1d08474 100644 --- a/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_span_attributes.conf +++ b/config-bootstrapper/src/main/resources/configs/config-bootstrapper/attribute-service/hypertrace/hypertrace_span_attributes.conf @@ -26,7 +26,11 @@ commands = [ display_name: Service ID, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false, + definition: { + source_path: SERVICE_ID + } }, { fqn: API.id, @@ -36,7 +40,11 @@ commands = [ display_name: Endpoint ID, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false, + definition: { + source_path: API_ID + } }, { fqn: API.name, @@ -46,7 +54,11 @@ commands = [ display_name: Endpoint Name, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false, + definition: { + source_path: API_NAME + } }, { fqn: Api.Trace.id, @@ -56,7 +68,8 @@ commands = [ display_name: Endpoint Trace ID, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Span.metrics.error_count, @@ -65,7 +78,8 @@ commands = [ display_name: Error Count, scope: EVENT, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Span.metrics.exception_count, @@ -74,7 +88,8 @@ commands = [ display_name: Exception Count, scope: EVENT, sources: [QS], - type: METRIC + type: METRIC, + internal: false }, { fqn: Span.attributes.request_params, @@ -83,7 +98,8 @@ commands = [ display_name: Request Params, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Span.attributes.request_method, @@ -93,7 +109,8 @@ commands = [ display_name: HTTP Method, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Span.attributes.protocol_name, @@ -103,7 +120,11 @@ commands = [ display_name: Protocol, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false, + definition: { + source_path: PROTOCOL + } }, { fqn: Span.display_entity_name, @@ -113,7 +134,8 @@ commands = [ display_name: Entity Name, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, { fqn: Span.attributes.request_url, @@ -123,8 +145,155 @@ commands = [ display_name: URL, scope: EVENT, sources: [QS], - type: ATTRIBUTE + type: ATTRIBUTE, + internal: false }, + { + fqn: Span.attributes.service_name, + key: serviceName, + value_kind: TYPE_STRING, + groupable: true, + display_name: Service Name, + scope: EVENT, + sources: [QS], + internal: true, + type: ATTRIBUTE, + definition: { + source_path: SERVICE_NAME + } + }, + { + fqn: Span.attributes.domain_id, + key: domainId, + value_kind: TYPE_STRING, + groupable: true, + display_name: Domain Id, + scope: EVENT, + sources: [QS], + internal: true, + type: ATTRIBUTE, + definition: { + source_path: DOMAIN_ID + } + }, + { + fqn: Span.attributes.domain_name, + key: domainName, + value_kind: TYPE_STRING, + groupable: true, + display_name: Domain Name, + scope: EVENT, + sources: [QS], + internal: true, + type: ATTRIBUTE, + definition: { + source_path: DOMAIN_NAME + } + }, + { + fqn: Span.attributes.http_method, + key: httpMethod, + value_kind: TYPE_STRING, + groupable: true, + display_name: HTTP Method, + scope: EVENT, + sources: [QS], + internal: true, + type: ATTRIBUTE, + definition: { + first_value_present: { + definitions: [ + { + source_path: http.request.method + }, + { + source_path: http.method + } + ] + } + } + }, + { + fqn: Span.attributes.http_path, + key: httpPath, + value_kind: TYPE_STRING, + groupable: true, + display_name: HTTP Path, + scope: EVENT, + sources: [QS], + internal: true, + type: ATTRIBUTE, + definition: { + first_value_present: { + definitions: [ + { + source_path: http.request.path + }, + { + source_path: http.path + }, + { + source_path: http.target + } + ] + } + } + }, + { + fqn: Span.attributes.http_url, + key: httpUrl, + value_kind: TYPE_STRING, + groupable: true, + display_name: HTTP Url, + scope: EVENT, + sources: [QS], + internal: true, + type: ATTRIBUTE, + definition: { + first_value_present: { + definitions: [ + { + source_path: http.url + }, + { + source_path: http.request.url + }, + { + source_path: url + } + ] + } + } + }, + { + fqn: Span.attributes.api_boundary_type, + key: apiBoundaryType, + value_kind: TYPE_STRING, + groupable: true, + display_name: Endpoint Boundary Type, + scope: EVENT, + sources: [QS], + internal: true, + type: ATTRIBUTE, + definition: { + source_path: API_BOUNDARY_TYPE + } + }, + { + fqn: Span.attributes.api_url_pattern, + key: apiUrlPattern, + value_kind: TYPE_STRING, + groupable: true, + display_name: Endpoint Url Pattern, + scope: EVENT, + sources: [QS], + internal: true, + type: ATTRIBUTE, + definition: { + source_path: API_URL_PATTERN + } + }, + ] } }