Skip to content

Commit d72caa8

Browse files
aphralGaphralG
committed
merge main
2 parents d127cf5 + a4918b3 commit d72caa8

File tree

62 files changed

+1066
-1367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1066
-1367
lines changed

‎.golangci.yml‎

Lines changed: 578 additions & 814 deletions
Large diffs are not rendered by default.

‎Makefile.packaging‎

Lines changed: 11 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,18 @@ AZURE_PACKAGES_DIR := ./build/azure/packages
99
BINARY_PATH := $(BUILD_DIR)/$(BINARY_NAME)
1010
GPG_PUBLIC_KEY := .key
1111
PACKAGE_BUILD ?= 1
12-
PACKAGE_VERSION := $(shell echo ${VERSION} | tr -d 'v')
12+
PACKAGE_VERSION := $(shell git describe --match "v[0-9]*" --abbrev=0 --tags)
1313
TARBALL_NAME := $(PACKAGE_PREFIX).tar.gz
1414

15-
DEB_DISTROS ?= ubuntu-plucky-25.04 ubuntu-oracular-24.10 ubuntu-noble-24.04 ubuntu-jammy-22.04 debian-bookworm-12 debian-bullseye-11
15+
DEB_DISTROS ?= ubuntu-plucky-25.04 ubuntu-oracular-24.10 ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11
1616
DEB_ARCHS ?= arm64 amd64
17-
RPM_DISTROS ?= oraclelinux-8-x86_64 oraclelinux-9-x86_64 oraclelinux-10-x86_64 suse-15-x86_64
17+
RPM_DISTROS ?= suse-15-x86_64
1818
RPM_ARCH := x86_64
1919
REDHAT_VERSIONS ?= redhatenterprise-8 redhatenterprise-9 redhatenterprise-10
2020
REDHAT_ARCHS ?= aarch64 x86_64
21-
ROCKY_VERSIONS ?= rocky-8 rocky-9 rocky-10
22-
ROCKY_ARCHS ?= aarch64 x86_64
23-
APK_VERSIONS ?= 3.19 3.20 3.21 3.22
21+
APK_VERSIONS ?= 3.18 3.19 3.20 3.21 3.22
2422
APK_ARCHS ?= aarch64 x86_64
2523
APK_REVISION ?= 1
26-
ALMA_VERSIONS ?= almalinux-8 almalinux-9 almalinux-10
27-
ALMA_ARCHS ?= aarch64 x86_64
2824
AMAZON_VERSIONS ?= amazon-2 amazon-2023
2925
AMAZON_ARCHS ?= aarch64 x86_64
3026

@@ -34,55 +30,38 @@ AMAZON_ARCHS ?= aarch64 x86_64
3430
.PHONY: clean-packages
3531
clean-packages:
3632
rm -rf $(PACKAGES_DIR)
37-
rm -rf $(GITHUB_PACKAGES_DIR)
38-
rm -rf $(AZURE_PACKAGES_DIR)
3933

4034
$(PACKAGES_DIR):
41-
@mkdir -p $(PACKAGES_DIR)/deb && mkdir -p $(PACKAGES_DIR)/rpm && mkdir -p $(PACKAGES_DIR)/apk && mkdir -p $(PACKAGES_DIR)/txz
42-
43-
$(GITHUB_PACKAGES_DIR):
44-
@mkdir -p $(GITHUB_PACKAGES_DIR)
45-
46-
$(AZURE_PACKAGES_DIR):
47-
@mkdir -p $(AZURE_PACKAGES_DIR)
35+
@mkdir -p $(PACKAGES_DIR)/deb && mkdir -p $(PACKAGES_DIR)/rpm && mkdir -p $(PACKAGES_DIR)/apk
4836

