Skip to content

Golang.org x tools 0.34 #448

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.

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ that issue here in this description (not in the title of the PR).

Before creating a PR, run through this checklist and mark each as complete.

- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/telemetry-exporter/blob/main/CONTRIBUTING.md) guide
- [ ] I have read the [CONTRIBUTING](https://github.com/nginx/telemetry-exporter/blob/main/CONTRIBUTING.md) guide
- [ ] I have proven my fix is effective or that my feature works
- [ ] I have checked that all unit tests pass after adding my changes
- [ ] I have ensured the README is up to date
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
- name: "Dependency Review"
uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # v4.4.0
with:
config-file: "nginxinc/k8s-common/dependency-review-config.yml@main"
config-file: "nginx/k8s-common/dependency-review-config.yml@main"
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
sparse-checkout: |
labeler.yml
sparse-checkout-cone-mode: false
repository: nginxinc/k8s-common
repository: nginx/k8s-common

- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
with:
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @nginxinc/integrations
* @nginx/integrations
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ considering contributing!

## Ask a Question

To ask a question please use [Github Discussions](https://github.com/nginxinc/telemetry-exporter/discussions).
To ask a question please use [Github Discussions](https://github.com/nginx/telemetry-exporter/discussions).

You can also join our [Community Slack](https://community.nginx.org/joinslack) which has a wider NGINX audience.

Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<!-- markdownlint-disable-next-line first-line-h1 -->
[![OpenSSFScorecard](https://api.securityscorecards.dev/projects/github.com/nginxinc/telemetry-exporter/badge)](https://scorecard.dev/viewer/?uri=github.com/nginxinc/telemetry-exporter)
[![CI](https://github.com/nginxinc/telemetry-exporter/actions/workflows/ci.yml/badge.svg)](https://github.com/nginxinc/telemetry-exporter/actions/workflows/ci.yml)
[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Ftelemetry-exporter.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Ftelemetry-exporter?ref=badge_shield)
[![Go Reference](https://pkg.go.dev/badge/github.com/nginxinc/telemetry-exporter.svg)](https://pkg.go.dev/github.com/nginxinc/telemetry-exporter)
[![Go Report Card](https://goreportcard.com/badge/github.com/nginxinc/telemetry-exporter)](https://goreportcard.com/report/github.com/nginxinc/telemetry-exporter)
![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/nginxinc/telemetry-exporter?logo=go)
[![OpenSSFScorecard](https://api.securityscorecards.dev/projects/github.com/nginx/telemetry-exporter/badge)](https://scorecard.dev/viewer/?uri=github.com/nginx/telemetry-exporter)
[![CI](https://github.com/nginx/telemetry-exporter/actions/workflows/ci.yml/badge.svg)](https://github.com/nginx/telemetry-exporter/actions/workflows/ci.yml)
[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginx%2Ftelemetry-exporter.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginx%2Ftelemetry-exporter?ref=badge_shield)
[![Go Reference](https://pkg.go.dev/badge/github.com/nginx/telemetry-exporter.svg)](https://pkg.go.dev/github.com/nginx/telemetry-exporter)
[![Go Report Card](https://goreportcard.com/badge/github.com/nginx/telemetry-exporter)](https://goreportcard.com/report/github.com/nginx/telemetry-exporter)
![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/nginx/telemetry-exporter?logo=go)
[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)

# Telemetry Exporter

This project is a library that exports product telemetry data to an F5-managed service.

It is used by [NGINX Ingress Controller](https://github.com/nginxinc/kubernetes-ingress)
and [NGINX Gateway Fabric](https://github.com/nginxinc/nginx-gateway-fabric) projects.
It is used by [NGINX Ingress Controller](https://github.com/nginx/kubernetes-ingress)
and [NGINX Gateway Fabric](https://github.com/nginx/nginx-gateway-fabric) projects.

## Contacts

Expand All @@ -22,9 +22,9 @@ GitHub. If you have any suggestions or feature requests, please [open an idea][i
You can contact us directly via [email protected] or on the [NGINX Community Slack][slack] in
the `#kubernetes` channel.

[bug]: https://github.com/nginxinc/telemetry-exporter/issues/new?assignees=&labels=&projects=&template=bug_report.md&title=
[idea]: https://github.com/nginxinc/telemetry-exporter/discussions/categories/ideas
[slack]: https://nginxcommunity.slack.com/channels/kubernetes
[bug]: https://github.com/nginx/telemetry-exporter/issues/new?assignees=&labels=&projects=&template=bug_report.md&title=
[idea]: https://github.com/nginx/telemetry-exporter/discussions/categories/ideas
[forum]: https://community.nginx.org

## Contributing

Expand Down
2 changes: 1 addition & 1 deletion cmd/generator/code.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"text/template"

"github.com/nginxinc/telemetry-exporter/pkg/telemetry"
"github.com/nginx/telemetry-exporter/pkg/telemetry"
)

var telemetryPackagePath = reflect.TypeOf((*telemetry.Exportable)(nil)).Elem().PkgPath()
Expand Down
4 changes: 2 additions & 2 deletions cmd/generator/code_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

. "github.com/onsi/gomega"

"github.com/nginxinc/telemetry-exporter/cmd/generator/tests"
"github.com/nginx/telemetry-exporter/cmd/generator/tests"
)

func TestGenerateCode(t *testing.T) {
Expand All @@ -18,7 +18,7 @@ func TestGenerateCode(t *testing.T) {
cfg := parsingConfig{
pkgName: "tests",
typeName: "Data",
loadPattern: "github.com/nginxinc/telemetry-exporter/cmd/generator/tests",
loadPattern: "github.com/nginx/telemetry-exporter/cmd/generator/tests",
buildFlags: []string{"-tags=generator"},
}

Expand Down
4 changes: 2 additions & 2 deletions cmd/generator/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func getDocStringKey(pkgName, typeName, fieldName string) string {

// getDocString returns the doc string comment for the field of the struct.
// fullTypeName is the full type name of the struct
// (e.g. "github.com/nginxinc/nginx-gateway-fabric/pkg/mypackage.MyStruct").
// (e.g. "github.com/nginx/nginx-gateway-fabric/pkg/mypackage.MyStruct").
func (p *docStringFieldsProvider) getDocString(fullTypeName, fieldName string) (string, error) {
pkgName, typeName := parseFullTypeName(fullTypeName)

Expand Down Expand Up @@ -155,7 +155,7 @@ type parsingConfig struct {
// typeName is the name of the struct.
typeName string
// loadPattern is the pattern to load the package.
// For example, "github.com/nginxinc/nginx-gateway-fabric/pkg/mypackage" or "."
// For example, "github.com/nginx/nginx-gateway-fabric/pkg/mypackage" or "."
// The path in the pattern is relative to the current working directory.
loadPattern string
// buildFlags are go build flags (e.g. -tags=foo).
Expand Down
10 changes: 5 additions & 5 deletions cmd/generator/parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

. "github.com/onsi/gomega"

"github.com/nginxinc/telemetry-exporter/cmd/generator/tests"
"github.com/nginx/telemetry-exporter/cmd/generator/tests"
)

type DataUnexportedBasicTypeField struct {
Expand Down Expand Up @@ -155,7 +155,7 @@ func TestParseErrors(t *testing.T) {
{
name: "unsupported slice type",
expectedErrMsg: "field Structs: type of field must be one of bool, float64, int64, string, " +
"got []github.com/nginxinc/telemetry-exporter/cmd/generator.SomeStruct",
"got []github.com/nginx/telemetry-exporter/cmd/generator.SomeStruct",
typeName: "UnsupportedSliceType",
},
{
Expand All @@ -166,7 +166,7 @@ func TestParseErrors(t *testing.T) {
{
name: "duplicate fields",
expectedErrMsg: "field Counter: already exists in " +
"github.com/nginxinc/telemetry-exporter/cmd/generator.DuplicateFields",
"github.com/nginx/telemetry-exporter/cmd/generator.DuplicateFields",
typeName: "DuplicateFields",
},
{
Expand Down Expand Up @@ -218,7 +218,7 @@ func TestParseSuccess(t *testing.T) {
cfg := parsingConfig{
pkgName: "tests",
typeName: "Data",
loadPattern: "github.com/nginxinc/telemetry-exporter/cmd/generator/tests",
loadPattern: "github.com/nginx/telemetry-exporter/cmd/generator/tests",
buildFlags: []string{"-tags=generator"},
}

Expand Down Expand Up @@ -367,7 +367,7 @@ func TestParseSuccess(t *testing.T) {
}

expectedResult := parsingResult{
packagePath: "github.com/nginxinc/telemetry-exporter/cmd/generator/tests",
packagePath: "github.com/nginx/telemetry-exporter/cmd/generator/tests",
fields: expectedFields,
}

Expand Down
4 changes: 2 additions & 2 deletions cmd/generator/scheme_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

. "github.com/onsi/gomega"

"github.com/nginxinc/telemetry-exporter/cmd/generator/tests"
"github.com/nginx/telemetry-exporter/cmd/generator/tests"
)

func TestGenerateScheme(t *testing.T) {
Expand All @@ -18,7 +18,7 @@ func TestGenerateScheme(t *testing.T) {
parseCfg := parsingConfig{
pkgName: "tests",
typeName: "Data",
loadPattern: "github.com/nginxinc/telemetry-exporter/cmd/generator/tests",
loadPattern: "github.com/nginx/telemetry-exporter/cmd/generator/tests",
buildFlags: []string{"-tags=generator"},
}

Expand Down
4 changes: 2 additions & 2 deletions cmd/generator/tests/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

package tests

import "github.com/nginxinc/telemetry-exporter/cmd/generator/tests/subtests"
import "github.com/nginx/telemetry-exporter/cmd/generator/tests/subtests"

// Data includes a field of each supported data type.
// We use this struct to test the generation of code and scheme.
// We also use it to test that the generated code compiles and runs as expected.
//
//go:generate go run -tags generator github.com/nginxinc/telemetry-exporter/cmd/generator -type=Data -build-tags=generator -scheme -scheme-protocol=NGFProductTelemetry -scheme-df-datatype=ngf-product-telemetry
//go:generate go run -tags generator github.com/nginx/telemetry-exporter/cmd/generator -type=Data -build-tags=generator -scheme -scheme-protocol=NGFProductTelemetry -scheme-df-datatype=ngf-product-telemetry
//nolint:govet // Disable fieldalignment linter (part of govet), to control the order of fields for better readability.
type Data struct {
// SomeString is a string field.
Expand Down
2 changes: 1 addition & 1 deletion cmd/generator/tests/data_attributes_generated.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This is a generated file. DO NOT EDIT.
import (
"go.opentelemetry.io/otel/attribute"

"github.com/nginxinc/telemetry-exporter/pkg/telemetry"
"github.com/nginx/telemetry-exporter/pkg/telemetry"
)

func (d *Data) Attributes() []attribute.KeyValue {
Expand Down
2 changes: 1 addition & 1 deletion cmd/generator/tests/data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
. "github.com/onsi/gomega"
"go.opentelemetry.io/otel/attribute"

"github.com/nginxinc/telemetry-exporter/cmd/generator/tests/subtests"
"github.com/nginx/telemetry-exporter/cmd/generator/tests/subtests"
)

func TestData_Attributes(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/generator/tests/subtests/anotherdata.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package subtests
// when generating code and scheme.
// AnotherData includes a field of each supported data type except an embedded struct.
//
//go:generate go run -tags generator github.com/nginxinc/telemetry-exporter/cmd/generator -type=AnotherData -build-tags=generator
//go:generate go run -tags generator github.com/nginx/telemetry-exporter/cmd/generator -type=AnotherData -build-tags=generator
//nolint:govet // Disable fieldalignment linter (part of govet), to control the order of fields for better readability.
type AnotherData struct {
// AnotherSomeString is a string field.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This is a generated file. DO NOT EDIT.
import (
"go.opentelemetry.io/otel/attribute"

"github.com/nginxinc/telemetry-exporter/pkg/telemetry"
"github.com/nginx/telemetry-exporter/pkg/telemetry"
)

func (d *AnotherData) Attributes() []attribute.KeyValue {
Expand Down
2 changes: 1 addition & 1 deletion cmd/generator/tests/telemetry/moredata.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package telemetry
// 'telemetry'.
// Correctness is confirmed by the fact the generated code compiles.
//
//go:generate go run -tags generator github.com/nginxinc/telemetry-exporter/cmd/generator -type=MoreData -build-tags=generator
//go:generate go run -tags generator github.com/nginx/telemetry-exporter/cmd/generator -type=MoreData -build-tags=generator
type MoreData struct {
// StringField is a string field.
StringField string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This is a generated file. DO NOT EDIT.
import (
"go.opentelemetry.io/otel/attribute"

ngxTelemetry "github.com/nginxinc/telemetry-exporter/pkg/telemetry"
ngxTelemetry "github.com/nginx/telemetry-exporter/pkg/telemetry"
)

func (d *MoreData) Attributes() []attribute.KeyValue {
Expand Down
52 changes: 27 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
module github.com/nginxinc/telemetry-exporter
module github.com/nginx/telemetry-exporter

go 1.23.0
go 1.24.4

require (
github.com/go-logr/logr v1.4.2
github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0
github.com/onsi/ginkgo/v2 v2.21.0
github.com/onsi/gomega v1.35.1
go.opentelemetry.io/otel v1.32.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0
go.opentelemetry.io/otel/sdk v1.32.0
golang.org/x/tools v0.26.0
github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2
github.com/onsi/ginkgo/v2 v2.23.4
github.com/onsi/gomega v1.37.0
go.opentelemetry.io/otel v1.35.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0
go.opentelemetry.io/otel/sdk v1.35.0
golang.org/x/tools v0.32.0
)

require (
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
go.opentelemetry.io/otel/metric v1.32.0 // indirect
go.opentelemetry.io/otel/trace v1.32.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
golang.org/x/mod v0.24.0 // indirect
golang.org/x/net v0.39.0 // indirect
golang.org/x/sync v0.13.0 // indirect
golang.org/x/sys v0.32.0 // indirect
golang.org/x/text v0.24.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250422160041-2d3770c4ea7f // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // indirect
google.golang.org/grpc v1.72.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading