Skip to content

Commit

Permalink
[receiver/apache] Update instrumentation library name (#7754)
Browse files Browse the repository at this point in the history
* [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'

* Fix merge oversight
  • Loading branch information
djaglowski authored Feb 9, 2022
1 parent 6429db2 commit 2754c19
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

## 🛑 Breaking changes 🛑

- `apachereceiver`: Update instrumentation library name from `otel/apache` to `otelcol/apache` (#7754)

## 🚩 Deprecations 🚩

- Deprecated log_names setting from filter processor. (#7552)
Expand Down
2 changes: 1 addition & 1 deletion receiver/apachereceiver/scraper.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion receiver/apachereceiver/testdata/integration/expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"instrumentationLibraryMetrics": [
{
"instrumentationLibrary": {
"name": "otel/apache"
"name": "otelcol/apache"
},
"metrics": [
{
Expand Down
2 changes: 1 addition & 1 deletion receiver/apachereceiver/testdata/scraper/expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"instrumentationLibraryMetrics": [
{
"instrumentationLibrary": {
"name": "otel/apache"
"name": "otelcol/apache"
},
"metrics": [
{
Expand Down

0 comments on commit 2754c19

Please sign in to comment.