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.

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

Update instrumentation naming in accordance with otel spec. #3733

Merged

Conversation

a-feld
Copy link
Member

@a-feld a-feld commented Jun 7, 2021

Description: Updates instrumentation name and version key in accordance with the opentelemetry exporter specification

@a-feld a-feld marked this pull request as ready for review June 7, 2021 18:23
@a-feld a-feld requested review from a team and jrcamp June 7, 2021 18:23
@bogdandrutu
Copy link
Member

Please fix lint errors:

--- a/receiver/awscontainerinsightreceiver/go.mod
+++ b/receiver/awscontainerinsightreceiver/go.mod
@@ -3,9 +3,9 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscon
 go 1.16
 
 require (
-	github.com/aws/aws-sdk-go v1.38.51
+	github.com/aws/aws-sdk-go v1.38.55
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-00010101000000-000000000000
-	github.com/shirou/gopsutil v3.21.4+incompatible
+	github.com/shirou/gopsutil v3.21.5+incompatible
 	github.com/stretchr/testify v1.7.0
 	go.opentelemetry.io/collector v0.27.1-0.20210603182316-5369d7e9e83e
 	go.uber.org/zap v1.17.0
Generated code is out of date, please run "make generate" and commit the changes in this PR.

@bogdandrutu
Copy link
Member

You may have to just rebase (merge) to the latest head.

@a-feld a-feld force-pushed the update-nr-instrumentation-name branch from 6d0428d to 4425dc1 Compare June 8, 2021 17:11
@a-feld a-feld closed this Jun 8, 2021
@a-feld a-feld reopened this Jun 8, 2021
Comment on lines 36 to 37
instrumentationNameKey = "otel.library.name"
instrumentationVersionKey = "otel.library.version"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are defined in conventions package from the core Collector repo. It is probably best to just import that.

@a-feld a-feld force-pushed the update-nr-instrumentation-name branch from a1d3a84 to 6c2edca Compare June 9, 2021 17:49
@a-feld
Copy link
Member Author

a-feld commented Jun 9, 2021

@tigrannajaryan rebased again with feedback

@a-feld
Copy link
Member Author

a-feld commented Jun 9, 2021

Looks like Jenkins is losing some UDP packets during load testing - I don't think that failure is related to this PR.

@a-feld a-feld closed this Jun 9, 2021
@a-feld a-feld reopened this Jun 9, 2021
@a-feld a-feld closed this Jun 9, 2021
@a-feld a-feld reopened this Jun 9, 2021
@bogdandrutu bogdandrutu merged commit 22f1a40 into open-telemetry:main Jun 10, 2021
@a-feld a-feld deleted the update-nr-instrumentation-name branch June 10, 2021 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants