Skip to content

Drop Worker-id suffix from crawler UA #384

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

Merged
simonsmallchua merged 3 commits into from
May 11, 2026
+7 −15
Merged

Drop Worker-id suffix from crawler UA #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
528352e
Drop Worker-id suffix from UA
simonsmallchua May 11, 2026
9c4d551
Add changelog entry for UA cleanup
simonsmallchua May 11, 2026
c4cb283
Fix MD038 in changelog code span
simonsmallchua May 11, 2026
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
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ On merge, CI will:

## [Unreleased]

_Add unreleased changes here._
### Changed

- Crawler user agent is now always exactly `config.UserAgent`. Dropped the dead
`Worker-<id>` suffix branch in `crawler.New` along with the unused variadic ID
parameter and struct field.

## Full changelog history

Expand Down
16 changes: 2 additions & 14 deletions internal/crawler/crawler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ func buildRequestAttemptDiagnostics(
type Crawler struct {
config *Config
colly *colly.Collector
id string
metricsMap *sync.Map
aia *aiaTransport
probeClient *http.Client // Shared to avoid per-call transport leaks.
Expand Down Expand Up @@ -291,23 +290,13 @@ func (t *tracingRoundTripper) RoundTrip(req *http.Request) (*http.Response, erro
return t.transport.RoundTrip(req)
}

func New(config *Config, id ...string) *Crawler {
func New(config *Config) *Crawler {
if config == nil {
config = DefaultConfig()
}

crawlerID := ""
if len(id) > 0 {
crawlerID = id[0]
}

userAgent := config.UserAgent
if crawlerID != "" {
userAgent = fmt.Sprintf("%s Worker-%s", config.UserAgent, crawlerID)
}

c := colly.NewCollector(
colly.UserAgent(userAgent),
colly.UserAgent(config.UserAgent),
colly.MaxDepth(1),
colly.Async(true),
colly.AllowURLRevisit(),
Expand Down Expand Up @@ -373,7 +362,6 @@ func New(config *Config, id ...string) *Crawler {
return &Crawler{
config: config,
colly: c,
id: crawlerID,
metricsMap: metricsMap,
aia: aiaRT,
probeClient: &http.Client{
Expand Down
Loading