Skip to content
Merged
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
10 changes: 5 additions & 5 deletions Makefile.Common
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,11 @@ BUILD_TYPE?=release
# All source code and documents. Used in spell check.
ALL_SRC_AND_DOC_CMD := find . -name "*.md" -o -name "*.go" -o -name "*.yaml" -not -path '*/third_party/*' -type f | sort


ADDLICENSE_CMD := $(ADDLICENSE) -s=only -y "" -c "The OpenTelemetry Authors"

# All source code and .sh files (evaluated when used)
ALL_SRC_AND_SHELL = $(shell find . -type f \( -iname '*.go' -o -iname "*.sh" \) ! -path '**/third_party/*' | sort)

pwd:
@pwd

Expand Down Expand Up @@ -157,8 +159,7 @@ benchmark: $(GOTESTSUM)

.PHONY: addlicense
addlicense: $(ADDLICENSE)
ALL_SRC_AND_SHELL := find . -type f \( -iname '*.go' -o -iname "*.sh" \) ! -path '**/third_party/*' | sort
@ADDLICENSEOUT=$$(for f in $$($(ALL_SRC_AND_SHELL)); do \
@ADDLICENSEOUT=$$(for f in $(ALL_SRC_AND_SHELL); do \
`$(ADDLICENSE_CMD) "$$f" 2>&1`; \
done); \
if [ "$$ADDLICENSEOUT" ]; then \
Expand All @@ -171,8 +172,7 @@ addlicense: $(ADDLICENSE)

.PHONY: checklicense
checklicense: $(ADDLICENSE)
ALL_SRC_AND_SHELL := find . -type f \( -iname '*.go' -o -iname "*.sh" \) ! -path '**/third_party/*' | sort
@licRes=$$(for f in $$($(ALL_SRC_AND_SHELL)); do \
@licRes=$$(for f in $(ALL_SRC_AND_SHELL); do \
awk '/Copyright The OpenTelemetry Authors|generated|GENERATED/ && NR<=3 { found=1; next } END { if (!found) print FILENAME }' $$f; \
awk '/SPDX-License-Identifier: Apache-2.0|generated|GENERATED/ && NR<=4 { found=1; next } END { if (!found) print FILENAME }' $$f; \
$(ADDLICENSE_CMD) -check "$$f" 2>&1 || echo "$$f"; \
Expand Down
3 changes: 3 additions & 0 deletions cmd/telemetrygen/pkg/metrics/aggregation_temporality.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package metrics

import (
Expand Down
1 change: 1 addition & 0 deletions receiver/faroreceiver/config.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package faroreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver"
Expand Down
3 changes: 3 additions & 0 deletions receiver/faroreceiver/reciever.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package faroreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver"

import (
Expand Down
3 changes: 3 additions & 0 deletions testbed/testbed/load_generator_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package testbed

import (
Expand Down