4937
.PHONY: package
50-
package: gpg-key $(PACKAGES_DIR) $(GITHUB_PACKAGES_DIR) $(AZURE_PACKAGES_DIR) #### Create final packages for all supported distros
38+
package: $(PACKAGES_DIR) #### Create final packages for all supported distros
5139
# Create deb packages
52-
5340
@for arch in $(DEB_ARCHS); do \
5441
GOWORK=off CGO_ENABLED=0 GOARCH=$${arch} GOOS=linux go build -pgo=auto -ldflags=${LDFLAGS} -o $(BINARY_PATH) $(PROJECT_DIR)/$(PROJECT_FILE); \
5542
for distro in $(DEB_DISTROS); do \
5643
deb_codename=`echo $$distro | cut -d- -f 2`; \
5744
VERSION=$(PACKAGE_VERSION)~$${deb_codename} ARCH=$${arch} nfpm pkg --config .nfpm.yaml --packager deb --target ${PACKAGES_DIR}/deb/${PACKAGE_PREFIX}_$(PACKAGE_VERSION)~$${deb_codename}_$${arch}.deb; \
58-
cp ${PACKAGES_DIR}/deb/${PACKAGE_PREFIX}_$(PACKAGE_VERSION)~$${deb_codename}_$${arch}.deb ${GITHUB_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION)~$${deb_codename}_$${arch}.deb; \
59-
cp ${PACKAGES_DIR}/deb/${PACKAGE_PREFIX}_$(PACKAGE_VERSION)~$${deb_codename}_$${arch}.deb ${AZURE_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION)~$${deb_codename}_$${arch}.deb; \
6045
done; \
6146
rm -rf $(BINARY_PATH); \
6247
done; \
6348

