Merge branch 'main' into codeboten/mark-semconv-deprecated

Author: codeboten

.chloggen/codeboten_remove-internal-semconv-dep.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. otlpreceiver)
+component: service
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Replace `go.opentelemetry.io/collector/semconv` usage with `go.opentelemetry.io/otel/semconv`"
+
+# One or more tracking issues or pull requests related to the change
+issues: [12991]
+
+# (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: []

cmd/builder/internal/builder/main_test.go

@@ -109,7 +109,6 @@ var replaceModules = []string{
 	"/receiver/receivertest",
 	"/receiver/receiverhelper",
 	"/receiver/xreceiver",
-	"/semconv",
 	"/service",
 	"/service/hostcapabilities",
 }

cmd/mdatagen/go.mod

@@ -23,7 +23,7 @@ require (
 	go.opentelemetry.io/collector/receiver/receivertest v0.125.0
 	go.opentelemetry.io/collector/scraper v0.125.0
 	go.opentelemetry.io/collector/scraper/scrapertest v0.125.0
-	go.opentelemetry.io/collector/semconv v0.125.0
+	go.opentelemetry.io/otel v1.35.0
 	go.opentelemetry.io/otel/metric v1.35.0
 	go.opentelemetry.io/otel/sdk/metric v1.35.0
 	go.opentelemetry.io/otel/trace v1.35.0
@@ -66,7 +66,6 @@ require (
 	go.opentelemetry.io/collector/processor/xprocessor v0.125.0 // indirect
 	go.opentelemetry.io/collector/receiver/xreceiver v0.125.0 // indirect
 	go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
-	go.opentelemetry.io/otel v1.35.0 // indirect
 	go.opentelemetry.io/otel/log v0.11.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.35.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
@@ -95,8 +94,6 @@ replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata
 
 replace go.opentelemetry.io/collector/receiver => ../../receiver
 
-replace go.opentelemetry.io/collector/semconv => ../../semconv
-
 replace go.opentelemetry.io/collector/consumer => ../../consumer
 
 replace go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/receivertest

cmd/mdatagen/internal/loader_test.go

@@ -371,6 +371,22 @@ func TestLoadMetadata(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "testdata/empty_test_config.yaml",
+			want: Metadata{
+				Type:                 "test",
+				GeneratedPackageName: "metadata",
+				ScopeName:            "go.opentelemetry.io/collector/cmd/mdatagen/internal",
+				ShortFolderName:      "testdata",
+				Tests:                Tests{Host: "componenttest.NewNopHost()"},
+				Status: &Status{
+					Class: "receiver",
+					Stability: map[component.StabilityLevel][]string{
+						component.StabilityLevelBeta: {"logs"},
+					},
+				},
+			},
+		},
 		{
 			name:    "testdata/invalid_type_rattr.yaml",
 			want:    Metadata{},

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

@@ -10,7 +10,7 @@ import (
 	"go.opentelemetry.io/collector/{{ .Status.Class }}"
 	{{- end }}
 	{{- if .SemConvVersion }}
-	conventions "go.opentelemetry.io/collector/semconv/v{{ .SemConvVersion }}"
+	conventions "go.opentelemetry.io/otel/semconv/v{{ .SemConvVersion }}"
 	{{- end }}
 )