diff --git a/internal/collector/otel_collector_plugin.go b/internal/collector/otel_collector_plugin.go index c0aa3f91f..5112e68be 100644 --- a/internal/collector/otel_collector_plugin.go +++ b/internal/collector/otel_collector_plugin.go @@ -623,6 +623,13 @@ func (oc *Collector) updateNginxAppProtectTcplogReceivers( "value": nginxConfigContext.InstanceID, }, }, + { + Type: "add", + Fields: map[string]string{ + "field": "resource[\"instance.type\"]", + "value": "nginx-app-protect", + }, + }, }, } diff --git a/internal/collector/otel_collector_plugin_test.go b/internal/collector/otel_collector_plugin_test.go index 20d9ecadd..ac25ce775 100644 --- a/internal/collector/otel_collector_plugin_test.go +++ b/internal/collector/otel_collector_plugin_test.go @@ -755,7 +755,7 @@ func TestCollector_updateNginxAppProtectTcplogReceivers(t *testing.T) { assert.True(tt, tcplogReceiverAdded) assert.Len(tt, conf.Collector.Receivers.TcplogReceivers, 1) assert.Equal(tt, "localhost:15632", conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].ListenAddress) - assert.Len(tt, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 6) + assert.Len(tt, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 7) }) // Calling updateNginxAppProtectTcplogReceivers shouldn't update the TcplogReceivers slice @@ -765,7 +765,7 @@ func TestCollector_updateNginxAppProtectTcplogReceivers(t *testing.T) { assert.False(t, tcplogReceiverAdded) assert.Len(t, conf.Collector.Receivers.TcplogReceivers, 1) assert.Equal(t, "localhost:15632", conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].ListenAddress) - assert.Len(t, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 6) + assert.Len(t, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 7) }) t.Run("Test 3: TcplogReceiver deleted", func(tt *testing.T) { @@ -784,7 +784,7 @@ func TestCollector_updateNginxAppProtectTcplogReceivers(t *testing.T) { assert.True(t, tcplogReceiverDeleted) assert.Len(t, conf.Collector.Receivers.TcplogReceivers, 1) assert.Equal(t, "localhost:1555", conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].ListenAddress) - assert.Len(t, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 6) + assert.Len(t, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 7) }) } diff --git a/test/docker/nginx-plus-and-nap/deb/Dockerfile b/test/docker/nginx-plus-and-nap/deb/Dockerfile index 163a6fbce..2596fc65c 100644 --- a/test/docker/nginx-plus-and-nap/deb/Dockerfile +++ b/test/docker/nginx-plus-and-nap/deb/Dockerfile @@ -54,7 +54,7 @@ RUN --mount=type=secret,id=nginx-crt,dst=nginx-repo.crt \ && echo "Acquire::https::pkgs.nginx.com::Verify-Host \"true\";" >> /etc/apt/apt.conf.d/90nginx \ && echo "Acquire::https::pkgs.nginx.com::SslCert \"/etc/ssl/nginx/nginx-repo.crt\";" >> /etc/apt/apt.conf.d/90nginx \ && echo "Acquire::https::pkgs.nginx.com::SslKey \"/etc/ssl/nginx/nginx-repo.key\";" >> /etc/apt/apt.conf.d/90nginx \ - && printf "deb https://pkgs.nginx.com/plus/${PLUS_VERSION}/ubuntu/ `lsb_release -cs` nginx-plus\n" > /etc/apt/sources.list.d/nginx-plus.list \ + && printf "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/plus/${PLUS_VERSION}/ubuntu/ `lsb_release -cs` nginx-plus\n" > /etc/apt/sources.list.d/nginx-plus.list \ && printf "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/app-protect/${PLUS_VERSION}/ubuntu `lsb_release -cs` nginx-plus\n" | tee /etc/apt/sources.list.d/nginx-app-protect.list \ && printf "deb [signed-by=/usr/share/keyrings/app-protect-security-updates.gpg] https://pkgs.nginx.com/app-protect-security-updates/ubuntu `lsb_release -cs` nginx-plus\n" | tee -a /etc/apt/sources.list.d/nginx-app-protect.list \ && mkdir -p /etc/ssl/nginx \