Analytics: Configure per account #4459

przemkaczmarek · 2025-07-29T12:42:57Z

Implements the first part of #3809

analytics/prebid/agma/module.go

modules/moduledeps/deps.go

analytics/prebid/pubstack/module.go

analytics/prebid/agma/module.go

analytics/prebid/filelogger/module.go

analytics/build/build.go

analytics/modules.go

analytics/generator/buildergen.go

analytics/generator/builder.tmpl

analytics/builder.go

analytics/modules.go

bsardo · 2025-10-09T13:25:55Z

analytics/build/builder.go

+)
+
+// builders returns mapping between analytics module name and its builder.
+// Since we no longer use vendor directories, we hardcode "modules" instead.


Delete the second comment.

bsardo · 2025-10-23T13:49:02Z

router/router.go

 	shutdown, fetcher, ampFetcher, accounts, categoriesFetcher, videoFetcher, storedRespFetcher := storedRequestsConf.NewStoredRequests(cfg, r.MetricsEngine, generalHttpClient, r.Router)

-	analyticsRunner := analyticsBuild.New(&cfg.Analytics)
+	analyticsRunner := analyticsBuild.New(map[string]interface{}{})


The parameter here needs to be &cfg.Analytics.

bsardo · 2025-10-23T13:49:24Z

Makefile

+
+# build-analytics generates analytics/builder.go file which provides a list of all available analytics modules
+build-analytics:
+	go generate analytics/modules.go


This should be analytics/build/build.go.

bsardo · 2025-10-23T13:50:25Z

analytics/modules/agma/module.go

+	Enabled  bool                             `mapstructure:"enabled" json:"enabled"`
+	Endpoint config.AgmaAnalyticsHttpEndpoint `mapstructure:"endpoint" json:"endpoint"`
+	Buffers  struct {
+		EventCount int    `mapstructure:"eventCount" json:"eventCount"`
+		BufferSize string `mapstructure:"bufferSize" json:"bufferSize"`
+		Timeout    string `mapstructure:"timeout" json:"timeout"`
+	} `mapstructure:"buffers" json:"buffers"`
+	Accounts []config.AgmaAnalyticsAccount `mapstructure:"accounts" json:"accounts"`


Remove all of the mapstructure annotations. Make this same change for the other modules (pubstack and filelogger).

bsardo · 2025-10-23T13:50:48Z

analytics/modules/agma/module.go

