Skip to content

Commit b12ce10

Browse files
authored
[service] Update semantic conventions to v1.37.0 (#14232)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Update semantic conventions to v1.37.0 Relates to open-telemetry/opentelemetry-collector-contrib/pull/44606
1 parent b5aaf8e commit b12ce10

File tree

7 files changed

+39
-5
lines changed

7 files changed

+39
-5
lines changed

.chloggen/semconv-1.37.0.yaml

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. receiver/otlp)
7+
component: pkg/service
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Update semantic conventions from internal telemetry to v1.37.0"
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14232]
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: []

.golangci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,15 @@ linters:
7878
desc: "Use the newer 'math/rand/v2' instead of math/rand"
7979
- pkg: "sigs.k8s.io/yaml"
8080
desc: "Use 'go.yaml.in/yaml' instead of sigs.k8s.io/yaml"
81+
semconv:
82+
list-mode: lax
83+
files:
84+
- "!cmd/mdatagen/**" # Exclude mdatagen
85+
deny:
86+
- pkg: go.opentelemetry.io/otel/semconv
87+
desc: Use go.opentelemetry.io/otel/semconv/v1.37.0 instead. If a newer semconv version has been released, update the depguard rule.
88+
allow:
89+
- go.opentelemetry.io/otel/semconv/v1.37.0
8190
# Add a different guard rule so that we can ignore tests.
8291
ignore-in-test:
8392
# Allow in tests for testing pdata or other receivers/exporters that expect OTLP.

service/internal/resource/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/google/uuid"
88
"go.opentelemetry.io/otel/attribute"
99
"go.opentelemetry.io/otel/sdk/resource"
10-
semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
10+
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
1111

1212
"go.opentelemetry.io/collector/component"
1313
)

service/internal/resource/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/stretchr/testify/assert"
1111
"github.com/stretchr/testify/require"
1212
sdkresource "go.opentelemetry.io/otel/sdk/resource"
13-
semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
13+
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
1414

1515
"go.opentelemetry.io/collector/component"
1616
"go.opentelemetry.io/collector/pdata/pcommon"

service/telemetry/otelconftelemetry/logger_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/stretchr/testify/require"
1919
config "go.opentelemetry.io/contrib/otelconf/v0.3.0"
2020
"go.opentelemetry.io/otel/attribute"
21-
semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
21+
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
2222
"go.uber.org/zap"
2323
"go.uber.org/zap/zapcore"
2424
"go.uber.org/zap/zaptest/observer"

service/telemetry/otelconftelemetry/metrics_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
config "go.opentelemetry.io/contrib/otelconf/v0.3.0"
2121
"go.opentelemetry.io/otel/attribute"
2222
"go.opentelemetry.io/otel/metric"
23-
semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
23+
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
2424
"go.uber.org/zap"
2525
"go.uber.org/zap/zapcore"
2626
"go.uber.org/zap/zaptest/observer"

service/telemetry/otelconftelemetry/sdk.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
config "go.opentelemetry.io/contrib/otelconf/v0.3.0"
1010
sdkresource "go.opentelemetry.io/otel/sdk/resource"
11-
semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
11+
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
1212
)
1313

1414
func newSDK(ctx context.Context, res *sdkresource.Resource, conf config.OpenTelemetryConfiguration) (config.SDK, error) {

0 commit comments

Comments
 (0)