Skip to content

Commit

Permalink
Add semconvutil and use it instead of httpconv and netconv (#3817)
Browse files Browse the repository at this point in the history
* Add semconvutil based on semconv/v1.18.0

* semconv v1.17.0

* otelrestful: Reuse semconvutil

* otelgin: Reuse semconvutil

* Fix imports

* otelmux: Reuse semconvutil

* otelecho: Reuse semconvutil

* otelmacaron: Reuse semconvutil

* otelhttptrace: Reuse semconvutil

* otelhttp: Reuse semconvutil

* Fix build

* Update readme

* Add doc that code is copied

* Fix wording

* Revert Makefile

* Regenerate

* Use gotmpl instead of cp

* Fix netconv.go.tmpl

* Update dependabot.yml

* go mod tidy

* Remove internal/shared from versions.yaml

* Remove doc.go.tmpl
  • Loading branch information
pellared committed May 25, 2023
1 parent 849072e commit e9956ff
Show file tree
Hide file tree
Showing 54 changed files with 13,754 additions and 31 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ generate: go-generate vanity-import-fix
.PHONY: go-generate
go-generate: $(OTEL_GO_MOD_DIRS:%=go-generate/%)
go-generate/%: DIR=$*
go-generate/%: | $(STRINGER) $(PORTO)
go-generate/%: | $(STRINGER) $(GOTMPL)
@echo "$(GO) generate $(DIR)/..." \
&& cd $(DIR) \
&& PATH="$(TOOLS):$${PATH}" $(GO) generate ./...
Expand Down Expand Up @@ -148,7 +148,7 @@ lint: go-mod-tidy golangci-lint misspell
.PHONY: license-check
license-check:
@licRes=$$(for f in $$(find . -type f \( -iname '*.go' -o -iname '*.sh' \) ! -path './vendor/*' ! -path './exporters/otlp/internal/opentelemetry-proto/*') ; do \
awk '/Copyright The OpenTelemetry Authors|generated|GENERATED/ && NR<=3 { found=1; next } END { if (!found) print FILENAME }' $$f; \
awk '/Copyright The OpenTelemetry Authors|generated|GENERATED/ && NR<=4 { found=1; next } END { if (!found) print FILENAME }' $$f; \
done); \
if [ -n "$${licRes}" ]; then \
echo "license header checking failed:"; echo "$${licRes}"; \
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright The OpenTelemetry Authors
//
// 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
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package semconvutil // import "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful/internal/semconvutil"

// Generate semconvutil package:
//go:generate gotmpl --body=../../../../../../../internal/shared/semconvutil/httpconv_test.go.tmpl "--data={}" --out=httpconv_test.go
//go:generate gotmpl --body=../../../../../../../internal/shared/semconvutil/httpconv.go.tmpl "--data={}" --out=httpconv.go
//go:generate gotmpl --body=../../../../../../../internal/shared/semconvutil/netconv_test.go.tmpl "--data={}" --out=netconv_test.go
//go:generate gotmpl --body=../../../../../../../internal/shared/semconvutil/netconv.go.tmpl "--data={}" --out=netconv.go
Loading

0 comments on commit e9956ff

Please sign in to comment.