+
+	var c Config
+	if cfg != nil {
+		if err := mapstructure.Decode(cfg, &c); err != nil {


Change this to jsonutil.Unmarshal since the data is passed in as JSON (make the same change for the other modules).

bsardo · 2025-11-06T14:22:39Z

analytics/modules/filelogger/file_module.go

@@ -1,4 +1,4 @@
-package filesystem
+package filelogger


Discussed offline. We will change the folder name, the package name and update the template to refer to this as file so it matches the config and does not become a breaking change.

bsardo · 2025-11-06T14:24:38Z

analytics/modules/filelogger/module.go

+// Config is the minimal configuration for the file logger analytics module.
+// Empty Filename means the module is disabled.
+type Config struct {
+	Enabled  bool   `json:"enabled"`


Did enabled exist before for file logger? If not, we should remove it and just rely on the presence of a filename in the config indicating that we want to enable this module.

bsardo · 2025-11-18T14:08:48Z

config/config.go

-	CurrencyConverter    CurrencyConverter `mapstructure:"currency_converter"`
-	DefReqConfig         DefReqConfig      `mapstructure:"default_request"`
+	MaxRequestSize       int64                  `mapstructure:"max_request_size"`
+	Analytics            map[string]interface{} `mapstructure:"analytics"`


All of the agma, pubstack and filelogger configs belong in their corresponding packages now because this is now a generic map for analytics module configurations.

bsardo · 2025-11-18T14:10:53Z

config/config_test.go

+	agmaMap, _ := cfg.Analytics["agma"].(map[string]interface{})
+	endpointMap, _ := agmaMap["endpoint"].(map[string]interface{})
+	buffersMap, _ := agmaMap["buffers"].(map[string]interface{})
+	cmpBools(t, "analytics.agma.enabled", false, agmaMap["enabled"].(bool))
+	cmpStrings(t, "analytics.agma.endpoint.timeout", "2s", endpointMap["timeout"].(string))
+	cmpBools(t, "analytics.agma.endpoint.gzip", false, endpointMap["gzip"].(bool))
+	cmpStrings(t, "analytics.agma.endppoint.url", "https://go.pbs.agma-analytics.de/v1/prebid-server", endpointMap["url"].(string))
+	cmpStrings(t, "analytics.agma.buffers.size", "2MB", buffersMap["size"].(string))
+	cmpInts(t, "analytics.agma.buffers.count", 100, buffersMap["count"].(int))
+	cmpStrings(t, "analytics.agma.buffers.timeout", "15m", buffersMap["timeout"].(string))
+	accountsSlice, _ := agmaMap["accounts"].([]interface{})
+	cmpInts(t, "analytics.agma.accounts", 0, len(accountsSlice))


You can remove this and any other config checks for filelogger and pubstack since they are now the concern on the individual module packages due to the type change in config/config.go.

bsardo · 2025-11-18T14:12:30Z

router/router.go

 	shutdown, fetcher, ampFetcher, accounts, categoriesFetcher, videoFetcher, storedRespFetcher := storedRequestsConf.NewStoredRequests(cfg, r.MetricsEngine, generalHttpClient, r.Router)

-	analyticsRunner := analyticsBuild.New(&cfg.Analytics)
+	analyticsRunner := analyticsBuild.New(cfg.Analytics)


Why is this no longer a pointer? cfg.Analytics could be nil if there aren't any analytics modules enabled.
Discussed offline. This should be ok as is.

bsardo · 2025-11-18T14:23:31Z

analytics/modules/agma/module.go

+		return nil, nil
+	}
+
+	full := config.AgmaAnalytics{


All config structs for each analytics adapter should be defined in their corresponding module.go.

bsardo · 2025-11-18T14:27:16Z

analytics/modules/agma/module.go

Add analytics/modules/agma/module_test.go
See modules/fiftyonedegrees/devicedetection/module_test.go as an example.

bsardo · 2025-11-18T14:27:36Z

analytics/modules/file/module.go

Add analytics/modules/file/module_test.go

bsardo · 2025-11-18T14:27:54Z

analytics/modules/pubstack/module.go

Add analytics/modules/pubstack/module_test.go

file config.go

agma etc

przemkaczmarek added do not port module labels Jul 29, 2025

bsardo marked this pull request as draft July 29, 2025 15:10

adding new analytics module files

6ae59c9

przemkaczmarek force-pushed the feature/account-analytics branch from 478fb7d to 6ae59c9 Compare August 8, 2025 12:47

przemkaczmarek added 2 commits August 12, 2025 10:55

Move three open source analytics adapters under analytics/prebid/

4a897a3

New() function iterate over all of the AnalyticsModuleBuilders

3b02066

bsardo changed the title ~~Configure analytics adapters per account #3809~~ Configure analytics adapters per account Aug 26, 2025

bsardo changed the title ~~Configure analytics adapters per account~~ Analytics: Configure per account Aug 26, 2025

bsardo self-assigned this Aug 26, 2025

bsardo reviewed Aug 28, 2025

View reviewed changes

przemkaczmarek added 3 commits August 29, 2025 12:13

fix comments

0ed5404

fix comments

fd8084d

fix imports

d5959c2

bsardo reviewed Sep 3, 2025

View reviewed changes

analytics/generator/buildergen.go Outdated Show resolved Hide resolved

analytics/generator/builder.tmpl Outdated Show resolved Hide resolved

analytics/builder.go Outdated Show resolved Hide resolved

analytics/modules.go Outdated Show resolved Hide resolved

przemkaczmarek added 3 commits September 4, 2025 05:18

fix comments

245293e

fix imports

e2d6326

fix comments

c47be0f

przemkaczmarek force-pushed the feature/account-analytics branch from bb7db0c to c47be0f Compare October 2, 2025 19:17

przemkaczmarek added 2 commits October 11, 2025 09:54

fix build.go

531f9a7

fix template

699404f

bsardo reviewed Oct 23, 2025

View reviewed changes

przemkaczmarek added 3 commits October 23, 2025 14:42

fix comments

7fd3ee0

fix comments

1af31c4

fix makebuild-analytics process

3625b4b

bsardo reviewed Nov 6, 2025

View reviewed changes

fix comments

9df0613

bsardo reviewed Nov 18, 2025

View reviewed changes

przemkaczmarek added 2 commits November 19, 2025 16:03

replacing agmaConfig from config.go to its own

990984c

file config.go

replacing pubstack and fileloger config

2fcc59b

bsardo marked this pull request as ready for review November 20, 2025 14:58

przemkaczmarek and others added 3 commits November 22, 2025 10:03

delete set fields in Viper connected with pubstack

470eabe

agma etc

agma pubstack file module_test

183f446

Merge branch 'master' into pr4459

afd3d8a

Analytics: Configure per account #4459

Are you sure you want to change the base?

Analytics: Configure per account #4459

Conversation

przemkaczmarek commented Jul 29, 2025 • edited by bsardo Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bsardo Nov 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bsardo Nov 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

przemkaczmarek commented Jul 29, 2025 •

edited by bsardo

Loading

bsardo Nov 18, 2025 •

edited

Loading

bsardo Nov 18, 2025 •

edited

Loading