Skip to content
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

Jump to bottom

filterx: JSON <-> OTel Resource, Scope, LogRecord #4951

Closed
wants to merge 22 commits into from
Closed

filterx: JSON <-> OTel Resource, Scope, LogRecord #4951

wants to merge 22 commits into from

Conversation

alltilla
Copy link
Collaborator

@alltilla alltilla commented May 8, 2024

No description provided.

@kira-syslogng
Copy link
Contributor

Build FAILURE

@alltilla
Copy link
Collaborator Author

alltilla commented May 9, 2024

@kira-syslogng retest this please

bazsi
bazsi reviewed May 10, 2024
View reviewed changes
modules/grpc/otel/filterx/object-otel-scope.cpp
@@ -99,6 +99,52 @@ Scope::get_subscript(FilterXObject *key)
}
}

bool
Scope::unset_key(FilterXObject *key)
{
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the commit summary refers to Resource whereas this commit changes the "scope" implementation.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, fixed

@alltilla
otel: rename LogRecord functions to snake_case
9c6c580 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: pass const std::string & where possible
5cce236 
This can save a copy.

Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: add extract_string_from_object() helper fn
fc033f5 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: port LogRecord to implement the Dict interface
80c136d 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: add get_protobuf_message_set_field_count()
84649f0 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: implement len() for LogRecord
fd90d75 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: add Unset() to ProtobufField
fa4e433 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: implement unset for LogRecord
8979660 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: add IsSet() to ProtobufField
db66ec4 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: implement is_key_set for LogRecord
b0aa0ac 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: add iter_on_otel_protobuf_message_fields()
594f99d 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: implement iter() for LogRecord
da42d14 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: port Resource to implement the Dict interface
92511f8 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: implement the rest of the Dict interface for Resource
6c0b1fb 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: port Scope to implement the Dict interface
5000f63 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: implement the rest of the Dict interface for Scope
836d542 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: add list and dict factory for Resource, Scope, LogRecord
6b294d1 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
filterx: add filterx_dict_merge()
5d72c41 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
filterx: add filterx_list_merge()
571cb48 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
filterx: use dict merging in json and otel related functions
53d40ad 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
filterx: use list merging in json and otel related functions
f9b9c9f 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
filterx: add E2E tests to OTEL Res, Sco, Log <-> JSON convert
fca96fd 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla alltilla requested a review from bazsi May 17, 2024 07:22
@alltilla alltilla closed this May 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bazsi bazsi Awaiting requested review from bazsi

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@alltilla @kira-syslogng @bazsi