From 471626ddb7d57427033a8540ad01c8ec2be6f55c Mon Sep 17 00:00:00 2001 From: alex boten <223565+codeboten@users.noreply.github.com> Date: Wed, 17 Dec 2025 09:51:52 -0800 Subject: [PATCH 1/2] update semconv to v1.38.0 Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com> --- .chloggen/codeboten_update-semconv.yaml | 25 +++++++++++++++++++ .golangci.yml | 4 +-- cmd/mdatagen/internal/loader_test.go | 4 +-- .../internal/samplereceiver/documentation.md | 2 +- .../internal/metadata/generated_logs.go | 2 +- .../internal/metadata/generated_metrics.go | 2 +- .../internal/samplereceiver/metadata.yaml | 4 +-- .../internal/samplescraper/documentation.md | 2 +- .../internal/metadata/generated_logs.go | 2 +- .../internal/metadata/generated_metrics.go | 2 +- .../internal/samplescraper/metadata.yaml | 4 +-- service/internal/resource/config.go | 2 +- service/telemetry/otelconftelemetry/sdk.go | 2 +- 13 files changed, 41 insertions(+), 16 deletions(-) create mode 100644 .chloggen/codeboten_update-semconv.yaml diff --git a/.chloggen/codeboten_update-semconv.yaml b/.chloggen/codeboten_update-semconv.yaml new file mode 100644 index 00000000000..d5ca80262c2 --- /dev/null +++ b/.chloggen/codeboten_update-semconv.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp) +component: all + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Update semconv import to 1.38.0 + +# One or more tracking issues or pull requests related to the change +issues: [] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/.golangci.yml b/.golangci.yml index b8d2f60d7e5..70b6e12214b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -84,9 +84,9 @@ linters: - "!cmd/mdatagen/**" # Exclude mdatagen deny: - pkg: go.opentelemetry.io/otel/semconv - desc: Use go.opentelemetry.io/otel/semconv/v1.37.0 instead. If a newer semconv version has been released, update the depguard rule. + desc: Use go.opentelemetry.io/otel/semconv/v1.38.0 instead. If a newer semconv version has been released, update the depguard rule. allow: - - go.opentelemetry.io/otel/semconv/v1.37.0 + - go.opentelemetry.io/otel/semconv/v1.38.0 # Add a different guard rule so that we can ignore tests. ignore-in-test: # Allow in tests for testing pdata or other receivers/exporters that expect OTLP. diff --git a/cmd/mdatagen/internal/loader_test.go b/cmd/mdatagen/internal/loader_test.go index e5b8afbd741..5a144aacaec 100644 --- a/cmd/mdatagen/internal/loader_test.go +++ b/cmd/mdatagen/internal/loader_test.go @@ -47,7 +47,7 @@ func TestLoadMetadata(t *testing.T) { GithubProject: "open-telemetry/opentelemetry-collector", GeneratedPackageName: "metadata", Type: "sample", - SemConvVersion: "1.37.0", + SemConvVersion: "1.38.0", PackageName: "go.opentelemetry.io/collector/cmd/mdatagen/internal/samplereceiver", Status: &Status{ DisableCodeCov: true, @@ -265,7 +265,7 @@ func TestLoadMetadata(t *testing.T) { Signal: Signal{ Enabled: true, Stability: Stability{Level: component.StabilityLevelBeta}, - SemanticConvention: &SemanticConvention{SemanticConventionRef: "https://github.com/open-telemetry/semantic-conventions/blob/v1.37.0/docs/system/system-metrics.md#metric-systemcputime"}, + SemanticConvention: &SemanticConvention{SemanticConventionRef: "https://github.com/open-telemetry/semantic-conventions/blob/v1.38.0/docs/system/system-metrics.md#metric-systemcputime"}, Description: "Monotonic cumulative sum int metric enabled by default.", ExtendedDocumentation: "The metric will be become optional soon.", }, diff --git a/cmd/mdatagen/internal/samplereceiver/documentation.md b/cmd/mdatagen/internal/samplereceiver/documentation.md index 25fa9c66b74..f84d4e15586 100644 --- a/cmd/mdatagen/internal/samplereceiver/documentation.md +++ b/cmd/mdatagen/internal/samplereceiver/documentation.md @@ -71,7 +71,7 @@ The metric will be become optional soon. | Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | Stability | Semantic Convention | | ---- | ----------- | ---------- | ----------------------- | --------- | --------- | ------------------- | -| s | Sum | Int | Cumulative | true | Beta | [system.cpu.time](https://github.com/open-telemetry/semantic-conventions/blob/v1.37.0/docs/system/system-metrics.md#metric-systemcputime) | +| s | Sum | Int | Cumulative | true | Beta | [system.cpu.time](https://github.com/open-telemetry/semantic-conventions/blob/v1.38.0/docs/system/system-metrics.md#metric-systemcputime) | ## Optional Metrics diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_logs.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_logs.go index 965481b46ef..8530872a055 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_logs.go +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_logs.go @@ -5,7 +5,7 @@ package metadata import ( "context" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" + conventions "go.opentelemetry.io/otel/semconv/v1.38.0" "go.opentelemetry.io/otel/trace" "go.opentelemetry.io/collector/component" diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go index a8fb3a631a4..8ce641cd42e 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" + conventions "go.opentelemetry.io/otel/semconv/v1.38.0" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/filter" diff --git a/cmd/mdatagen/internal/samplereceiver/metadata.yaml b/cmd/mdatagen/internal/samplereceiver/metadata.yaml index c1ede02b02f..e9e05a3768d 100644 --- a/cmd/mdatagen/internal/samplereceiver/metadata.yaml +++ b/cmd/mdatagen/internal/samplereceiver/metadata.yaml @@ -4,7 +4,7 @@ type: sample scope_name: go.opentelemetry.io/collector/internal/receiver/samplereceiver github_project: open-telemetry/opentelemetry-collector -sem_conv_version: 1.37.0 +sem_conv_version: 1.38.0 status: disable_codecov_badge: true @@ -246,7 +246,7 @@ metrics: monotonic: true aggregation_temporality: cumulative semantic_convention: - ref: https://github.com/open-telemetry/semantic-conventions/blob/v1.37.0/docs/system/system-metrics.md#metric-systemcputime + ref: https://github.com/open-telemetry/semantic-conventions/blob/v1.38.0/docs/system/system-metrics.md#metric-systemcputime telemetry: metrics: diff --git a/cmd/mdatagen/internal/samplescraper/documentation.md b/cmd/mdatagen/internal/samplescraper/documentation.md index ee027ef5138..3d5793aed9b 100644 --- a/cmd/mdatagen/internal/samplescraper/documentation.md +++ b/cmd/mdatagen/internal/samplescraper/documentation.md @@ -68,7 +68,7 @@ The metric will be become optional soon. | Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | Stability | Semantic Convention | | ---- | ----------- | ---------- | ----------------------- | --------- | --------- | ------------------- | -| s | Sum | Int | Cumulative | true | Beta | [system.cpu.time](https://github.com/open-telemetry/semantic-conventions/blob/v1.37.0/docs/system/system-metrics.md#metric-systemcputime) | +| s | Sum | Int | Cumulative | true | Beta | [system.cpu.time](https://github.com/open-telemetry/semantic-conventions/blob/v1.38.0/docs/system/system-metrics.md#metric-systemcputime) | ## Optional Metrics diff --git a/cmd/mdatagen/internal/samplescraper/internal/metadata/generated_logs.go b/cmd/mdatagen/internal/samplescraper/internal/metadata/generated_logs.go index 187b564f16a..ff23893fc9f 100644 --- a/cmd/mdatagen/internal/samplescraper/internal/metadata/generated_logs.go +++ b/cmd/mdatagen/internal/samplescraper/internal/metadata/generated_logs.go @@ -3,7 +3,7 @@ package metadata import ( - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" + conventions "go.opentelemetry.io/otel/semconv/v1.38.0" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" diff --git a/cmd/mdatagen/internal/samplescraper/internal/metadata/generated_metrics.go b/cmd/mdatagen/internal/samplescraper/internal/metadata/generated_metrics.go index 296bacb7593..df426df901a 100644 --- a/cmd/mdatagen/internal/samplescraper/internal/metadata/generated_metrics.go +++ b/cmd/mdatagen/internal/samplescraper/internal/metadata/generated_metrics.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - conventions "go.opentelemetry.io/otel/semconv/v1.37.0" + conventions "go.opentelemetry.io/otel/semconv/v1.38.0" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/filter" diff --git a/cmd/mdatagen/internal/samplescraper/metadata.yaml b/cmd/mdatagen/internal/samplescraper/metadata.yaml index 27b7cb91b66..eca7f899a83 100644 --- a/cmd/mdatagen/internal/samplescraper/metadata.yaml +++ b/cmd/mdatagen/internal/samplescraper/metadata.yaml @@ -3,7 +3,7 @@ type: sample github_project: open-telemetry/opentelemetry-collector -sem_conv_version: 1.37.0 +sem_conv_version: 1.38.0 status: disable_codecov_badge: true @@ -180,4 +180,4 @@ metrics: monotonic: true aggregation_temporality: cumulative semantic_convention: - ref: https://github.com/open-telemetry/semantic-conventions/blob/v1.37.0/docs/system/system-metrics.md#metric-systemcputime + ref: https://github.com/open-telemetry/semantic-conventions/blob/v1.38.0/docs/system/system-metrics.md#metric-systemcputime diff --git a/service/internal/resource/config.go b/service/internal/resource/config.go index 33176b6778f..af6ea739fba 100644 --- a/service/internal/resource/config.go +++ b/service/internal/resource/config.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.37.0" + semconv "go.opentelemetry.io/otel/semconv/v1.38.0" "go.opentelemetry.io/collector/component" ) diff --git a/service/telemetry/otelconftelemetry/sdk.go b/service/telemetry/otelconftelemetry/sdk.go index fc332a75ff5..94c0cb9d358 100644 --- a/service/telemetry/otelconftelemetry/sdk.go +++ b/service/telemetry/otelconftelemetry/sdk.go @@ -8,7 +8,7 @@ import ( config "go.opentelemetry.io/contrib/otelconf/v0.3.0" sdkresource "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.37.0" + semconv "go.opentelemetry.io/otel/semconv/v1.38.0" ) func newSDK(ctx context.Context, res *sdkresource.Resource, conf config.OpenTelemetryConfiguration) (config.SDK, error) { From fdc90d18a96611bcca448d2ee826cd5266a11a6d Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Wed, 17 Dec 2025 09:54:13 -0800 Subject: [PATCH 2/2] Update .chloggen/codeboten_update-semconv.yaml --- .chloggen/codeboten_update-semconv.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chloggen/codeboten_update-semconv.yaml b/.chloggen/codeboten_update-semconv.yaml index d5ca80262c2..c2a95cb2a3f 100644 --- a/.chloggen/codeboten_update-semconv.yaml +++ b/.chloggen/codeboten_update-semconv.yaml @@ -10,7 +10,7 @@ component: all note: Update semconv import to 1.38.0 # One or more tracking issues or pull requests related to the change -issues: [] +issues: [14305] # (Optional) One or more lines of additional information to render under the primary note. # These lines will be padded with 2 spaces and then inserted directly into the document.