Skip to content

Simplify implementation of telementry's events (backport #7280) #7313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
IvanGoncharov wants to merge 1 commit into from
Closed

Simplify implementation of telementry's events (backport #7280) #7313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 85 additions & 18 deletions ...r/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
source: apollo-router/src/configuration/tests.rs
expression: "&schema"
snapshot_kind: text
---
{
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down Expand Up @@ -2311,6 +2312,7 @@ expression: "&schema"
},
"type": "object"
},
<<<<<<< HEAD
"ErrorsForward": {
"additionalProperties": false,
"properties": {
Expand All @@ -2332,6 +2334,9 @@ expression: "&schema"
"type": "object"
},
"EventLevel": {
=======
"EventLevelConfig": {
>>>>>>> e7d8e7bb (Simplify implementation of telementry's events (#7280))
"enum": [
"info",
"warn",
Expand Down Expand Up @@ -2373,6 +2378,40 @@ expression: "&schema"
}
]
},
<<<<<<< HEAD
=======
"Event_for_ConnectorAttributes_and_ConnectorSelector": {
"description": "An event that can be logged as part of a trace. The event has an implicit `type` attribute that matches the name of the event in the yaml and a message that can be used to provide additional information.",
"properties": {
"attributes": {
"$ref": "#/definitions/extendable_attribute_apollo_router::plugins::telemetry::config_new::connector::attributes::ConnectorAttributes_apollo_router::plugins::telemetry::config_new::connector::selectors::ConnectorSelector",
"description": "#/definitions/extendable_attribute_apollo_router::plugins::telemetry::config_new::connector::attributes::ConnectorAttributes_apollo_router::plugins::telemetry::config_new::connector::selectors::ConnectorSelector"
},
"condition": {
"$ref": "#/definitions/Condition_for_ConnectorSelector",
"description": "#/definitions/Condition_for_ConnectorSelector"
},
"level": {
"$ref": "#/definitions/EventLevelConfig",
"description": "#/definitions/EventLevelConfig"
},
"message": {
"description": "The event message.",
"type": "string"
},
"on": {
"$ref": "#/definitions/EventOn",
"description": "#/definitions/EventOn"
}
},
"required": [
"level",
"message",
"on"
],
"type": "object"
},
>>>>>>> e7d8e7bb (Simplify implementation of telementry's events (#7280))
"Event_for_RouterAttributes_and_RouterSelector": {
"description": "An event that can be logged as part of a trace. The event has an implicit `type` attribute that matches the name of the event in the yaml and a message that can be used to provide additional information.",
"properties": {
Expand All @@ -2385,8 +2424,8 @@ expression: "&schema"
"description": "#/definitions/Condition_for_RouterSelector"
},
"level": {
"$ref": "#/definitions/EventLevel",
"description": "#/definitions/EventLevel"
"$ref": "#/definitions/EventLevelConfig",
"description": "#/definitions/EventLevelConfig"
},
"message": {
"description": "The event message.",
Expand Down Expand Up @@ -2416,8 +2455,8 @@ expression: "&schema"
"description": "#/definitions/Condition_for_SubgraphSelector"
},
"level": {
"$ref": "#/definitions/EventLevel",
"description": "#/definitions/EventLevel"
"$ref": "#/definitions/EventLevelConfig",
"description": "#/definitions/EventLevelConfig"
},
"message": {
"description": "The event message.",
Expand Down Expand Up @@ -2447,8 +2486,8 @@ expression: "&schema"
"description": "#/definitions/Condition_for_SupergraphSelector"
},
"level": {
"$ref": "#/definitions/EventLevel",
"description": "#/definitions/EventLevel"
"$ref": "#/definitions/EventLevelConfig",
"description": "#/definitions/EventLevelConfig"
},
"message": {
"description": "The event message.",
Expand Down Expand Up @@ -5449,11 +5488,39 @@ expression: "&schema"
}
]
},
<<<<<<< HEAD
=======
"StandardEventConfig_for_ConnectorSelector": {
"anyOf": [
{
"$ref": "#/definitions/EventLevelConfig",
"description": "#/definitions/EventLevelConfig"
},
{
"properties": {
"condition": {
"$ref": "#/definitions/Condition_for_ConnectorSelector",
"description": "#/definitions/Condition_for_ConnectorSelector"
},
"level": {
"$ref": "#/definitions/EventLevelConfig",
"description": "#/definitions/EventLevelConfig"
}
},
"required": [
"condition",
"level"
],
"type": "object"
}
]
},
>>>>>>> e7d8e7bb (Simplify implementation of telementry's events (#7280))
"StandardEventConfig_for_RouterSelector": {
"anyOf": [
{
"$ref": "#/definitions/EventLevel",
"description": "#/definitions/EventLevel"
"$ref": "#/definitions/EventLevelConfig",
"description": "#/definitions/EventLevelConfig"
},
{
"properties": {
Expand All @@ -5462,8 +5529,8 @@ expression: "&schema"
"description": "#/definitions/Condition_for_RouterSelector"
},
"level": {
"$ref": "#/definitions/EventLevel",
"description": "#/definitions/EventLevel"
"$ref": "#/definitions/EventLevelConfig",
"description": "#/definitions/EventLevelConfig"
}
},
"required": [
Expand All @@ -5477,8 +5544,8 @@ expression: "&schema"
"StandardEventConfig_for_SubgraphSelector": {
"anyOf": [
{
"$ref": "#/definitions/EventLevel",
"description": "#/definitions/EventLevel"
"$ref": "#/definitions/EventLevelConfig",
"description": "#/definitions/EventLevelConfig"
},
{
"properties": {
Expand All @@ -5487,8 +5554,8 @@ expression: "&schema"
"description": "#/definitions/Condition_for_SubgraphSelector"
},
"level": {
"$ref": "#/definitions/EventLevel",
"description": "#/definitions/EventLevel"
"$ref": "#/definitions/EventLevelConfig",
"description": "#/definitions/EventLevelConfig"
}
},
"required": [
Expand All @@ -5502,8 +5569,8 @@ expression: "&schema"
"StandardEventConfig_for_SupergraphSelector": {
"anyOf": [
{
"$ref": "#/definitions/EventLevel",
"description": "#/definitions/EventLevel"
"$ref": "#/definitions/EventLevelConfig",
"description": "#/definitions/EventLevelConfig"
},
{
"properties": {
Expand All @@ -5512,8 +5579,8 @@ expression: "&schema"
"description": "#/definitions/Condition_for_SupergraphSelector"
},
"level": {
"$ref": "#/definitions/EventLevel",
"description": "#/definitions/EventLevel"
"$ref": "#/definitions/EventLevelConfig",
"description": "#/definitions/EventLevelConfig"
}
},
"required": [
Expand Down
Loading