Update from nginxinc to nginx (#333)

.github/PULL_REQUEST_TEMPLATE.md

@@ -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

.github/workflows/dependency-review.yml

@@ -17,4 +17,4 @@ jobs:
       - name: "Dependency Review"
         uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
         with:
-          config-file: "nginxinc/k8s-common/dependency-review-config.yml@main"
+          config-file: "nginx/k8s-common/dependency-review-config.yml@main"

.github/workflows/labeler.yml

@@ -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:

CODEOWNERS

@@ -1 +1 @@
-* @nginxinc/integrations
+* @nginx/integrations

CONTRIBUTING.md

@@ -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.
 

README.md

@@ -1,29 +1,29 @@
 <!-- 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
 
 If you experience issues with this project, please [open a bug][bug] in
 GitHub. If you have any suggestions or feature requests, please [open an idea][idea] on GitHub discussions.
 
-You can  contact us directly via [email protected] or on the [NGINX Community Slack][slack] in
+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
+[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
 [slack]: https://nginxcommunity.slack.com/channels/kubernetes
 
 ## Contributing

cmd/generator/code.go

@@ -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()

cmd/generator/code_test.go

@@ -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) {
@@ -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"},
 	}
 

cmd/generator/parser.go

@@ -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)
 
@@ -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).

cmd/generator/parser_test.go

@@ -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 {
@@ -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",
 		},
 		{
@@ -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",
 		},
 		{
@@ -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"},
 	}
 
@@ -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,
 	}
 

cmd/generator/scheme_test.go

@@ -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) {
@@ -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"},
 	}
 

cmd/generator/tests/data.go

@@ -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.

cmd/generator/tests/data_attributes_generated.go

@@ -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 {

cmd/generator/tests/data_test.go

@@ -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) {

cmd/generator/tests/subtests/anotherdata.go

@@ -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.

cmd/generator/tests/subtests/anotherdata_attributes_generated.go

@@ -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 {

cmd/generator/tests/telemetry/moredata.go

@@ -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

cmd/generator/tests/telemetry/moredata_attributes_generated.go

@@ -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 {

go.mod

@@ -1,4 +1,4 @@
-module github.com/nginxinc/telemetry-exporter
+module github.com/nginx/telemetry-exporter
 
 go 1.23.0
 

pkg/telemetry/exporter.go

@@ -13,7 +13,7 @@ import (
 
 // Data defines common telemetry data points for NGINX Kubernetes-related projects.
 //
-//go:generate go run -tags=generator github.com/nginxinc/telemetry-exporter/cmd/generator -type Data
+//go:generate go run -tags=generator github.com/nginx/telemetry-exporter/cmd/generator -type Data
 type Data struct {
 	// ProjectName is the name of the project.
 	ProjectName string

pkg/telemetry/exporter_test.go

@@ -9,8 +9,8 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 
-	"github.com/nginxinc/telemetry-exporter/pkg/telemetry"
-	"github.com/nginxinc/telemetry-exporter/pkg/telemetry/telemetryfakes"
+	"github.com/nginx/telemetry-exporter/pkg/telemetry"
+	"github.com/nginx/telemetry-exporter/pkg/telemetry/telemetryfakes"
 )
 
 type exportableData struct {

release-process.md

@@ -21,15 +21,15 @@ The project follows [Semantic Versioning](https://semver.org/) for versioning.
 ## Release Planning and Development
 
 The features that will go into the next release are reflected in the
-corresponding [milestone](https://github.com/nginxinc/telemetry-exporter/milestones). Refer to
+corresponding [milestone](https://github.com/nginx/telemetry-exporter/milestones). Refer to
 the [Issue Lifecycle](/ISSUE_LIFECYCLE.md) document for information on issue creation and assignment to releases.
 
 ## Releasing a New Version
 
 1. Create an issue to define and track release-related activities. Choose a title that follows the
    format `Release X.Y.Z`.
 2. Stop merging any new work into the main branch.
-3. Check the release draft under the [GitHub releases](https://github.com/nginxinc/telemetry-exporter/releases) page to ensure that everything is in order.
+3. Check the release draft under the [GitHub releases](https://github.com/nginx/telemetry-exporter/releases) page to ensure that everything is in order.
 4. Create and push the release tag in the format `vX.Y.Z`:
 
     ```bash

renovate.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "github>nginxinc/k8s-common"
+    "github>nginx/k8s-common"
   ]
 }

tests/exporter_test.go

@@ -16,7 +16,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
 
-	"github.com/nginxinc/telemetry-exporter/pkg/telemetry"
+	"github.com/nginx/telemetry-exporter/pkg/telemetry"
 )
 
 type telemetryData struct {

tests/go.mod

@@ -1,12 +1,12 @@
-module github.com/nginxinc/telemetry-exporter/tests
+module github.com/nginx/telemetry-exporter/tests
 
 go 1.23.0
 
-replace github.com/nginxinc/telemetry-exporter => ../
+replace github.com/nginx/telemetry-exporter => ../
 
 require (
 	github.com/go-logr/logr v1.4.2
-	github.com/nginxinc/telemetry-exporter v0.0.0
+	github.com/nginx/telemetry-exporter v0.0.0
 	github.com/onsi/ginkgo/v2 v2.22.2
 	github.com/onsi/gomega v1.36.2
 	github.com/testcontainers/testcontainers-go v0.34.0