6449
# Create rpm packages
65-
6650
@GOWORK=off CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -pgo=auto -ldflags=${LDFLAGS} -o $(BINARY_PATH) $(PROJECT_DIR)/$(PROJECT_FILE)
6751
@for distro in $(RPM_DISTROS); do \
6852
rpm_distro=`echo $$distro | cut -d- -f 1`; \
6953
rpm_major=`echo $$distro | cut -d- -f 2`; \
7054
rpm_codename='na'; \
71-
if [ "$$rpm_distro" = "centos" ] || [ "$$rpm_distro" = "redhatenterprise" ]; then rpm_codename="el$$rpm_major"; \
72-
elif [ "$$rpm_distro" = "oraclelinux" ]; then rpm_codename="oraclelinux$$rpm_major"; \
73-
elif [ "$$rpm_distro" = "suse" ]; then rpm_codename="sles$$rpm_major"; \
55+
if [ "$$rpm_distro" = "suse" ]; then rpm_codename="sles$$rpm_major"; \
7456
fi; \
7557
if [ "$$rpm_codename" != "na" ]; then \
7658
VERSION=$(PACKAGE_VERSION) ARCH=amd64 nfpm pkg --config .nfpm.yaml --packager rpm --target $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.${RPM_ARCH}.rpm; \
77-
cp $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$(RPM_ARCH).rpm ${GITHUB_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.${RPM_ARCH}.rpm; \
78-
cp $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$(RPM_ARCH).rpm ${AZURE_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.${RPM_ARCH}.rpm; \
7959
fi; \
8060
done; \
8161
rm -rf $(BINARY_PATH)
8262

8363

8464
# Create redhat rpm packages
85-
8665
@for arch in $(REDHAT_ARCHS); do \
8766
goarch=amd64; \
8867
if [ "$$arch" = "aarch64" ]; then goarch="arm64"; fi; \
@@ -92,49 +71,12 @@ package: gpg-key $(PACKAGES_DIR) $(GITHUB_PACKAGES_DIR) $(AZURE_PACKAGES_DIR) ##
9271
rpm_major=`echo $$distro | cut -d- -f 2`; \
9372
rpm_codename="el$$rpm_major"; \
9473
VERSION=$(PACKAGE_VERSION) ARCH=$${arch} nfpm pkg --config .nfpm.yaml --packager rpm --target $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm; \
95-
cp $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm ${GITHUB_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm; \
96-
cp $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm ${AZURE_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm; \
9774
done; \
9875
rm -rf $(BINARY_PATH); \
9976
done; \
10077

101-
# Create almalinux rpm packages
102-
103-
@for arch in $(ALMA_ARCHS); do \
104-
goarch=amd64; \
105-
if [ "$$arch" = "aarch64" ]; then goarch="arm64"; fi; \
106-
GOWORK=off CGO_ENABLED=0 GOARCH=$${goarch} GOOS=linux go build -pgo=auto -ldflags=${LDFLAGS} -o $(BINARY_PATH) $(PROJECT_DIR)/$(PROJECT_FILE); \
107-
for distro in $(ALMA_VERSIONS); do \
108-
rpm_distro=`echo $$distro | cut -d- -f 1`; \
109-
rpm_major=`echo $$distro | cut -d- -f 2`; \
110-
rpm_codename="almalinux$$rpm_major"; \
111-
VERSION=$(PACKAGE_VERSION) ARCH=$${arch} nfpm pkg --config .nfpm.yaml --packager rpm --target $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm; \
112-
cp $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm ${GITHUB_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm; \
113-
cp $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm ${AZURE_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm; \
114-
done; \
115-
rm -rf $(BINARY_PATH); \
116-
done; \
117-
118-
# Create rocky rpm packages
119-
120-
@for arch in $(ROCKY_ARCHS); do \
121-
goarch=amd64; \
122-
if [ "$$arch" = "aarch64" ]; then goarch="arm64"; fi; \
123-
GOWORK=off CGO_ENABLED=0 GOARCH=$${goarch} GOOS=linux go build -pgo=auto -ldflags=${LDFLAGS} -o $(BINARY_PATH) $(PROJECT_DIR)/$(PROJECT_FILE); \
124-
for distro in $(ROCKY_VERSIONS); do \
125-
rpm_distro=`echo $$distro | cut -d- -f 1`; \
126-
rpm_major=`echo $$distro | cut -d- -f 2`; \
127-
rpm_codename='na'; \
128-
if [ "$$rpm_distro" = "rocky" ]; then rpm_codename="rocky$$rpm_major"; fi; \
129-
if [ "$$rpm_codename" != "na" ]; then \
130-
VERSION=$(PACKAGE_VERSION) ARCH=$${arch} nfpm pkg --config .nfpm.yaml --packager rpm --target $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm; \
131-
cp $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm ${GITHUB_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm; \
132-
cp $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm ${AZURE_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm; \
133-
fi; \
134-
done; \
135-
rm -rf $(BINARY_PATH); \
136-
done; \
13778

79+
# Create amazon rpm packages
13880
@for arch in $(AMAZON_ARCHS); do \
13981
goarch=amd64; \
14082
if [ "$$arch" = "aarch64" ]; then goarch="arm64"; fi; \
@@ -143,34 +85,22 @@ package: gpg-key $(PACKAGES_DIR) $(GITHUB_PACKAGES_DIR) $(AZURE_PACKAGES_DIR) ##
14385
rpm_major=`echo $$version | cut -d- -f 2`; \
14486
rpm_codename="amzn$$rpm_major";\
14587
VERSION=$(PACKAGE_VERSION) ARCH=$${arch} nfpm pkg --config .nfpm.yaml --packager rpm --target $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm; \
146-
cp $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm ${GITHUB_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm; \
147-
cp $(PACKAGES_DIR)/rpm/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm ${AZURE_PACKAGES_DIR}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).$${rpm_codename}.ngx.$${arch}.rpm; \
14888
done; \
14989
rm -rf $(BINARY_PATH); \
15090
done; \
15191

15292
# Create apk packages
153-
15493
@for arch in $(APK_ARCHS); do \
15594
goarch=amd64; \
15695
if [ "$$arch" = "aarch64" ]; then goarch="arm64"; fi; \
15796
GOWORK=off CGO_ENABLED=0 GOARCH=$${goarch} GOOS=linux go build -pgo=auto -ldflags=${LDFLAGS} -o $(BINARY_PATH) $(PROJECT_DIR)/$(PROJECT_FILE); \
15897
for version in $(APK_VERSIONS); do \
15998
if [ ! -d "$(PACKAGES_DIR)/apk/v$${version}/$${arch}" ]; then mkdir -p $(PACKAGES_DIR)/apk/v$${version}/$${arch}; fi; \
16099
VERSION=$(PACKAGE_VERSION) ARCH=$${arch} nfpm pkg --config .nfpm.yaml --packager apk --target $(PACKAGES_DIR)/apk/v$${version}/$${arch}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).apk; \
161-
cp $(PACKAGES_DIR)/apk/v$${version}/$${arch}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).apk ${GITHUB_PACKAGES_DIR}/${PACKAGE_PREFIX}-v$(PACKAGE_VERSION)-r$(APK_REVISION).apk; \
162-
cp $(PACKAGES_DIR)/apk/v$${version}/$${arch}/${PACKAGE_PREFIX}-$(PACKAGE_VERSION).apk ${AZURE_PACKAGES_DIR}/${PACKAGE_PREFIX}-v$(PACKAGE_VERSION)-r$(APK_REVISION).apk; \
163100
done; \
164101
rm -rf $(BINARY_PATH); \
165102
done; \
166-
167-
# Create txz packages
168-
169-
rm -rf $(BINARY_PATH)
170-
@GOWORK=off CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build -pgo=auto -ldflags=${LDFLAGS} -o $(BINARY_PATH) $(PROJECT_DIR)/$(PROJECT_FILE)
171-
172-
docker run -v ${PWD}:/nginx-agent/ -e VERSION=$(PACKAGE_VERSION) build-signed-packager:1.0.0
173-
103+
174104
# Package build complete
175105

176106
echo "DEB packages:"; \
@@ -179,17 +109,9 @@ package: gpg-key $(PACKAGES_DIR) $(GITHUB_PACKAGES_DIR) $(AZURE_PACKAGES_DIR) ##
179109
find $(PACKAGES_DIR)/rpm ;\
180110
echo "APK packages:"; \
181111
find $(PACKAGES_DIR)/apk ;\
182-
echo "TXZ packages:"; \
183-
find $(PACKAGES_DIR)/txz ;\
184-
echo "Github packages:"; \
185-
find $(GITHUB_PACKAGES_DIR) ;\
186-
cd $(PACKAGES_DIR) && tar -czvf "./$(TARBALL_NAME)" * && cd ../.. && cp "${PACKAGES_DIR}/$(TARBALL_NAME)" "${AZURE_PACKAGES_DIR}/$(TARBALL_NAME)"; \
187-
echo "Azure packages:"; \
188-
find $(AZURE_PACKAGES_DIR) ;
189112

190-
.PHONY: build-signed-packager
191-
build-signed-packager:
192-
docker build -f scripts/packages/packager/Dockerfile --build-arg package_type=signed-package -t build-signed-packager:1.0.0 .
113+
# Create tarball containing all packages
114+
cd $(PACKAGES_DIR) && tar -czvf "./$(TARBALL_NAME)" * && cd ../.. && cp "${PACKAGES_DIR}/$(TARBALL_NAME)"; \
193115

194116
.PHONY: gpg-key
195117
gpg-key: ## Generate GPG public key

‎Makefile.tools‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
OAPICODEGEN = github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@v2.1.0
22
LEFTHOOK = github.com/evilmartians/lefthook@v1.6.9
3-
GOLANGCILINT = github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
3+
GOLANGCILINT = github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.2.1
44
PROTOCGENGO = google.golang.org/protobuf/cmd/protoc-gen-go@v1.32.0
55
GOFUMPT = mvdan.cc/gofumpt@v0.6.0
66
COUNTERFEITER = github.com/maxbrunsfeld/counterfeiter/v6@v6.8.1

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/nginx/agent/v3
22

3-
go 1.23.7
3+
go 1.24.0
44

5-
toolchain go1.23.10
5+
toolchain go1.24.4
66

77
require (
88
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.4-20250130201111-63bb56e20495.1

‎internal/bus/message_pipe.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,16 @@ func (p *MessagePipe) IsPluginRegistered(pluginName string) bool {
147147
return isPluginRegistered
148148
}
149149

150+
func (p *MessagePipe) Index(pluginName string, plugins []Plugin) int {
151+
for index, plugin := range plugins {
152+
if pluginName == plugin.Info().Name {
153+
return index
154+
}
155+
}
156+
157+
return -1
158+
}
159+
150160
func (p *MessagePipe) unsubscribePlugin(ctx context.Context, index int, plugin Plugin) error {
151161
if index != -1 {
152162
p.plugins = append(p.plugins[:index], p.plugins[index+1:]...)
@@ -181,16 +191,6 @@ func (p *MessagePipe) findPlugins(pluginNames []string) []Plugin {
181191
return plugins
182192
}
183193

184-
func (p *MessagePipe) Index(pluginName string, plugins []Plugin) int {
185-
for index, plugin := range plugins {
186-
if pluginName == plugin.Info().Name {
187-
return index
188-
}
189-
}
190-
191-
return -1
192-
}
193-
194194
func (p *MessagePipe) initPlugins(ctx context.Context) {
195195
for index, plugin := range p.plugins {
196196
err := plugin.Init(ctx, p)

‎internal/collector/logsgzipprocessor/processor.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,22 @@ func (p *logsGzipProcessor) ConsumeLogs(ctx context.Context, ld plog.Logs) error
9595
return p.nextConsumer.ConsumeLogs(ctx, ld)
9696
}
9797

98+
func (p *logsGzipProcessor) Capabilities() consumer.Capabilities {
99+
return consumer.Capabilities{
100+
MutatesData: true,
101+
}
102+
}
103+
104+
func (p *logsGzipProcessor) Start(ctx context.Context, _ component.Host) error {
105+
p.settings.Logger.Info("Starting logs gzip processor")
106+
return nil
107+
}
108+
109+
func (p *logsGzipProcessor) Shutdown(ctx context.Context) error {
110+
p.settings.Logger.Info("Shutting down logs gzip processor")
111+
return nil
112+
}
113+
98114
func (p *logsGzipProcessor) processLogRecords(logRecords plog.LogRecordSlice) error {
99115
var errs error
100116
// Filter out unsupported data types in the log before processing
@@ -164,19 +180,3 @@ func (p *logsGzipProcessor) gzipCompress(data []byte) ([]byte, error) {
164180

165181
return buf.Bytes(), nil
166182
}
167-
168-
func (p *logsGzipProcessor) Capabilities() consumer.Capabilities {
169-
return consumer.Capabilities{
170-
MutatesData: true,
171-
}
172-
}
173-
174-
func (p *logsGzipProcessor) Start(ctx context.Context, _ component.Host) error {
175-
p.settings.Logger.Info("Starting logs gzip processor")
176-
return nil
177-
}
178-
179-
func (p *logsGzipProcessor) Shutdown(ctx context.Context) error {
180-
p.settings.Logger.Info("Shutting down logs gzip processor")
181-
return nil
182-
}

‎internal/collector/logsgzipprocessor/processor_benchmark_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func generateLogs(numRecords, recordSize int) plog.Logs {
2020
logs := plog.NewLogs()
2121
rl := logs.ResourceLogs().AppendEmpty()
2222
sl := rl.ScopeLogs().AppendEmpty()
23-
for i := 0; i < numRecords; i++ {
23+
for range numRecords {
2424
lr := sl.LogRecords().AppendEmpty()
2525
content, _ := randomString(recordSize)
2626
lr.Body().SetStr(content)
@@ -64,7 +64,7 @@ func BenchmarkGzipProcessor(b *testing.B) {
6464
logs := generateLogs(bm.numRecords, bm.recordSize)
6565

6666
b.ResetTimer()
67-
for i := 0; i < b.N; i++ {
67+
for range b.N {
6868
_ = p.ConsumeLogs(context.Background(), logs)
6969
}
7070
})

‎internal/collector/nginxossreceiver/factory_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
func TestType(t *testing.T) {
2424
factory := NewFactory()
2525
ft := factory.Type()
26-
require.EqualValues(t, metadata.Type, ft)
26+
require.Equal(t, metadata.Type, ft)
2727
}
2828

2929
func TestValidConfig(t *testing.T) {

‎internal/collector/nginxossreceiver/internal/scraper/accesslog/nginx_log_scraper.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,12 @@ func (nls *NginxLogScraper) Shutdown(_ context.Context) error {
224224
return err
225225
}
226226

227+
func (nls *NginxLogScraper) ConsumerCallback(_ context.Context, entries []*entry.Entry) {
228+
nls.mut.Lock()
229+
nls.entries = append(nls.entries, entries...)
230+
nls.mut.Unlock()
231+
}
232+
227233
func (nls *NginxLogScraper) initStanzaPipeline(
228234
operators []operator.Config,
229235
logger *zap.Logger,
@@ -248,12 +254,6 @@ func (nls *NginxLogScraper) initStanzaPipeline(
248254
return pipe, err
249255
}
250256

251-
func (nls *NginxLogScraper) ConsumerCallback(_ context.Context, entries []*entry.Entry) {
252-
nls.mut.Lock()
253-
nls.entries = append(nls.entries, entries...)
254-
nls.mut.Unlock()
255-
}
256-
257257
func (nls *NginxLogScraper) runConsumer(ctx context.Context) {
258258
nls.logger.Info("Starting NGINX access log receiver's consumer")
259259
defer nls.wg.Done()

‎internal/collector/nginxossreceiver/internal/scraper/accesslog/operator/input/file/config.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ import (
2121

2222
const operatorType = "access_log_file_input"
2323

24+
// Config is the configuration of a file input operator
25+
type Config struct {
26+
helper.InputConfig `mapstructure:",squash"`
27+
AccessLogFormat string `mapstructure:"access_log_format"`
28+
fileconsumer.Config `mapstructure:",squash"`
29+
}
30+
2431
func init() {
2532
operator.Register(operatorType, func() operator.Builder { return NewConfig() })
2633
}
@@ -38,13 +45,6 @@ func NewConfigWithID(operatorID string) *Config {
3845
}
3946
}
4047

41-
// Config is the configuration of a file input operator
42-
type Config struct {
43-
helper.InputConfig `mapstructure:",squash"`
44-
AccessLogFormat string `mapstructure:"access_log_format"`
45-
fileconsumer.Config `mapstructure:",squash"`
46-
}
47-
4848
// Build will build a file input operator from the supplied configuration
4949
// nolint: ireturn
5050
func (c Config) Build(set component.TelemetrySettings) (operator.Operator, error) {

0 commit comments

Comments
 (0)