Skip to content

Commit 75a19d1

Browse files
MrAliasAneurysm9hanyuancheung
authored
Generate semconv/v1.14.0 (#3566)
* Update semconv cmd in Makefile Fixes the template render for new upstream semantic conventions yaml. * Fix semconvkit to ensure dest dir * Generate v1.14.0 semconv package * Add changes to changelog * Update Makefile Co-authored-by: Anthony Mirabella <[email protected]> * Revert removal of -p * Update go.opentelemetry.io/build-tools/* Co-authored-by: Anthony Mirabella <[email protected]> Co-authored-by: Chester Cheung <[email protected]>
1 parent 1f9cc30 commit 75a19d1

File tree

13 files changed

+3210
-90
lines changed

13 files changed

+3210
-90
lines changed

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
1717
- Add `Producer` interface and `Reader.RegisterProducer(Producer)` to `go.opentelemetry.io/otel/sdk/metric` to enable external metric Producers. (#3524)
1818
- Add the `Callback` function type to the `go.opentelemetry.io/otel/metric` package.
1919
This new named function type is registered with a `Meter`. (#3564)
20+
- Add the `go.opentelemetry.io/otel/semconv/v1.14.0` package.
21+
The package contains semantic conventions from the `v1.14.0` version of the OpenTelemetry specification. (#3566)
2022
- Add the `go.opentelemetry.io/otel/semconv/v1.13.0` package.
2123
The package contains semantic conventions from the `v1.13.0` version of the OpenTelemetry specification. (#3499)
2224
- The `EndUserAttributesFromHTTPRequest` function in `go.opentelemetry.io/otel/semconv/v1.12.0` is merged into `ClientRequest` and `ServerRequest` in `go.opentelemetry.io/otel/semconv/v1.13.0/httpconv`.

‎Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,11 @@ check-clean-work-tree:
208208
SEMCONVPKG ?= "semconv/"
209209
.PHONY: semconv-generate
210210
semconv-generate: | $(SEMCONVGEN) $(SEMCONVKIT)
211-
@[ "$(TAG)" ] || ( echo "TAG unset: missing opentelemetry specification tag"; exit 1 )
212-
@[ "$(OTEL_SPEC_REPO)" ] || ( echo "OTEL_SPEC_REPO unset: missing path to opentelemetry specification repo"; exit 1 )
213-
@$(SEMCONVGEN) -i "$(OTEL_SPEC_REPO)/semantic_conventions/trace" -t "$(SEMCONVPKG)/template.j2" -s "$(TAG)"
214-
@$(SEMCONVGEN) -i "$(OTEL_SPEC_REPO)/semantic_conventions/resource" -t "$(SEMCONVPKG)/template.j2" -s "$(TAG)"
215-
@$(SEMCONVKIT) -output "$(SEMCONVPKG)/$(TAG)" -tag "$(TAG)"
211+
[ "$(TAG)" ] || ( echo "TAG unset: missing opentelemetry specification tag"; exit 1 )
212+
[ "$(OTEL_SPEC_REPO)" ] || ( echo "OTEL_SPEC_REPO unset: missing path to opentelemetry specification repo"; exit 1 )
213+
$(SEMCONVGEN) -i "$(OTEL_SPEC_REPO)/semantic_conventions/." --only=span -p conventionType=trace -p conventionType=trace -f trace.go -t "$(SEMCONVPKG)/template.j2" -s "$(TAG)"
214+
$(SEMCONVGEN) -i "$(OTEL_SPEC_REPO)/semantic_conventions/." --only=resource -p conventionType=resource -p conventionType=resource -f resource.go -t "$(SEMCONVPKG)/template.j2" -s "$(TAG)"
215+
$(SEMCONVKIT) -output "$(SEMCONVPKG)/$(TAG)" -tag "$(TAG)"
216216

217217
.PHONY: prerelease
218218
prerelease: | $(MULTIMOD)

‎internal/tools/go.mod

+26-23
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ require (
99
github.com/itchyny/gojq v0.12.11
1010
github.com/jcchavezs/porto v0.4.0
1111
github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad
12-
go.opentelemetry.io/build-tools/crosslink v0.3.0
13-
go.opentelemetry.io/build-tools/dbotconf v0.3.0
14-
go.opentelemetry.io/build-tools/multimod v0.3.0
15-
go.opentelemetry.io/build-tools/semconvgen v0.3.0
16-
golang.org/x/tools v0.4.0
12+
go.opentelemetry.io/build-tools/crosslink v0.4.0
13+
go.opentelemetry.io/build-tools/dbotconf v0.4.0
14+
go.opentelemetry.io/build-tools/multimod v0.4.0
15+
go.opentelemetry.io/build-tools/semconvgen v0.4.0
16+
golang.org/x/tools v0.5.0
1717
)
1818

1919
require (
@@ -25,9 +25,9 @@ require (
2525
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
2626
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
2727
github.com/Masterminds/semver v1.5.0 // indirect
28-
github.com/Microsoft/go-winio v0.4.16 // indirect
28+
github.com/Microsoft/go-winio v0.6.0 // indirect
2929
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
30-
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
30+
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
3131
github.com/acomagu/bufpipe v1.0.3 // indirect
3232
github.com/alexkohler/prealloc v1.0.0 // indirect
3333
github.com/alingse/asasalint v0.0.11 // indirect
@@ -43,11 +43,12 @@ require (
4343
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4444
github.com/charithe/durationcheck v0.0.9 // indirect
4545
github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
46+
github.com/cloudflare/circl v1.3.1 // indirect
4647
github.com/curioswitch/go-reassign v0.2.0 // indirect
4748
github.com/daixiang0/gci v0.8.1 // indirect
4849
github.com/davecgh/go-spew v1.1.1 // indirect
4950
github.com/denis-tingaikin/go-header v0.4.3 // indirect
50-
github.com/emirpasic/gods v1.12.0 // indirect
51+
github.com/emirpasic/gods v1.18.1 // indirect
5152
github.com/esimonov/ifshort v1.0.4 // indirect
5253
github.com/ettle/strcase v0.1.1 // indirect
5354
github.com/fatih/color v1.13.0 // indirect
@@ -57,8 +58,8 @@ require (
5758
github.com/fzipp/gocyclo v0.6.0 // indirect
5859
github.com/go-critic/go-critic v0.6.5 // indirect
5960
github.com/go-git/gcfg v1.5.0 // indirect
60-
github.com/go-git/go-billy/v5 v5.3.1 // indirect
61-
github.com/go-git/go-git/v5 v5.4.2 // indirect
61+
github.com/go-git/go-billy/v5 v5.4.0 // indirect
62+
github.com/go-git/go-git/v5 v5.5.2 // indirect
6263
github.com/go-toolsmith/astcast v1.0.0 // indirect
6364
github.com/go-toolsmith/astcopy v1.0.2 // indirect
6465
github.com/go-toolsmith/astequal v1.0.3 // indirect
@@ -90,15 +91,15 @@ require (
9091
github.com/hashicorp/go-version v1.6.0 // indirect
9192
github.com/hashicorp/hcl v1.0.0 // indirect
9293
github.com/hexops/gotextdiff v1.0.3 // indirect
93-
github.com/imdario/mergo v0.3.12 // indirect
94+
github.com/imdario/mergo v0.3.13 // indirect
9495
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9596
github.com/itchyny/timefmt-go v0.1.5 // indirect
9697
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
9798
github.com/jgautheron/goconst v1.5.1 // indirect
9899
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
99100
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
100101
github.com/julz/importas v0.1.0 // indirect
101-
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
102+
github.com/kevinburke/ssh_config v1.2.0 // indirect
102103
github.com/kisielk/errcheck v1.6.2 // indirect
103104
github.com/kisielk/gotool v1.0.0 // indirect
104105
github.com/kkHAIKE/contextcheck v1.1.3 // indirect
@@ -109,7 +110,7 @@ require (
109110
github.com/ldez/tagliatelle v0.3.1 // indirect
110111
github.com/leonklingele/grouper v1.1.0 // indirect
111112
github.com/lufeee/execinquery v1.2.1 // indirect
112-
github.com/magiconair/properties v1.8.6 // indirect
113+
github.com/magiconair/properties v1.8.7 // indirect
113114
github.com/maratori/testableexamples v1.0.0 // indirect
114115
github.com/maratori/testpackage v1.1.0 // indirect
115116
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
@@ -128,8 +129,9 @@ require (
128129
github.com/nishanths/predeclared v0.2.2 // indirect
129130
github.com/olekukonko/tablewriter v0.0.5 // indirect
130131
github.com/pelletier/go-toml v1.9.5 // indirect
131-
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
132+
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
132133
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
134+
github.com/pjbgf/sha1cd v0.2.3 // indirect
133135
github.com/pkg/errors v0.9.1 // indirect
134136
github.com/pmezard/go-difflib v1.0.0 // indirect
135137
github.com/polyfloyd/go-errorlint v1.0.5 // indirect
@@ -148,15 +150,16 @@ require (
148150
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
149151
github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect
150152
github.com/securego/gosec/v2 v2.13.1 // indirect
151-
github.com/sergi/go-diff v1.1.0 // indirect
153+
github.com/sergi/go-diff v1.2.0 // indirect
152154
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
153155
github.com/sirupsen/logrus v1.9.0 // indirect
154156
github.com/sivchari/containedctx v1.0.2 // indirect
155157
github.com/sivchari/nosnakecase v1.7.0 // indirect
156158
github.com/sivchari/tenv v1.7.0 // indirect
159+
github.com/skeema/knownhosts v1.1.0 // indirect
157160
github.com/sonatard/noctx v0.0.1 // indirect
158161
github.com/sourcegraph/go-diff v0.6.1 // indirect
159-
github.com/spf13/afero v1.9.2 // indirect
162+
github.com/spf13/afero v1.9.3 // indirect
160163
github.com/spf13/cast v1.5.0 // indirect
161164
github.com/spf13/cobra v1.6.1 // indirect
162165
github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -176,22 +179,22 @@ require (
176179
github.com/ultraware/funlen v0.0.3 // indirect
177180
github.com/ultraware/whitespace v0.0.5 // indirect
178181
github.com/uudashr/gocognit v1.0.6 // indirect
179-
github.com/xanzy/ssh-agent v0.3.0 // indirect
182+
github.com/xanzy/ssh-agent v0.3.3 // indirect
180183
github.com/yagipy/maintidx v1.0.0 // indirect
181184
github.com/yeya24/promlinter v0.2.0 // indirect
182185
gitlab.com/bosi/decorder v0.2.3 // indirect
183-
go.opentelemetry.io/build-tools v0.3.0 // indirect
186+
go.opentelemetry.io/build-tools v0.4.0 // indirect
184187
go.uber.org/atomic v1.10.0 // indirect
185-
go.uber.org/multierr v1.8.0 // indirect
188+
go.uber.org/multierr v1.9.0 // indirect
186189
go.uber.org/zap v1.24.0 // indirect
187-
golang.org/x/crypto v0.1.0 // indirect
190+
golang.org/x/crypto v0.5.0 // indirect
188191
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
189192
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
190193
golang.org/x/mod v0.7.0 // indirect
191-
golang.org/x/net v0.3.0 // indirect
194+
golang.org/x/net v0.5.0 // indirect
192195
golang.org/x/sync v0.1.0 // indirect
193-
golang.org/x/sys v0.3.0 // indirect
194-
golang.org/x/text v0.5.0 // indirect
196+
golang.org/x/sys v0.4.0 // indirect
197+
golang.org/x/text v0.6.0 // indirect
195198
google.golang.org/protobuf v1.28.1 // indirect
196199
gopkg.in/ini.v1 v1.67.0 // indirect
197200
gopkg.in/warnings.v0 v0.1.2 // indirect

0 commit comments

Comments
 (0)