diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2b28e67..b3060b0 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.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 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 3959740..deac9b8 100644 --- a/.github/workflows/dependency-review.yml +++ b/.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" diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 443756d..7d9e31d 100644 --- a/.github/workflows/labeler.yml +++ b/.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: diff --git a/CODEOWNERS b/CODEOWNERS index 77ed024..47d9e59 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @nginxinc/integrations +* @nginx/integrations diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 96e9748..dad4ee6 100644 --- a/CONTRIBUTING.md +++ b/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. diff --git a/README.md b/README.md index cff2fb5..06b0800 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,29 @@ -[![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 kubernetes@nginx.com or on the [NGINX Community Slack][slack] in +You can contact us directly via kubernetes@nginx.com 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 diff --git a/cmd/generator/code.go b/cmd/generator/code.go index 7d48d63..0a7adb0 100644 --- a/cmd/generator/code.go +++ b/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() diff --git a/cmd/generator/code_test.go b/cmd/generator/code_test.go index 483050f..bb9ac85 100644 --- a/cmd/generator/code_test.go +++ b/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"}, } diff --git a/cmd/generator/parser.go b/cmd/generator/parser.go index 69be2ab..7bda19b 100644 --- a/cmd/generator/parser.go +++ b/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). diff --git a/cmd/generator/parser_test.go b/cmd/generator/parser_test.go index f363f2c..52dedf6 100644 --- a/cmd/generator/parser_test.go +++ b/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, } diff --git a/cmd/generator/scheme_test.go b/cmd/generator/scheme_test.go index 0b88335..ee6d0f2 100644 --- a/cmd/generator/scheme_test.go +++ b/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"}, } diff --git a/cmd/generator/tests/data.go b/cmd/generator/tests/data.go index 68309c2..91522d4 100644 --- a/cmd/generator/tests/data.go +++ b/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. diff --git a/cmd/generator/tests/data_attributes_generated.go b/cmd/generator/tests/data_attributes_generated.go index 48658f4..ac51230 100644 --- a/cmd/generator/tests/data_attributes_generated.go +++ b/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 { diff --git a/cmd/generator/tests/data_test.go b/cmd/generator/tests/data_test.go index 87af25a..28aa7c1 100644 --- a/cmd/generator/tests/data_test.go +++ b/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) { diff --git a/cmd/generator/tests/subtests/anotherdata.go b/cmd/generator/tests/subtests/anotherdata.go index 51c6917..45b47c3 100644 --- a/cmd/generator/tests/subtests/anotherdata.go +++ b/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. diff --git a/cmd/generator/tests/subtests/anotherdata_attributes_generated.go b/cmd/generator/tests/subtests/anotherdata_attributes_generated.go index a442f49..28fc3c6 100644 --- a/cmd/generator/tests/subtests/anotherdata_attributes_generated.go +++ b/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 { diff --git a/cmd/generator/tests/telemetry/moredata.go b/cmd/generator/tests/telemetry/moredata.go index 79050b5..8637e77 100644 --- a/cmd/generator/tests/telemetry/moredata.go +++ b/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 diff --git a/cmd/generator/tests/telemetry/moredata_attributes_generated.go b/cmd/generator/tests/telemetry/moredata_attributes_generated.go index 8bcd678..fc4e70b 100644 --- a/cmd/generator/tests/telemetry/moredata_attributes_generated.go +++ b/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 { diff --git a/go.mod b/go.mod index fd042d6..09c81de 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/nginxinc/telemetry-exporter +module github.com/nginx/telemetry-exporter go 1.23.0 diff --git a/pkg/telemetry/exporter.go b/pkg/telemetry/exporter.go index d6632fc..797009b 100644 --- a/pkg/telemetry/exporter.go +++ b/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 diff --git a/pkg/telemetry/exporter_test.go b/pkg/telemetry/exporter_test.go index 7b5514f..6fe4731 100644 --- a/pkg/telemetry/exporter_test.go +++ b/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 { diff --git a/pkg/telemetry/telemetryfakes/fake_span_exporter.go b/pkg/telemetry/telemetryfakes/fake_span_exporter.go index 0fd25c7..ddfd197 100644 --- a/pkg/telemetry/telemetryfakes/fake_span_exporter.go +++ b/pkg/telemetry/telemetryfakes/fake_span_exporter.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + "github.com/nginx/telemetry-exporter/pkg/telemetry" "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/release-process.md b/release-process.md index ef1df85..9312d91 100644 --- a/release-process.md +++ b/release-process.md @@ -21,7 +21,7 @@ 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 @@ -29,7 +29,7 @@ the [Issue Lifecycle](/ISSUE_LIFECYCLE.md) document for information on issue cre 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 diff --git a/renovate.json b/renovate.json index a436d66..e70737f 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>nginxinc/k8s-common" + "github>nginx/k8s-common" ] } diff --git a/tests/exporter_test.go b/tests/exporter_test.go index 532e90f..1c77b88 100644 --- a/tests/exporter_test.go +++ b/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 { diff --git a/tests/go.mod b/tests/go.mod index 38ce220..ebf9e4f 100644 --- a/tests/go.mod +++ b/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