JMX Receiver: update receiver as unstable component and correct prope…

…rties (#1543)

* jmx: update exporter properties for latest changes

* Add jmx to unstable components

cmd/otelcontribcol/unstable_components_enabled.go

@@ -19,9 +19,13 @@ package main
 import (
  "go.opentelemetry.io/collector/component"
 
+ "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver"
  "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/stanzareceiver"
 )
 
 func extraReceivers() []component.ReceiverFactory {
- return []component.ReceiverFactory{stanzareceiver.NewFactory()}
+ return []component.ReceiverFactory{
+ jmxreceiver.NewFactory(),
+ stanzareceiver.NewFactory(),
+ }
 }

go.mod

@@ -39,6 +39,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.0.0-00010101000000-000000000000
+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver v0.0.0-00010101000000-000000000000
@@ -152,6 +153,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/docke
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver => ./receiver/windowsperfcountersreceiver
 
+replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => ./receiver/jmxreceiver
+
 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpertrace => ./pkg/batchpertrace
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor => ./processor/groupbytraceprocessor

receiver/jmxreceiver/README.md

@@ -87,19 +87,19 @@ Corresponds to the `otel.jmx.password` property.
 
 The otlp exporter endpoint to which to listen and submit metrics.
 
-Corresponds to the `otel.otlp.endpoint` property.
+Corresponds to the `otel.exporter.otlp.endpoint` property.
 
 ### otlp.timeout (default: `5s`)
 
 The otlp exporter request timeout.
 
-Corresponds to the `otel.otlp.metric.timeout` property.
+Corresponds to the `otel.exporter.otlp.metric.timeout` property.
 
 ### otlp.headers
 
 The headers to include in otlp metric submission requests.
 
-Corresponds to the `otel.otlp.metadata` property.
+Corresponds to the `otel.exporter.otlp.metadata` property.
 
 ### keystore_path
 

receiver/jmxreceiver/integration_test.go

@@ -61,7 +61,7 @@ func (suite *JMXIntegrationSuite) TearDownSuite() {
 }
 
 func downloadJMXMetricGathererJAR() (string, error) {
- url := "https://oss.jfrog.org/artifactory/list/oss-snapshot-local/io/opentelemetry/contrib/opentelemetry-java-contrib-jmx-metrics/0.0.1-SNAPSHOT/opentelemetry-java-contrib-jmx-metrics-0.0.1-20200918.184353-3.jar"
+ url := "https://oss.jfrog.org/artifactory/list/oss-snapshot-local/io/opentelemetry/contrib/opentelemetry-java-contrib-jmx-metrics/0.0.1-SNAPSHOT/opentelemetry-java-contrib-jmx-metrics-0.0.1-20201110.155252-5.jar"
  resp, err := http.Get(url)
  if err != nil {
  return "", err

receiver/jmxreceiver/receiver.go

@@ -132,8 +132,8 @@ otel.jmx.interval.milliseconds = %v
  }
 
  javaConfig += fmt.Sprintf(`otel.exporter = otlp
-otel.otlp.endpoint = %v
-otel.otlp.metric.timeout = %v
+otel.exporter.otlp.endpoint = %v
+otel.exporter.otlp.metric.timeout = %v
 `, jmx.config.OTLPExporterConfig.Endpoint, jmx.config.OTLPExporterConfig.Timeout.Milliseconds())
 
  if jmx.config.Username != "" {

receiver/jmxreceiver/receiver_test.go

@@ -70,8 +70,8 @@ func TestBuildJMXMetricGathererConfig(t *testing.T) {
 otel.jmx.interval.milliseconds = 123000
 otel.jmx.target.system = mytargetsystem
 otel.exporter = otlp
-otel.otlp.endpoint = myotlpendpoint
-otel.otlp.metric.timeout = 234000
+otel.exporter.otlp.endpoint = myotlpendpoint
+otel.exporter.otlp.metric.timeout = 234000
 `,
  },
  {
@@ -91,8 +91,8 @@ otel.otlp.metric.timeout = 234000
 otel.jmx.interval.milliseconds = 123000
 otel.jmx.groovy.script = mygroovyscript
 otel.exporter = otlp
-otel.otlp.endpoint = myotlpendpoint
-otel.otlp.metric.timeout = 234000
+otel.exporter.otlp.endpoint = myotlpendpoint
+otel.exporter.otlp.metric.timeout = 234000
 `,
  },
  }

receiver/jmxreceiver/testdata/script.groovy

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import io.opentelemetry.common.Labels
+import io.opentelemetry.api.common.Labels
 
 def loadMatches = otel.queryJmx("org.apache.cassandra.metrics:type=Storage,name=Load")
 if (loadMatches.size() > 0) {