Skip to content

Commit 6b705f9

Browse files
authored
[semconv] remove deprecated package (#13071)
This removes the deprecated semconv package along with the tooling used to regenerate the code Leaving this in draft for a few releases. Closes #10346, closes #11828, closes #11807 --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com>
1 parent ba3d734 commit 6b705f9

94 files changed

Lines changed: 25 additions & 57713 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: semconv
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Removing deprecated semconv package
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [13071]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []

.github/workflows/utils/cspell.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@
6363
"RCPC",
6464
"Rahul",
6565
"SASL",
66-
"SPECPATH",
67-
"SPECTAG",
6866
"Samplingdecision",
6967
"Sharma",
7068
"Statefulness",
@@ -209,7 +207,6 @@
209207
"gcflags",
210208
"genpdata",
211209
"genproto",
212-
"gensemconv",
213210
"godoc",
214211
"gofmt",
215212
"golangci",
@@ -381,7 +378,6 @@
381378
"scraperhelper",
382379
"scrapertest",
383380
"semconv",
384-
"semconvgen",
385381
"servicetelemetry",
386382
"servicetest",
387383
"servicez",

Makefile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -250,17 +250,6 @@ genpdata:
250250
pushd pdata/ && $(GOCMD) run ./internal/cmd/pdatagen/main.go && popd
251251
$(MAKE) fmt
252252

253-
# Generate semantic convention constants. Requires a clone of the opentelemetry-specification repo
254-
gensemconv: $(SEMCONVGEN) $(SEMCONVKIT)
255-
@[ "${SPECPATH}" ] || ( echo ">> env var SPECPATH is not set"; exit 1 )
256-
@[ "${SPECTAG}" ] || ( echo ">> env var SPECTAG is not set"; exit 1 )
257-
@echo "Generating semantic convention constants from specification version ${SPECTAG} at ${SPECPATH}"
258-
$(SEMCONVGEN) -o semconv/${SPECTAG} -t semconv/template.j2 -s ${SPECTAG} -i ${SPECPATH}/model/. --only=resource -p conventionType=resource -f generated_resource.go
259-
$(SEMCONVGEN) -o semconv/${SPECTAG} -t semconv/template.j2 -s ${SPECTAG} -i ${SPECPATH}/model/. --only=event -p conventionType=event -f generated_event.go
260-
$(SEMCONVGEN) -o semconv/${SPECTAG} -t semconv/template.j2 -s ${SPECTAG} -i ${SPECPATH}/model/. --only=span -p conventionType=trace -f generated_trace.go
261-
$(SEMCONVGEN) -o semconv/${SPECTAG} -t semconv/template.j2 -s ${SPECTAG} -i ${SPECPATH}/model/. --only=attribute_group -p conventionType=attribute_group -f generated_attribute_group.go
262-
$(SEMCONVKIT) -output "semconv/$(SPECTAG)" -tag "$(SPECTAG)"
263-
264253
INTERNAL_PROTO_SRC_DIRS := exporter/exporterhelper/internal/queuebatch/internal/persistentqueue
265254
# INTERNAL_PROTO_SRC_DIRS += path/to/other/proto/dirs
266255
INTERNAL_PROTO_FILES := $(foreach dir,$(INTERNAL_PROTO_SRC_DIRS),$(wildcard $(dir)/*.proto))

Makefile.Common

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ IMPI := $(TOOLS_BIN_DIR)/impi
4040
MISSPELL := $(TOOLS_BIN_DIR)/misspell
4141
MULTIMOD := $(TOOLS_BIN_DIR)/multimod
4242
PORTO := $(TOOLS_BIN_DIR)/porto
43-
SEMCONVGEN := $(TOOLS_BIN_DIR)/semconvgen
44-
SEMCONVKIT := $(TOOLS_BIN_DIR)/semconvkit
4543
GOTESTSUM := $(TOOLS_BIN_DIR)/gotestsum
4644

4745
.PHONY: install-tools

internal/tools/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ require (
1818
go.opentelemetry.io/build-tools/crosslink v0.23.1
1919
go.opentelemetry.io/build-tools/githubgen v0.23.1
2020
go.opentelemetry.io/build-tools/multimod v0.23.1
21-
go.opentelemetry.io/build-tools/semconvgen v0.23.1
2221
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
2322
golang.org/x/tools v0.33.0
2423
golang.org/x/vuln v1.1.4

internal/tools/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/tools/semconvkit/main.go

Lines changed: 0 additions & 70 deletions
This file was deleted.

internal/tools/semconvkit/templates/doc.go.tmpl

Lines changed: 0 additions & 9 deletions
This file was deleted.

internal/tools/semconvkit/templates/schema.go.tmpl

Lines changed: 0 additions & 9 deletions
This file was deleted.

internal/tools/tools.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,9 @@ import (
2424
_ "go.opentelemetry.io/build-tools/crosslink"
2525
_ "go.opentelemetry.io/build-tools/githubgen"
2626
_ "go.opentelemetry.io/build-tools/multimod"
27-
_ "go.opentelemetry.io/build-tools/semconvgen"
2827
_ "golang.org/x/exp/cmd/apidiff"
2928
_ "golang.org/x/tools/cmd/goimports"
3029
_ "golang.org/x/vuln/cmd/govulncheck"
3130
_ "gotest.tools/gotestsum"
3231
_ "mvdan.cc/gofumpt"
33-
34-
_ "go.opentelemetry.io/collector/internal/tools/semconvkit"
3532
)

0 commit comments

Comments
 (0)