Skip to content

Commit 4ca0f18

Browse files
authored
update semconv dependency to otelgo's semconv package (open-telemetry#12991)
This updates the calls to the collector's internal semconv package with otelgo's instead. The main difference is how the keys can be used, they will need to be cast as strings where they key name is needed, otherwise it's not a huge change. This would allow us to stop producing our own semconv package once contrib is moved as well. Related to open-telemetry#10346, open-telemetry#11828, open-telemetry#11807 --------- Signed-off-by: Alex Boten <[email protected]>
1 parent 5800834 commit 4ca0f18

File tree

22 files changed

+85
-75
lines changed

22 files changed

+85
-75
lines changed
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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: service
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Replace `go.opentelemetry.io/collector/semconv` usage with `go.opentelemetry.io/otel/semconv`"
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12991]
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: []

cmd/builder/internal/builder/main_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ var replaceModules = []string{
109109
"/receiver/receivertest",
110110
"/receiver/receiverhelper",
111111
"/receiver/xreceiver",
112-
"/semconv",
113112
"/service",
114113
"/service/hostcapabilities",
115114
}

cmd/mdatagen/go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
go.opentelemetry.io/collector/receiver/receivertest v0.125.0
2424
go.opentelemetry.io/collector/scraper v0.125.0
2525
go.opentelemetry.io/collector/scraper/scrapertest v0.125.0
26-
go.opentelemetry.io/collector/semconv v0.125.0
26+
go.opentelemetry.io/otel v1.35.0
2727
go.opentelemetry.io/otel/metric v1.35.0
2828
go.opentelemetry.io/otel/sdk/metric v1.35.0
2929
go.opentelemetry.io/otel/trace v1.35.0
@@ -66,7 +66,6 @@ require (
6666
go.opentelemetry.io/collector/processor/xprocessor v0.125.0 // indirect
6767
go.opentelemetry.io/collector/receiver/xreceiver v0.125.0 // indirect
6868
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
69-
go.opentelemetry.io/otel v1.35.0 // indirect
7069
go.opentelemetry.io/otel/log v0.11.0 // indirect
7170
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
7271
go.uber.org/multierr v1.11.0 // indirect
@@ -95,8 +94,6 @@ replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata
9594

9695
replace go.opentelemetry.io/collector/receiver => ../../receiver
9796

98-
replace go.opentelemetry.io/collector/semconv => ../../semconv
99-
10097
replace go.opentelemetry.io/collector/consumer => ../../consumer
10198

10299
replace go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/receivertest

cmd/mdatagen/internal/sampleconnector/internal/metadata/generated_metrics.go

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

cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_logs.go

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

cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go

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

cmd/mdatagen/internal/samplescraper/internal/metadata/generated_logs.go

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

cmd/mdatagen/internal/samplescraper/internal/metadata/generated_metrics.go

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

cmd/mdatagen/internal/templates/logs.go.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"go.opentelemetry.io/collector/{{ .Status.Class }}"
1111
{{- end }}
1212
{{- if .SemConvVersion }}
13-
conventions "go.opentelemetry.io/collector/semconv/v{{ .SemConvVersion }}"
13+
conventions "go.opentelemetry.io/otel/semconv/v{{ .SemConvVersion }}"
1414
{{- end }}
1515
)
1616

cmd/mdatagen/internal/templates/metrics.go.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"go.opentelemetry.io/collector/{{ .Status.Class }}"
1717
{{- end }}
1818
{{- if .SemConvVersion }}
19-
conventions "go.opentelemetry.io/collector/semconv/v{{ .SemConvVersion }}"
19+
conventions "go.opentelemetry.io/otel/semconv/v{{ .SemConvVersion }}"
2020
{{- end }}
2121
{{ if .ResourceAttributes -}}
2222
"go.opentelemetry.io/collector/filter"

0 commit comments

Comments
 (0)