Skip to content

Commit f21703c

Browse files
lucacomelucacome
committed
update telemetry
1 parent 3d4ca62 commit f21703c

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ require (
1414
github.com/jinzhu/copier v0.4.0
1515
github.com/nginx/nginx-plus-go-client/v2 v2.2.0
1616
github.com/nginx/nginx-prometheus-exporter v1.4.1
17+
github.com/nginx/telemetry-exporter v0.1.3
1718
github.com/nginxinc/nginx-service-mesh v1.7.0
18-
github.com/nginxinc/telemetry-exporter v0.1.2
1919
github.com/prometheus/client_golang v1.20.5
2020
github.com/spiffe/go-spiffe/v2 v2.4.0
2121
github.com/stretchr/testify v1.10.0
@@ -187,11 +187,11 @@ require (
187187
golang.org/x/term v0.28.0 // indirect
188188
golang.org/x/text v0.21.0 // indirect
189189
golang.org/x/time v0.8.0 // indirect
190-
golang.org/x/tools v0.28.0 // indirect
190+
golang.org/x/tools v0.29.0 // indirect
191191
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
192192
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
193193
google.golang.org/grpc v1.68.1 // indirect
194-
google.golang.org/protobuf v1.35.2 // indirect
194+
google.golang.org/protobuf v1.36.1 // indirect
195195
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
196196
gopkg.in/inf.v0 v0.9.1 // indirect
197197
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
195195
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
196196
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
197197
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
198-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
199-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
198+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
199+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
200200
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
201201
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
202202
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
@@ -315,16 +315,16 @@ github.com/nginx/nginx-plus-go-client/v2 v2.2.0 h1:qwhx4fF/pq+h72/nE+o+XSH5mZmDU
315315
github.com/nginx/nginx-plus-go-client/v2 v2.2.0/go.mod h1:U7G5pqucUS1V4Uecs1xCsJ9knSsfwqhwu8ZEjoCYnmk=
316316
github.com/nginx/nginx-prometheus-exporter v1.4.1 h1:sqA5VYSs4Rx8pX/NIE37yZR0gNlH1WYVZHONe38a93k=
317317
github.com/nginx/nginx-prometheus-exporter v1.4.1/go.mod h1:TEU3FUxQKBvVgRkPyMuq9kclmUp/x0/ocr3K/8F7At8=
318+
github.com/nginx/telemetry-exporter v0.1.3 h1:aGuUWMRSf2nA9fOH+AQ8I+hdoq0Hz6wgttLBG/SzsvI=
319+
github.com/nginx/telemetry-exporter v0.1.3/go.mod h1:hVH3DhumaKkGOWLiFLvZj+UWjLNoPXoXvoiNiUI0WxQ=
318320
github.com/nginxinc/nginx-service-mesh v1.7.0 h1:oxKr+Jdbxkos10VTy5xF2UHCcmfIhqWNlsOK/zPnZDM=
319321
github.com/nginxinc/nginx-service-mesh v1.7.0/go.mod h1:8tREM3kSEUGyk8JT8hdCf/9ol2kEo7hLR8b+m5Yd8Fs=
320-
github.com/nginxinc/telemetry-exporter v0.1.2 h1:97vUGhQYgQ2KEsXKCBmr5gqfuujJCKPHwdg5HKoANUs=
321-
github.com/nginxinc/telemetry-exporter v0.1.2/go.mod h1:eKa/Ceh9irmyZ1xV2QxBIxduIyVC5RlmtiWwcTlHuMg=
322322
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
323323
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
324324
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
325325
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
326-
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
327-
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
326+
github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
327+
github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
328328
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
329329
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
330330
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -531,8 +531,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
531531
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
532532
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
533533
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
534-
golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
535-
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
534+
golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
535+
golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
536536
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
537537
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
538538
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -545,8 +545,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:
545545
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
546546
google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
547547
google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
548-
google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
549-
google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
548+
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
549+
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
550550
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
551551
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
552552
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

‎internal/telemetry/collector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/nginx/kubernetes-ingress/internal/k8s/secrets"
1414

15-
tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry"
15+
tel "github.com/nginx/telemetry-exporter/pkg/telemetry"
1616

1717
"github.com/nginx/kubernetes-ingress/internal/configs"
1818

‎internal/telemetry/collector_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/google/go-cmp/cmp"
1919
"github.com/nginx/kubernetes-ingress/internal/telemetry"
2020
conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1"
21-
tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry"
21+
tel "github.com/nginx/telemetry-exporter/pkg/telemetry"
2222
coreV1 "k8s.io/api/core/v1"
2323
networkingV1 "k8s.io/api/networking/v1"
2424
metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎internal/telemetry/data_attributes_generated.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This is a generated file. DO NOT EDIT.
77
import (
88
"go.opentelemetry.io/otel/attribute"
99

10-
ngxTelemetry "github.com/nginxinc/telemetry-exporter/pkg/telemetry"
10+
ngxTelemetry "github.com/nginx/telemetry-exporter/pkg/telemetry"
1111
)
1212

1313
func (d *Data) Attributes() []attribute.KeyValue {

‎internal/telemetry/exporter.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
99

10-
tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry"
10+
tel "github.com/nginx/telemetry-exporter/pkg/telemetry"
1111
)
1212

1313
// Exporter interface for exporters.
@@ -51,15 +51,15 @@ func NewExporter(cfg ExporterCfg) (Exporter, error) {
5151

5252
// Data holds collected telemetry data.
5353
//
54-
//go:generate go run -tags=generator github.com/nginxinc/telemetry-exporter/cmd/generator -type Data -scheme -scheme-protocol=NICProductTelemetry -scheme-df-datatype=nic-product-telemetry -scheme-namespace=ingress.nginx.com
54+
//go:generate go run -tags=generator github.com/nginx/telemetry-exporter/cmd/generator -type Data -scheme -scheme-protocol=NICProductTelemetry -scheme-df-datatype=nic-product-telemetry -scheme-namespace=ingress.nginx.com
5555
type Data struct {
5656
tel.Data
5757
NICResourceCounts
5858
}
5959

6060
// NICResourceCounts holds a count of NIC specific resource.
6161
//
62-
//go:generate go run -tags=generator github.com/nginxinc/telemetry-exporter/cmd/generator -type NICResourceCounts
62+
//go:generate go run -tags=generator github.com/nginx/telemetry-exporter/cmd/generator -type NICResourceCounts
6363
type NICResourceCounts struct {
6464
// VirtualServers is the number of VirtualServer resources managed by the Ingress Controller.
6565
VirtualServers int64

‎internal/telemetry/nicresourcecounts_attributes_generated.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This is a generated file. DO NOT EDIT.
77
import (
88
"go.opentelemetry.io/otel/attribute"
99

10-
ngxTelemetry "github.com/nginxinc/telemetry-exporter/pkg/telemetry"
10+
ngxTelemetry "github.com/nginx/telemetry-exporter/pkg/telemetry"
1111
)
1212

1313
func (d *NICResourceCounts) Attributes() []attribute.KeyValue {

‎site/developer/telemetry-schema-generation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Depending on what kind of update was made, different files will be updated,
1414
This file is updated if properties in NICResourceCounts are added, updated or deleted.
1515

1616
- `internal/telemetry/data_attributes_generated.go`
17-
This file is update if properties of the Data struct in the [telemetry-exporter](https://github.com/nginxinc/telemetry-exporter) library are added, updated or deleted.
17+
This file is update if properties of the Data struct in the [telemetry-exporter](https://github.com/nginx/telemetry-exporter) library are added, updated or deleted.
1818

1919
- `internal/telemetry/data.avdl`
2020
This file is updated if either the NICResourceCounts or the Data struct is updated.
@@ -33,5 +33,5 @@ type NICResourceCounts struct {
3333

3434
2. An existing data point has been updated or delete
3535

36-
This may either be a data point under `NICResourceCounts`, or a field in the common `Data` struct in [telemetry-exporter](https://github.com/nginxinc/telemetry-exporter) library.
36+
This may either be a data point under `NICResourceCounts`, or a field in the common `Data` struct in [telemetry-exporter](https://github.com/nginx/telemetry-exporter) library.
3737
For example, we may change the name of, or delete, `MyNewResources` used in the first example.

0 commit comments

Comments
 (0)