Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 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
3 changes: 3 additions & 0 deletions .github/actions/gh-metrics.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

import {Octokit} from "@octokit/action";
import * as fs from 'fs';
import * as path from 'path';
Expand Down
14 changes: 11 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ TOOLS_PKG_NAMES := $(shell grep -E $(TOOLS_MOD_REGEX) < $(TOOLS_MOD_DIR)/tools.g
TOOLS_BIN_NAMES := $(addprefix $(TOOLS_BIN_DIR)/, $(notdir $(shell echo $(TOOLS_PKG_NAMES))))
GO_LICENCE_DETECTOR := $(TOOLS_BIN_DIR)/go-licence-detector
GO_LICENCE_DETECTOR_CONFIG := $(SRC_ROOT)/internal/assets/license/rules.json
NRLICENSE := $(TOOLS_BIN_DIR)/nrlicense

DISTRIBUTIONS ?= "nrdot-collector-host,nrdot-collector-k8s,nrdot-collector,nrdot-collector-experimental"

Expand Down Expand Up @@ -145,15 +146,22 @@ $(TOOLS_BIN_DIR):
$(TOOLS_BIN_NAMES): $(TOOLS_BIN_DIR) $(TOOLS_MOD_DIR)/go.mod
cd $(TOOLS_MOD_DIR) && $(GOCMD) build -o $@ -trimpath $(filter %/$(notdir $@),$(TOOLS_PKG_NAMES))

FILENAME?=$(shell git branch --show-current)
# postinstall.sh, preinstall.sh, and preremove.sh have OTel headers which would be overwritten were they not excluded.
HEADER_GEN_FILES=$(shell find $(SRC_ROOT)/. -type f \( -name '*.go' -o -name '*.js' -o -name '*.sh' \) ! -name 'pre*' ! -name 'post*')
NOTICE_OUTPUT?=THIRD_PARTY_NOTICES.md
FIRST_COMMIT_HASH=6451f322bfe1e62962d3d87b50d785de8048e865

.PHONY: licenses
licenses: go generate-sources $(GO_LICENCE_DETECTOR)
licenses: go generate-sources $(GO_LICENCE_DETECTOR) $(NRLICENSE)
@./scripts/licenses.sh -d "${DISTRIBUTIONS}" -b ${GO_LICENCE_DETECTOR} -n ${NOTICE_OUTPUT} -g ${GO}
@$(NRLICENSE) --fix --fork-commit ${FIRST_COMMIT_HASH} ${HEADER_GEN_FILES}

.PHONY: headers-check
headers-check: $(NRLICENSE)
@$(NRLICENSE) --check --fork-commit ${FIRST_COMMIT_HASH} ${HEADER_GEN_FILES}

.PHONY: licenses-check
licenses-check: licenses
licenses-check: headers-check licenses
Copy link
Contributor Author

@agarvin-nr agarvin-nr Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the moment, this checks for the entire repo's license headers in every distribution's CI run. This check doesn't seem to add very much time, but I'm not sure if we'd want to make a separate workflow for this sort of repo-level validation.

@git diff --name-only | grep -q $(NOTICE_OUTPUT) \
&& { \
echo "Third party notices out of date, please run \"make licenses\" and commit the changes in this PR.";\
Expand Down
3 changes: 3 additions & 0 deletions cmd/goreleaser/internal/configure.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
Expand Down
3 changes: 3 additions & 0 deletions cmd/goreleaser/main.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
Expand Down
3 changes: 2 additions & 1 deletion cmd/nrdot-collector-builder/cmd/manifest.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Copyright 2025 New Relic Corporation. All rights reserved.
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package cmd

import (
Expand Down
3 changes: 2 additions & 1 deletion cmd/nrdot-collector-builder/cmd/manifest/update.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Copyright 2025 New Relic Corporation. All rights reserved.
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package manifest

import (
Expand Down
3 changes: 2 additions & 1 deletion cmd/nrdot-collector-builder/cmd/manifest/update_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Copyright 2025 New Relic Corporation. All rights reserved.
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package manifest

import (
Expand Down
3 changes: 2 additions & 1 deletion cmd/nrdot-collector-builder/cmd/root.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Copyright 2025 New Relic Corporation. All rights reserved.
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package cmd

import (
Expand Down
3 changes: 2 additions & 1 deletion cmd/nrdot-collector-builder/internal/manifest/config.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Copyright 2025 New Relic Corporation. All rights reserved.
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package manifest

import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Copyright 2025 New Relic Corporation. All rights reserved.
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package manifest

import (
Expand Down
3 changes: 2 additions & 1 deletion cmd/nrdot-collector-builder/internal/manifest/main.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Copyright 2025 New Relic Corporation. All rights reserved.
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package manifest

import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Copyright 2025 New Relic Corporation. All rights reserved.
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package manifest

import (
Expand Down
3 changes: 2 additions & 1 deletion cmd/nrdot-collector-builder/main.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Copyright 2025 New Relic Corporation. All rights reserved.
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package main

import "newrelic-collector-builder/cmd"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Third Party Notices

The New Relic infrastructure agent uses source code from third party libraries which carry their own copyright notices
New Relic Distributions of Open Telemetry use source code from third party libraries which carry their own copyright notices
and license terms. These notices are provided below.

In the event that a required notice is missing or incorrect, please notify us by e-mailing
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Third Party Notices

The New Relic infrastructure agent uses source code from third party libraries which carry their own copyright notices
New Relic Distributions of Open Telemetry use source code from third party libraries which carry their own copyright notices
and license terms. These notices are provided below.

In the event that a required notice is missing or incorrect, please notify us by e-mailing
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/bin/bash
# Copyright New Relic, Inc. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

set -e
yq --version | grep -E -q '4\.[0-9]+\.[0-9]+' ||
{ echo $? && echo "yq version 4.x.x is expected, but was '$(yq --version)'"; exit 1; }
Expand Down
2 changes: 1 addition & 1 deletion distributions/nrdot-collector-k8s/THIRD_PARTY_NOTICES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Third Party Notices

The New Relic infrastructure agent uses source code from third party libraries which carry their own copyright notices
New Relic Distributions of Open Telemetry use source code from third party libraries which carry their own copyright notices
and license terms. These notices are provided below.

In the event that a required notice is missing or incorrect, please notify us by e-mailing
Expand Down
2 changes: 1 addition & 1 deletion distributions/nrdot-collector/THIRD_PARTY_NOTICES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Third Party Notices

The New Relic infrastructure agent uses source code from third party libraries which carry their own copyright notices
New Relic Distributions of Open Telemetry use source code from third party libraries which carry their own copyright notices
and license terms. These notices are provided below.

In the event that a required notice is missing or incorrect, please notify us by e-mailing
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/bin/bash
# Copyright New Relic, Inc. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

set -e
yq --version | grep -E -q '4\.[0-9]+\.[0-9]+' ||
{ echo $? && echo "yq version 4.x.x is expected, but was '$(yq --version)'"; exit 1; }
Expand Down
3 changes: 3 additions & 0 deletions fips/fips.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

//go:build goexperiment.boringcrypto

package main
Expand Down
3 changes: 3 additions & 0 deletions fips/validation/validate.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/bin/bash
# Copyright New Relic, Inc. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

set -euo pipefail

# Colors
Expand Down
2 changes: 1 addition & 1 deletion internal/assets/license/THIRD_PARTY_NOTICES.md.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Distributed under the following license(s):

# Third Party Notices

The New Relic infrastructure agent uses source code from third party libraries which carry their own copyright notices
New Relic Distributions of Open Telemetry use source code from third party libraries which carry their own copyright notices
and license terms. These notices are provided below.

In the event that a required notice is missing or incorrect, please notify us by e-mailing
Expand Down
12 changes: 7 additions & 5 deletions internal/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
module github.com/newrelic/nrdot-collector-releases/internal/tools

go 1.23
go 1.24.0

require go.elastic.co/go-licence-detector v0.7.0
toolchain go1.24.6

require (
github.com/newrelic/nrdot-collector-components/cmd/nrlicense v0.142.1
go.elastic.co/go-licence-detector v0.7.0
)

require (
github.com/cyphar/filepath-securejoin v0.4.0 // indirect
github.com/gobuffalo/here v0.6.7 // indirect
github.com/google/licenseclassifier v0.0.0-20250108172508-0c3884c4cd43 // indirect
github.com/karrick/godirwalk v1.15.6 // indirect
github.com/markbates/pkger v0.17.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/sync v0.10.0 // indirect
Expand Down
51 changes: 5 additions & 46 deletions internal/tools/go.sum
Original file line number Diff line number Diff line change
@@ -1,80 +1,39 @@
github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo=
github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
github.com/cyphar/filepath-securejoin v0.4.0 h1:PioTG9TBRSApBpYGnDU8HC+miIsX8vitBH9LGNNMoLQ=
github.com/cyphar/filepath-securejoin v0.4.0/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI=
github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
github.com/gobuffalo/here v0.6.7 h1:hpfhh+kt2y9JLDfhYUxxCRxQol540jsVfKUZzjlbp8o=
github.com/gobuffalo/here v0.6.7/go.mod h1:vuCfanjqckTuRlqAitJz6QC4ABNnS27wLb816UhsPcc=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0 h1:OggOMmdI0JLwg1FkOKH9S7fVHF0oEm8PX6S8kAdpOps=
github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M=
github.com/google/licenseclassifier v0.0.0-20250108172508-0c3884c4cd43 h1:KvqPipDBTmDrRe6gLp1+7YXKVIbd6z1Y3AI4hautrV0=
github.com/google/licenseclassifier v0.0.0-20250108172508-0c3884c4cd43/go.mod h1:jkYIPv59uiw+1MxTWlqQEKebsUDV1DCXQtBBn5lVzf4=
github.com/google/licenseclassifier/v2 v2.0.0-alpha.1/go.mod h1:YAgBGGTeNDMU+WfIgaFvjZe4rudym4f6nIn8ZH5X+VM=
github.com/karrick/godirwalk v1.15.6 h1:Yf2mmR8TJy+8Fa0SuQVto5SYap6IF7lNVX4Jdl8G1qA=
github.com/karrick/godirwalk v1.15.6/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/markbates/pkger v0.17.0 h1:RFfyBPufP2V6cddUyyEVSHBpaAnM1WzaMNyqomeT+iY=
github.com/markbates/pkger v0.17.0/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/newrelic/nrdot-collector-components/cmd/nrlicense v0.142.1 h1:zrBmD440d50i08rul3CjOtrPbNLY7Pc4TUzZlBnjXWk=
github.com/newrelic/nrdot-collector-components/cmd/nrlicense v0.142.1/go.mod h1:nytHD5jP79MOGsgH7myQtXWpM+tKTsR9KYOIheODlPk=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
go.elastic.co/go-licence-detector v0.6.0 h1:QJ+cUIHC0JpxEKgp5Bj0pabEiOOt9H1O9CCcUNe6yRQ=
go.elastic.co/go-licence-detector v0.6.0/go.mod h1:fSJQU8au4SAgDK+UQFbgUPsXKYNBDv4E/dwWevrMpXU=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
go.elastic.co/go-licence-detector v0.7.0 h1:qC31sfyfNcNx/zMYcLABU0ac3MbGHZgksCAb5lMDUMg=
go.elastic.co/go-licence-detector v0.7.0/go.mod h1:f5ty8pjynzQD8BcS+s0qtlOGKc35/HKQxCVi8SHhV5k=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
3 changes: 2 additions & 1 deletion internal/tools/tools.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// Copyright New Relic Corporation. All rights reserved.
// Copyright New Relic, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

//go:build tools
// +build tools

package tools // import "github.com/newrelic/opentelemetry-collector-components/internal/tools"
import (
_ "github.com/newrelic/nrdot-collector-components/cmd/nrlicense"
_ "go.elastic.co/go-licence-detector"
)
2 changes: 2 additions & 0 deletions scripts/build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/bash
# Copyright New Relic, Inc. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

REPO_DIR="$( cd "$(dirname "$( dirname "${BASH_SOURCE[0]}" )")" &> /dev/null && pwd )"
BUILDER=''
Expand Down
3 changes: 3 additions & 0 deletions scripts/bump-component-versions.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/bin/bash
# Copyright New Relic, Inc. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

set -e

GO=''
Expand Down
3 changes: 3 additions & 0 deletions scripts/bump-nrdot-version.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/bin/bash
# Copyright New Relic, Inc. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

# Simple script to bump versions for new release to document all places that need to be updated
set -e
old_version=1.7.0
Expand Down
2 changes: 2 additions & 0 deletions scripts/generate-goreleaser.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/bash
# Copyright New Relic, Inc. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

GO=''

Expand Down
2 changes: 2 additions & 0 deletions scripts/get-core-component-version.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/bash
# Copyright New Relic, Inc. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

# This script validates that all manifest.yaml files in the distributions directory have the same version number.
# If they do, it prints the version number to stdout and exits with status 0.
Expand Down
3 changes: 3 additions & 0 deletions scripts/get-otel-collector-chart-version.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/bin/bash
# Copyright New Relic, Inc. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

REPO_DIR="$( cd "$(dirname "$( dirname "${BASH_SOURCE[0]}" )")" &> /dev/null && pwd )"

collector_component_version=$(${REPO_DIR}/scripts/get-core-component-version.sh)
Expand Down
2 changes: 2 additions & 0 deletions scripts/get-version.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/bash
# Copyright New Relic, Inc. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

# This script validates that all manifest.yaml files in the distributions directory have the same version number.
# If they do, it prints the version number to stdout and exits with status 0.
Expand Down
2 changes: 2 additions & 0 deletions scripts/licenses.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/bash
# Copyright New Relic, Inc. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

REPO_DIR="$( cd "$(dirname "$( dirname "${BASH_SOURCE[0]}" )")" &> /dev/null && pwd )"

Expand Down
5 changes: 4 additions & 1 deletion scripts/validate-goreleaser-build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/bin/bash
# Copyright New Relic, Inc. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

# Script to validate a goreleaser distribution's dist file
set -e

Expand Down Expand Up @@ -94,4 +97,4 @@ else
fi
done
echo "✅ Archives and Packages validated!"
fi
fi
Loading
Loading