dummy code for non linux builds

``` time make -C ./receiver/opencensusreceiver test make: Entering directory '/home/qmanfroi/git/signalfx/opentelemetry-collector-contrib/receiver/opencensusreceiver' go test -race -timeout 300s --tags=containers_image_openpgp,exclude_graphdriver_btrfs,exclude_graphdriver_devicemapper ./... ok github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver 140.310s ok github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver/internal/ocmetrics 0.329s ok github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver/internal/octrace 0.614s make: Leaving directory '/home/qmanfroi/git/signalfx/opentelemetry-collector-contrib/receiver/opencensusreceiver' real 2m21.503s user 0m4.198s sys 0m1.047s ``` here is the specification of my laptop: * CPU: Intel(R) Core(TM) i7-8550U CPU * Memory: 16GB * Disk: PM981 NVMe Samsung 512GB * OS: Arch Linux * Update dependencies logzio exporter * Updated example * Updated README.md * New line * Update config.yaml Co-authored-by: Bogdan Drutu <lazy@splunk.com> Update loki-label-best-practices page (open-telemetry#5277) [awscontainerinsights receiver]Add Readme for ECS (open-telemetry#4375) * Add Readme for ECS * Revise based on the comments Add invert match on tail sampling string attribute (open-telemetry#4393) Fix $attributes.file_path when collecting logs from Kubernetes (open-telemetry#5061) * Update otel-collector-config.yml On AWS EKS 1.21, I'd get this error (from your original code): ```console $ kubectl logs -f --tail=10 ds/otel-collector 2021-08-28T17:46:38.930Z error Failed to process entry {"kind": "receiver", "name": "filelog", "operator_id": "$.extract_metadata_from_filepath", "operator_type": "regex_parser", "error": {"description": "Entry is missing the expected parse_from field.", "suggestion": "Ensure that all incoming entries contain the parse_from field.", "details": {"parse_from": "$attributes.file_path"}}, "action": "send", "entry": {"timestamp":"2021-08-28T17:22:14.809709717Z","body":{"log":"2021-08-28T17:22:14+0000 DEBUG This is a debug log that shows a log that can be ignored.\n","stream":"stdout"},"attributes":{"file.path":"/var/log/pods/default_random-logger_4cf99717-08db-425b-88b6-1ee98fdf3660/random-logger/0.log"},"severity":0}} ``` The error message is showing that the actual attribute is "file.path", not "file_path". My proposed fix will correct that. * Update otel-collector.yaml * support untyped and _total metrics without the suffix in the metadata lookup * Fix spacing * remove debug line and run go fmt * fix typo * Add Apache httpd receiver - part 1 * Incorporate PR feedback * Remove unnecessary string building step * Simplify config validation * Merge main * Do not require a path * Remove port requirement Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com> * Add mysql receiver config and factory * Incorporate PR feedback * Add dependabot * Rerun make generate * PR feedback Bump gopsutil/v3 to v3.21.9 (open-telemetry#5544) * Bump gopsutil/v3 * make go tidy Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com> bump aws-sdk-go to v1.40.53 (open-telemetry#5569) fix: remove squash on configtls.TLSClientSetting for AWS components (open-telemetry#5454) * fix: remove squash on configtls.TLSClientSetting * fix: update yamls and readmes to reflect de-squashed tls * fix: solve merge conflict * fix: remove unnecessary file changes * chore: add CHANGELOG * fix: add relevant readme files * fix: includes aws components only
luckyj5 · Oct 1, 2021 · 3d59a9e · 3d59a9e
1 parent cdcc75f
commit 3d59a9e
Show file tree

Hide file tree

Showing 671 changed files with 5,625 additions and 2,453 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -75,9 +75,11 @@ receiver/cloudfoundryreceiver/                       @open-telemetry/collector-c
 receiver/collectdreceiver/                           @open-telemetry/collector-contrib-approvers @owais
 receiver/dockerstatsreceiver/                        @open-telemetry/collector-contrib-approvers @rmfitzpatrick
 receiver/dotnetdiagnosticsreceiver/                  @open-telemetry/collector-contrib-approvers @pmcollins @davmason
+receiver/httpdreceiver/                              @open-telemetry/collector-contrib-approvers @djaglowski
 receiver/jmxreceiver/                                @open-telemetry/collector-contrib-approvers @rmfitzpatrick
 receiver/k8sclusterreceiver/                         @open-telemetry/collector-contrib-approvers @asuresh4
 receiver/kubeletstatsreceiver/                       @open-telemetry/collector-contrib-approvers @pmcollins @asuresh4
+receiver/mysqlreceiver/                              @open-telemetry/collector-contrib-approvers @djaglowski
 receiver/prometheusexecreceiver/                     @open-telemetry/collector-contrib-approvers @keitwb
 receiver/receivercreator/                            @open-telemetry/collector-contrib-approvers @jrcamp
 receiver/redisreceiver/                              @open-telemetry/collector-contrib-approvers @pmcollins @jrcamp

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -437,6 +437,10 @@ updates:
     directory: "/receiver/hostmetricsreceiver"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "/receiver/httpdreceiver"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gomod"
     directory: "/receiver/influxdbreceiver"
     schedule:
@@ -473,6 +477,10 @@ updates:
     directory: "/receiver/mongodbatlasreceiver"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "/receiver/mysqlreceiver"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gomod"
     directory: "/receiver/nginxreceiver"
     schedule:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +4,17 @@
 
 ## 🛑 Breaking changes 🛑
 
+- Remove squash on configtls.TLSClientSetting for AWS components (#5454)
 - Move `k8sprocessor` to `k8sattributesprocessor`.
 - Rename `k8s_tagger` configuration `k8sattributes`.
 - filelog receiver: use empty value for `SeverityText` field instead of `"Undefined"` (#5423)
 - Rename `configparser.ConfigMap` to `config.Map`
 - Rename `pdata.AggregationTemporality*` to `pdata.MetricAggregationTemporality*`
 
+## 💡 Enhancements 💡
+
+- `k8sattributes` processor: add container metadata enrichment (#5467)
+
 ## v0.36.0
 
 ## 🛑 Breaking changes 🛑

diff --git a/Makefile b/Makefile
@@ -159,7 +159,6 @@ install-tools:
 	cd $(TOOLS_MOD_DIR) && go install github.com/tcnksm/ghr
 	cd $(TOOLS_MOD_DIR) && go install go.opentelemetry.io/build-tools/checkdoc
 	cd $(TOOLS_MOD_DIR) && go install go.opentelemetry.io/build-tools/issuegenerator
-	cd $(TOOLS_MOD_DIR) && go install github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen
 	cd $(TOOLS_MOD_DIR) && go install golang.org/x/tools/cmd/goimports
 	cd $(TOOLS_MOD_DIR) && go install go.opentelemetry.io/build-tools/multimod
 
@@ -186,6 +185,7 @@ docker-otelcontribcol:
 
 .PHONY: generate
 generate:
+	cd cmd/mdatagen && go install .
 	$(MAKE) for-all CMD="go generate ./..."
 
 # Build the Collector executable.

diff --git a/Makefile.Common b/Makefile.Common
@@ -14,7 +14,7 @@ ALL_PKGS := $(shell go list $(sort $(dir $(ALL_SRC))) 2>/dev/null)
 
 # build tags required by any component should be defined as an independent variables and later added to GO_BUILD_TAGS below
 GO_BUILD_TAGS=""
-GOTEST_OPT?= -race -timeout 60s --tags=$(GO_BUILD_TAGS)
+GOTEST_OPT?= -race -timeout 300s --tags=$(GO_BUILD_TAGS)
 GOTEST_INTEGRATION_OPT?= -race -timeout 60s
 GOTEST_OPT_WITH_COVERAGE = $(GOTEST_OPT) -coverprofile=coverage.txt -covermode=atomic
 GOTEST_OPT_WITH_INTEGRATION=$(GOTEST_INTEGRATION_OPT) -v -tags=integration,$(GO_BUILD_TAGS) -run=Integration -coverprofile=integration-coverage.txt -covermode=atomic

diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod
@@ -344,7 +344,7 @@ require (
 	github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
 	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210223165440-c65ae3540d44 // indirect
 	github.com/shirou/gopsutil v3.21.8+incompatible // indirect
-	github.com/shirou/gopsutil/v3 v3.21.6 // indirect
+	github.com/shirou/gopsutil/v3 v3.21.9 // indirect
 	github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 // indirect
 	github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 // indirect
 	github.com/signalfx/golib/v3 v3.3.13 // indirect

diff --git a/cmd/otelcontribcol/main.go b/cmd/otelcontribcol/main.go
@@ -40,19 +40,14 @@ func main() {
 		Version:     version.Version,
 	}
 
-	if err := run(service.CollectorSettings{BuildInfo: info, Factories: factories}); err != nil {
+	if err = run(service.CollectorSettings{BuildInfo: info, Factories: factories}); err != nil {
 		log.Fatal(err)
 	}
 }
 
 func runInteractive(params service.CollectorSettings) error {
-	app, err := service.New(params)
-	if err != nil {
-		return fmt.Errorf("failed to construct the collector server: %w", err)
-	}
-
-	cmd := service.NewCommand(app)
-	if err = cmd.Execute(); err != nil {
+	cmd := service.NewCommand(params)
+	if err := cmd.Execute(); err != nil {
 		return fmt.Errorf("collector server run finished with error: %w", err)
 	}
 

diff --git a/examples/kubernetes/otel-collector-config.yml b/examples/kubernetes/otel-collector-config.yml
@@ -47,7 +47,7 @@ receivers:
       - type: regex_parser
         id: extract_metadata_from_filepath
         regex: '^.*\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[a-f0-9\-]{36})\/(?P<container_name>[^\._]+)\/(?P<run_id>\d+)\.log$'
-        parse_from: $$attributes.file_path
+        parse_from: $$attributes["file.path"]
       # Move out attributes to Attributes
       - type: metadata
         attributes:

diff --git a/examples/kubernetes/otel-collector.yaml b/examples/kubernetes/otel-collector.yaml
@@ -54,7 +54,7 @@ data:
           - type: regex_parser
             id: extract_metadata_from_filepath
             regex: '^.*\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[a-f0-9\-]{36})\/(?P<container_name>[^\._]+)\/(?P<run_id>\d+)\.log$'
-            parse_from: $$attributes.file_path
+            parse_from: $$attributes["file.path"]
           # Move out attributes to Attributes
           - type: metadata
             attributes:

diff --git a/exporter/alibabacloudlogserviceexporter/config_test.go b/exporter/alibabacloudlogserviceexporter/config_test.go
@@ -37,16 +37,16 @@ func TestLoadConfig(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, cfg)
 
-	e0 := cfg.Exporters[config.NewID(typeStr)]
+	e0 := cfg.Exporters[config.NewComponentID(typeStr)]
 
 	// Endpoint doesn't have a default value so set it directly.
 	defaultCfg := factory.CreateDefaultConfig().(*Config)
 	defaultCfg.Endpoint = "cn-hangzhou.log.aliyuncs.com"
 	assert.Equal(t, defaultCfg, e0)
 
-	e1 := cfg.Exporters[config.NewIDWithName(typeStr, "2")]
+	e1 := cfg.Exporters[config.NewComponentIDWithName(typeStr, "2")]
 	expectedCfg := Config{
-		ExporterSettings: config.NewExporterSettings(config.NewIDWithName(typeStr, "2")),
+		ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "2")),
 		Endpoint:         "cn-hangzhou.log.aliyuncs.com",
 		Project:          "demo-project",
 		Logstore:         "demo-logstore",

diff --git a/exporter/alibabacloudlogserviceexporter/factory.go b/exporter/alibabacloudlogserviceexporter/factory.go
@@ -40,7 +40,7 @@ func NewFactory() component.ExporterFactory {
 // CreateDefaultConfig creates the default configuration for exporter.
 func createDefaultConfig() config.Exporter {
 	return &Config{
-		ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
+		ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)),
 	}
 }
 

diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e
-	go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e
+	go.opentelemetry.io/collector v0.36.1-0.20210930151317-3ec4f1be6001
+	go.opentelemetry.io/collector/model v0.36.1-0.20210930151317-3ec4f1be6001
 	go.uber.org/zap v1.19.1
 )
 
@@ -21,6 +21,7 @@ require (
 	github.com/go-logfmt/logfmt v0.5.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/knadh/koanf v1.2.3 // indirect
+	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.2 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect

diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
diff --git a/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go b/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go
@@ -52,7 +52,7 @@ func createSimpleLogData(numberOfLogs int) pdata.Logs {
 
 func TestNewLogsExporter(t *testing.T) {
 	got, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), &Config{
-		ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
+		ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)),
 		Endpoint:         "us-west-1.log.aliyuncs.com",
 		Project:          "demo-project",
 		Logstore:         "demo-logstore",
@@ -68,7 +68,7 @@ func TestNewLogsExporter(t *testing.T) {
 
 func TestSTSTokenExporter(t *testing.T) {
 	got, err := newLogsExporter(componenttest.NewNopExporterCreateSettings(), &Config{
-		ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
+		ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)),
 		Endpoint:         "us-west-1.log.aliyuncs.com",
 		Project:          "demo-project",
 		Logstore:         "demo-logstore",

diff --git a/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go b/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go
@@ -28,7 +28,7 @@ import (
 
 func TestNewMetricsExporter(t *testing.T) {
 	got, err := newMetricsExporter(componenttest.NewNopExporterCreateSettings(), &Config{
-		ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
+		ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)),
 		Endpoint:         "us-west-1.log.aliyuncs.com",
 		Project:          "demo-project",
 		Logstore:         "demo-logstore",

diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go b/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go
@@ -28,7 +28,7 @@ import (
 func TestNewTracesExporter(t *testing.T) {
 
 	got, err := newTracesExporter(componenttest.NewNopExporterCreateSettings(), &Config{
-		ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
+		ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)),
 		Endpoint:         "cn-hangzhou.log.aliyuncs.com",
 		Project:          "demo-project",
 		Logstore:         "demo-logstore",

diff --git a/exporter/awscloudwatchlogsexporter/config_test.go b/exporter/awscloudwatchlogsexporter/config_test.go
@@ -41,11 +41,11 @@ func TestLoadConfig(t *testing.T) {
 
 	defaultRetrySettings := exporterhelper.DefaultRetrySettings()
 
-	e1 := cfg.Exporters[config.NewIDWithName(typeStr, "e1-defaults")].(*Config)
+	e1 := cfg.Exporters[config.NewComponentIDWithName(typeStr, "e1-defaults")].(*Config)
 
 	assert.Equal(t,
 		&Config{
-			ExporterSettings: config.NewExporterSettings(config.NewIDWithName(typeStr, "e1-defaults")),
+			ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "e1-defaults")),
 			RetrySettings:    defaultRetrySettings,
 			LogGroupName:     "test-1",
 			LogStreamName:    "testing",
@@ -58,11 +58,11 @@ func TestLoadConfig(t *testing.T) {
 		e1,
 	)
 
-	e2 := cfg.Exporters[config.NewIDWithName(typeStr, "e2-no-retries-short-queue")].(*Config)
+	e2 := cfg.Exporters[config.NewComponentIDWithName(typeStr, "e2-no-retries-short-queue")].(*Config)
 
 	assert.Equal(t,
 		&Config{
-			ExporterSettings: config.NewExporterSettings(config.NewIDWithName(typeStr, "e2-no-retries-short-queue")),
+			ExporterSettings: config.NewExporterSettings(config.NewComponentIDWithName(typeStr, "e2-no-retries-short-queue")),
 			RetrySettings: exporterhelper.RetrySettings{
 				Enabled:         false,
 				InitialInterval: defaultRetrySettings.InitialInterval,

diff --git a/exporter/awscloudwatchlogsexporter/factory.go b/exporter/awscloudwatchlogsexporter/factory.go
@@ -36,7 +36,7 @@ func NewFactory() component.ExporterFactory {
 
 func createDefaultConfig() config.Exporter {
 	return &Config{
-		ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
+		ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)),
 		RetrySettings:    exporterhelper.DefaultRetrySettings(),
 		QueueSettings: QueueSettings{
 			QueueSize: exporterhelper.DefaultQueueSettings().QueueSize,

diff --git a/exporter/awscloudwatchlogsexporter/factory_test.go b/exporter/awscloudwatchlogsexporter/factory_test.go
@@ -24,7 +24,7 @@ import (
 
 func TestDefaultConfig_exporterSettings(t *testing.T) {
 	want := &Config{
-		ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
+		ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)),
 		RetrySettings:    exporterhelper.DefaultRetrySettings(),
 		QueueSettings: QueueSettings{
 			QueueSize: exporterhelper.DefaultQueueSettings().QueueSize,

diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod
@@ -3,10 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsclo
 go 1.17
 
 require (
-	github.com/aws/aws-sdk-go v1.40.50
+	github.com/aws/aws-sdk-go v1.40.53
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e
-	go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e
+	go.opentelemetry.io/collector v0.36.1-0.20210930150505-b2631ecdb494
+	go.opentelemetry.io/collector/model v0.36.1-0.20210930150505-b2631ecdb494
 	go.uber.org/zap v1.19.1
 )
 
@@ -18,6 +18,7 @@ require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/knadh/koanf v1.2.3 // indirect
+	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.2 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect

diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum