Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps): bump github.com/elastic/opentelemetry-lib from 0.8.1 to 0.9.0 #357

Merged
merged 3 commits into from
Sep 6, 2024
Merged

build(deps): bump github.com/elastic/opentelemetry-lib from 0.8.1 to 0.9.0 #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6baf414
build(deps): bump github.com/elastic/opentelemetry-lib
dependabot[bot] Sep 2, 2024
3397c48
Update test case as per latest otel
lahsivjar Sep 6, 2024
1fee334
Merge branch 'main' into dependabot/go_modules/github.com/elastic/ope…
lahsivjar Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/elastic/apm-data
go 1.22

require (
github.com/elastic/opentelemetry-lib v0.8.1
github.com/elastic/opentelemetry-lib v0.9.0
github.com/google/go-cmp v0.6.0
github.com/jaegertracing/jaeger v1.60.0
github.com/json-iterator/go v1.1.12
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ github.com/elastic/go-sysinfo v1.7.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6
github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU=
github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0=
github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss=
github.com/elastic/opentelemetry-lib v0.8.1 h1:1QnrlBsaDKKlTlTMajgQTYdOFg42rAZLU/CH9DKZ3vE=
github.com/elastic/opentelemetry-lib v0.8.1/go.mod h1:ttRzVFcQKjogveyhxDTRMD+s6Igi5XHqV7HcU933lR8=
github.com/elastic/opentelemetry-lib v0.9.0 h1:auMnq5zxqnB3eQNNdfz8+mtooy0D8+2ZEusU0sHeDj4=
github.com/elastic/opentelemetry-lib v0.9.0/go.mod h1:H4ECk7whGn41etgYL4zQWJ2BWN5xwP2A5HUIIwNrM9Y=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
Expand Down
12 changes: 6 additions & 6 deletions input/otlp/metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@ func TestConsumeMetricsWithOTelRemapper(t *testing.T) {
metrics := pmetric.NewMetrics()
sm := metrics.ResourceMetrics().AppendEmpty().
ScopeMetrics().AppendEmpty()
sm.Scope().SetName("otelcol/hostmetricsreceiver/load")
sm.Scope().SetName("github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/loadscraper")

metric := sm.Metrics().AppendEmpty()
metric.SetName("system.cpu.load_average.1m")
Expand All @@ -884,7 +884,7 @@ func TestConsumeMetricsWithOTelRemapper(t *testing.T) {
Service: &modelpb.Service{
Name: "unknown",
Language: &modelpb.Language{Name: "unknown"},
Framework: &modelpb.Framework{Name: "otelcol/hostmetricsreceiver/load"},
Framework: &modelpb.Framework{Name: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/loadscraper"},
},
Agent: &modelpb.Agent{Name: "otlp", Version: "unknown"},
Timestamp: modelpb.FromTime(ts),
Expand All @@ -903,7 +903,7 @@ func TestConsumeMetricsWithOTelRemapper(t *testing.T) {
Service: &modelpb.Service{
Name: "unknown",
Language: &modelpb.Language{Name: "unknown"},
Framework: &modelpb.Framework{Name: "otelcol/hostmetricsreceiver/load"},
Framework: &modelpb.Framework{Name: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/loadscraper"},
},
Agent: &modelpb.Agent{Name: "otlp", Version: "unknown"},
Timestamp: modelpb.FromTime(ts),
Expand Down Expand Up @@ -943,7 +943,7 @@ func TestConsumeMetricsWithOTelRemapper(t *testing.T) {
rm.Resource().Attributes().PutStr("process.owner", "testowner")
rm.Resource().Attributes().PutStr("process.command_line", "testcmdline")
sm := rm.ScopeMetrics().AppendEmpty()
sm.Scope().SetName("otelcol/hostmetricsreceiver/process")
sm.Scope().SetName("github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/processscraper")

metric := sm.Metrics().AppendEmpty()
metric.SetName("process.memory.usage")
Expand All @@ -959,7 +959,7 @@ func TestConsumeMetricsWithOTelRemapper(t *testing.T) {
Service: &modelpb.Service{
Name: "unknown",
Language: &modelpb.Language{Name: "unknown"},
Framework: &modelpb.Framework{Name: "otelcol/hostmetricsreceiver/process"},
Framework: &modelpb.Framework{Name: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/processscraper"},
},
Agent: &modelpb.Agent{Name: "otlp", Version: "unknown"},
Timestamp: modelpb.FromTime(ts),
Expand All @@ -984,7 +984,7 @@ func TestConsumeMetricsWithOTelRemapper(t *testing.T) {
Service: &modelpb.Service{
Name: "unknown",
Language: &modelpb.Language{Name: "unknown"},
Framework: &modelpb.Framework{Name: "otelcol/hostmetricsreceiver/process"},
Framework: &modelpb.Framework{Name: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/processscraper"},
},
Agent: &modelpb.Agent{Name: "otlp", Version: "unknown"},
Timestamp: modelpb.FromTime(ts),
Expand Down