Merge branch 'main' into gcp-0482

damemi · web-flow · commit f41c96a72f2f · 2024-09-24T10:30:35.000-04:00
diff --git a/extension/opampextension/opamp_agent.go b/extension/opampextension/opamp_agent.go
@@ -23,7 +23,7 @@ import (
 	"go.opentelemetry.io/collector/component/componentstatus"
 	"go.opentelemetry.io/collector/confmap"
 	"go.opentelemetry.io/collector/extension"
-	semconv "go.opentelemetry.io/collector/semconv/v1.18.0"
+	semconv "go.opentelemetry.io/collector/semconv/v1.27.0"
 	"go.uber.org/zap"
 	"golang.org/x/exp/maps"
 	"gopkg.in/yaml.v3"
diff --git a/extension/opampextension/opamp_agent_test.go b/extension/opampextension/opamp_agent_test.go
@@ -18,7 +18,7 @@ import (
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
 	"go.opentelemetry.io/collector/extension/extensiontest"
-	semconv "go.opentelemetry.io/collector/semconv/v1.18.0"
+	semconv "go.opentelemetry.io/collector/semconv/v1.27.0"
 )
 
 func TestNewOpampAgent(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`"go.opentelemetry.io/collector/component/componenttest"`
`19`	`19`	`"go.opentelemetry.io/collector/confmap/confmaptest"`
`20`	`20`	`"go.opentelemetry.io/collector/extension/extensiontest"`
`21`		`- semconv "go.opentelemetry.io/collector/semconv/v1.18.0"`
	`21`	`+ semconv "go.opentelemetry.io/collector/semconv/v1.27.0"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func TestNewOpampAgent(t *testing.T) {`