Skip to content

Commit

Permalink
Merge branch 'main' into gcp-0482
Browse files Browse the repository at this point in the history
  • Loading branch information
damemi authored Sep 24, 2024
2 parents 92f5059 + d30d8f3 commit f41c96a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion extension/opampextension/opamp_agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion extension/opampextension/opamp_agent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit f41c96a

Please sign in to comment.