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

[pkg/ottl] add User Agent parsing #34172

Merged
merged 20 commits into from
Aug 21, 2024
Merged

[pkg/ottl] add User Agent parsing #34172

merged 20 commits into from
Aug 21, 2024

Conversation

pchila
Copy link
Contributor

@pchila pchila commented Jul 19, 2024 •
edited
Loading

Description:

Added a new ottl converter UserAgent: it parses an input string and matches against a set of known UA regexes to correctly identify user agent and its version
Link to tracking Issue: #32434

Testing: Unit tests, E2E tests

Documentation: Added UserAgent description in pkg/ottl/ottlfuncs/README.md

@pchila pchila requested a review from a team July 19, 2024 14:11
@linux-foundation-easycla Linux Foundation: EasyCLA
Copy link

linux-foundation-easycla bot commented Jul 19, 2024 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

@github-actions github-actions bot requested a review from kentquirk July 19, 2024 14:15
@ycombinator
Copy link
Contributor

Hi @atoulme, @TylerHelmuth, @bogdandrutu, or @evan-bradley, this PR is failing CI on the license/snyk and security/snyk checks. I'm unable to view the details for either. I tried to auth into Snyk using GitHub but it says I'm not a member of the organization. Just a heads up that I've requested access. Thanks.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 9, 2024

This PR was marked stale due to lack of activity. It will be closed in 14 days.

@github-actions github-actions bot added the Stale label Aug 9, 2024
@TylerHelmuth
Copy link
Member

@pchila please handle the merge conflicts and merge in the latest from main

@pchila
Copy link
Contributor Author

pchila commented Aug 9, 2024

@pchila please handle the merge conflicts and merge in the latest from main
Done and pushed

TylerHelmuth
TylerHelmuth reviewed Aug 9, 2024
View reviewed changes
pkg/ottl/ottlfuncs/README.md Outdated Show resolved Hide resolved
pkg/ottl/ottlfuncs/func_useragent.go Outdated Show resolved Hide resolved
pkg/ottl/ottlfuncs/func_useragent.go Outdated Show resolved Hide resolved
pkg/ottl/ottlfuncs/func_useragent_test.go Show resolved Hide resolved
pkg/ottl/go.mod Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the Stale label Aug 10, 2024
pchila and others added 6 commits August 12, 2024 13:52
@pchila
Move User-Agent parser initialization out of the UserAgent function
6ac23c0 
Initialize a `uaparser.Parser` instance at the first UserAgent call and
reuse it instead of creating a new parser for every invocation.
@pchila
Add unit test for parsing collector UserAgent string
7538cf0
@pchila @TylerHelmuth
Update pkg/ottl/ottlfuncs/README.md
bb5c618 
Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
@pchila
Merge remote-tracking branch 'upstream/main' into user-agent-parsing
aa9d317
@pchila
fixup! Merge remote-tracking branch 'upstream/main' into user-agent-p…
90fd086 
…arsing
@pchila
Move User-Agent parser initialization out of the user agent converter
095d8e4 
This reverts commit 6ac23c0. going for
a simpler solution where the useragent parser is instantiated just
before returning the anonymous ottl.ExprFunc[K] that uses it.
This will prevent re-instantating the parser at each `UserAgent(...)`
invocation.
@TylerHelmuth
Copy link
Member

@pchila we just had a release so there is a new merge conflict to handle.

@github-actions github-actions bot added processor/attributes Attributes processor processor/filter Filter processor processor/routing Routing processor processor/span processor/tailsampling Tail sampling processor processor/transform Transform processor testbed labels Aug 19, 2024
@TylerHelmuth
Copy link
Member

@pchila needs a changelog then we'll be good to go

@pchila
Copy link
Contributor Author

pchila commented Aug 20, 2024

@TylerHelmuth added the changelog and now all the checks are green 🎉

@TylerHelmuth
Copy link
Member

Looks like your new dependency is conflicting with a renovatebot update that was merged.

@andrzej-stencel andrzej-stencel merged commit 19e447e into open-telemetry:main Aug 21, 2024
156 checks passed
@github-actions github-actions bot added this to the next release milestone Aug 21, 2024
@ycombinator ycombinator mentioned this pull request Aug 28, 2024
Closed
f7o pushed a commit to f7o/opentelemetry-collector-contrib that referenced this pull request Sep 12, 2024
@pchila @TylerHelmuth @f7o
[pkg/ottl] add User Agent parsing (open-telemetry#34172)
c5461d3 
**Description:** <Describe what has changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
Added a new ottl converter `UserAgent`: it parses an input string and
matches against a [set of known UA
regexes](https://github.com/ua-parser/uap-core/blob/master/regexes.yaml)
to correctly identify user agent and its version
**Link to tracking Issue:** open-telemetry#32434 

**Testing:** Unit tests, E2E tests

**Documentation:** <Describe the documentation added.> Added UserAgent
description in `pkg/ottl/ottlfuncs/README.md`

---------

Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
@rogercoll rogercoll mentioned this pull request Sep 27, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TylerHelmuth TylerHelmuth TylerHelmuth approved these changes

@odubajDT odubajDT odubajDT approved these changes

@bogdandrutu bogdandrutu Awaiting requested review from bogdandrutu bogdandrutu is a code owner

@evan-bradley evan-bradley Awaiting requested review from evan-bradley evan-bradley is a code owner

@kentquirk kentquirk Awaiting requested review from kentquirk

@jpkrohling jpkrohling Awaiting requested review from jpkrohling jpkrohling is a code owner

@mx-psi mx-psi Awaiting requested review from mx-psi mx-psi is a code owner

@songy23 songy23 Awaiting requested review from songy23 songy23 is a code owner

@crobert-1 crobert-1 Awaiting requested review from crobert-1 crobert-1 is a code owner

@mwear mwear Awaiting requested review from mwear mwear is a code owner

@djaglowski djaglowski Awaiting requested review from djaglowski djaglowski is a code owner

@ankitpatel96 ankitpatel96 Awaiting requested review from ankitpatel96

@boostchicken boostchicken Awaiting requested review from boostchicken

@carsonip carsonip Awaiting requested review from carsonip

@dineshg13 dineshg13 Awaiting requested review from dineshg13

@fchikwekwe fchikwekwe Awaiting requested review from fchikwekwe

@greatestusername greatestusername Awaiting requested review from greatestusername

@JaredTan95 JaredTan95 Awaiting requested review from JaredTan95

@liustanley liustanley Awaiting requested review from liustanley

@mackjmr mackjmr Awaiting requested review from mackjmr

@shalper2 shalper2 Awaiting requested review from shalper2

@ycombinator ycombinator Awaiting requested review from ycombinator

Assignees

@atoulme atoulme

Labels
cmd/otelcontribcol otelcontribcol command cmd/oteltestbedcol connector/count connector/datadog connector/routing connector/sum exporter/datadog Datadog components exporter/elasticsearch exporter/honeycombmarker internal/filter pkg/ottl processor/attributes Attributes processor processor/filter Filter processor processor/routing Routing processor processor/span processor/tailsampling Tail sampling processor processor/transform Transform processor testbed
Projects
None yet
Milestone
v0.108.0
Development

Successfully merging this pull request may close these issues.
6 participants
@pchila @ycombinator @TylerHelmuth @odubajDT @atoulme @andrzej-stencel