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

Fix prometheusexporter droping the OTEL resource labels #2899

Merged
merged 8 commits into from
Apr 21, 2021
Merged

Fix prometheusexporter droping the OTEL resource labels #2899

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0be56e9
fix: add resource_attributes_as_tags support prometheusexporter
krak3n Apr 7, 2021
3286b18
fix: prometheus exporter test cases
krak3n Apr 7, 2021
db5077d
fix: yaml indentation
krak3n Apr 7, 2021
97bbba7
chore: add test case to ensure resource labels are added to prometheu…
krak3n Apr 8, 2021
fa01a46
Merge branch 'main' into fix/prometheus-exporter-resource-labels
krak3n Apr 8, 2021
d7f1076
fix: missing test case for exporterhelper.NewMetricsExporter error
krak3n Apr 8, 2021
4179644
refactor: use existing resource_to_telemetry_conversion convention fr…
krak3n Apr 13, 2021
1d5a944
Merge branch 'main' into fix/prometheus-exporter-resource-labels
krak3n Apr 21, 2021
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
Prev Previous commit
Next Next commit
fix: missing test case for exporterhelper.NewMetricsExporter error
  • Loading branch information
@krak3n
krak3n committed Apr 8, 2021
commit d7f10761020ef6e048192c6c4fe29d166b9d3270
16 changes: 16 additions & 0 deletions exporter/prometheusexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,19 @@ func TestCreateMetricsExporter(t *testing.T) {
require.Equal(t, errBlankPrometheusAddress, err)
require.Nil(t, exp)
}

func TestCreateMetricsExporterExportHelperError(t *testing.T) {
cfg, ok := createDefaultConfig().(*Config)
require.True(t, ok)

cfg.Endpoint = "http://localhost:8889"

// Should give us an exporterhelper.errNilLogger
exp, err := createMetricsExporter(
context.Background(),
component.ExporterCreateParams{Logger: nil},
cfg)

assert.Nil(t, exp)
assert.Error(t, err)
}