From 5d1b4862cf056381f0abbd4152aef8e9aef52f75 Mon Sep 17 00:00:00 2001 From: Dan Jaglowski Date: Tue, 8 Feb 2022 11:18:53 -0500 Subject: [PATCH 1/2] [receiver/apache] Update instrumentation library name The instrumentation library name used in other scrapers is typically prefixed with 'otelcol'. This change just updates the apachereceiver's name from 'otel/apache' to 'otelcol/apache' --- CHANGELOG.md | 2 ++ receiver/apachereceiver/testdata/integration/expected.json | 2 +- receiver/apachereceiver/testdata/scraper/expected.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cef157da242..b559a9e9ba86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ ## 🛑 Breaking changes 🛑 +- `apachereceiver`: Update instrumentation library name from `otel/apache` to `otelcol/apache` (#7754) + ## 🚩 Deprecations 🚩 - Deprecated log_names setting from filter processor. (#7552) diff --git a/receiver/apachereceiver/testdata/integration/expected.json b/receiver/apachereceiver/testdata/integration/expected.json index 76562a75f96e..3a1372dec5cb 100644 --- a/receiver/apachereceiver/testdata/integration/expected.json +++ b/receiver/apachereceiver/testdata/integration/expected.json @@ -4,7 +4,7 @@ "instrumentationLibraryMetrics": [ { "instrumentationLibrary": { - "name": "otel/apache" + "name": "otelcol/apache" }, "metrics": [ { diff --git a/receiver/apachereceiver/testdata/scraper/expected.json b/receiver/apachereceiver/testdata/scraper/expected.json index cddb27d2ddff..97f62175024b 100644 --- a/receiver/apachereceiver/testdata/scraper/expected.json +++ b/receiver/apachereceiver/testdata/scraper/expected.json @@ -5,7 +5,7 @@ "instrumentationLibraryMetrics": [ { "instrumentationLibrary": { - "name": "otel/apache" + "name": "otelcol/apache" }, "metrics": [ { From cdfe0f55d7bf0dc75365b72a31350796877ed2f0 Mon Sep 17 00:00:00 2001 From: Dan Jaglowski Date: Tue, 8 Feb 2022 20:44:55 -0500 Subject: [PATCH 2/2] Fix merge oversight --- receiver/apachereceiver/scraper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/receiver/apachereceiver/scraper.go b/receiver/apachereceiver/scraper.go index bdffaa9496fd..b17985645ecc 100644 --- a/receiver/apachereceiver/scraper.go +++ b/receiver/apachereceiver/scraper.go @@ -105,7 +105,7 @@ func (r *apacheScraper) scrape(context.Context) (pdata.Metrics, error) { md := pdata.NewMetrics() ilm := md.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() - ilm.InstrumentationLibrary().SetName("otel/apache") + ilm.InstrumentationLibrary().SetName("otelcol/apache") r.mb.Emit(ilm.Metrics()) return md, nil }