From afa570b8053decb7c2c41711f1ed78083546ef81 Mon Sep 17 00:00:00 2001 From: Vasi Vasireddy <41936996+vasireddy99@users.noreply.github.com> Date: Sat, 6 Jan 2024 07:09:10 -0800 Subject: [PATCH] Rebase and remove dynatrace in testcases (#2568) Co-authored-by: Raphael Philipe Mendes da Silva --- .github/config/testcases.json | 11 ----------- e2etest/testcases.json | 4 ---- go.mod | 2 -- go.sum | 4 ---- pkg/defaultcomponents/defaults.go | 2 -- pkg/defaultcomponents/defaults_test.go | 3 +-- testbed/go.mod | 2 -- testbed/go.sum | 4 ---- 8 files changed, 1 insertion(+), 31 deletions(-) diff --git a/.github/config/testcases.json b/.github/config/testcases.json index 46d25fb72..eb9c917e2 100644 --- a/.github/config/testcases.json +++ b/.github/config/testcases.json @@ -378,17 +378,6 @@ "PERF" ] }, - { - "case_name": "dynatrace_exporter_metric_mock", - "platforms": [ - "EC2", - "ECS", - "EKS", - "EKS_ARM64", - "LOCAL", - "PERF" - ] - }, { "case_name": "datadog_exporter_metric_mock", "platforms": [ diff --git a/e2etest/testcases.json b/e2etest/testcases.json index 1beb2e2ba..9877c4837 100644 --- a/e2etest/testcases.json +++ b/e2etest/testcases.json @@ -87,10 +87,6 @@ "case_name": "signalfx_exporter_metric_mock", "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "LOCAL", "PERF"] }, - { - "case_name": "dynatrace_exporter_metric_mock", - "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "LOCAL", "PERF"] - }, { "case_name": "datadog_exporter_metric_mock", "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "LOCAL", "PERF"] diff --git a/go.mod b/go.mod index 8f5752a92..05ed8bec5 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,6 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.91.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.91.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.91.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.91.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.91.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.91.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.91.0 @@ -152,7 +151,6 @@ require ( github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 // indirect github.com/eapache/go-resiliency v1.4.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect diff --git a/go.sum b/go.sum index 246a9ba86..d99202b63 100644 --- a/go.sum +++ b/go.sum @@ -264,8 +264,6 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 h1:wHGPJSXvwKQVf/XfhjUPyrhpcPKWNy8F3ikH+eiwoBg= -github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0/go.mod h1:PseHFo8Leko7J4A/TfZ6kkHdkzKBLUta6hRZR/OEbbc= github.com/eapache/go-resiliency v1.4.0 h1:3OK9bWpPk5q6pbFAaYSEwD9CLUSHG8bnZuqX2yMt3B0= github.com/eapache/go-resiliency v1.4.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= @@ -741,8 +739,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexport github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.91.0/go.mod h1:7LFN/WcxZXYitGcBWXPr5CssIeAmsQrELnbyvQJur/g= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.91.0 h1:SPRKiLoYdV0IIyJhofGdPm+QJ3JEVjAp8h7tdvlRoe4= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.91.0/go.mod h1:PHCePSoXQsHntygLOKieFf5TqPRsrDSK5sd9XdmdG3M= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.91.0 h1:9r68up6NyKMEE4j/BQzSa3Z4EXmaSwaLdluA6w7E2/c= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.91.0/go.mod h1:kWwPBXGJOr5/YwOmWa7L5dqnqx1rUISUxiNL8nXDFyY= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.91.0 h1:p8gP126reF8nK4HvgpQ+6R3+CVxnYohjInD67uKqfDw= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.91.0/go.mod h1:j26btuTJfz02X+urX9Qk73I13BdfuJoyjLm+edN1G94= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.91.0 h1:iU2St2YduQzbuXu68gjFB0CpPoQmo7kvl97IThw4aRE= diff --git a/pkg/defaultcomponents/defaults.go b/pkg/defaultcomponents/defaults.go index 2623a270e..cc625fb10 100644 --- a/pkg/defaultcomponents/defaults.go +++ b/pkg/defaultcomponents/defaults.go @@ -20,7 +20,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter" - "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter" @@ -142,7 +141,6 @@ func Components() (otelcol.Factories, error) { prometheusexporter.NewFactory(), fileexporter.NewFactory(), kafkaexporter.NewFactory(), - dynatraceexporter.NewFactory(), sapmexporter.NewFactory(), signalfxexporter.NewFactory(), datadogexporter.NewFactory(), diff --git a/pkg/defaultcomponents/defaults_test.go b/pkg/defaultcomponents/defaults_test.go index 7f8342c38..57dae0d05 100644 --- a/pkg/defaultcomponents/defaults_test.go +++ b/pkg/defaultcomponents/defaults_test.go @@ -22,7 +22,7 @@ import ( ) const ( - exportersCount = 16 + exportersCount = 15 receiversCount = 10 extensionsCount = 8 processorCount = 15 @@ -44,7 +44,6 @@ func TestComponents(t *testing.T) { // other exporters assert.NotNil(t, exporters["file"]) assert.NotNil(t, exporters["datadog"]) - assert.NotNil(t, exporters["dynatrace"]) assert.NotNil(t, exporters["prometheus"]) assert.NotNil(t, exporters["sapm"]) assert.NotNil(t, exporters["signalfx"]) diff --git a/testbed/go.mod b/testbed/go.mod index 75ed1dcef..f57a7c900 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -87,7 +87,6 @@ require ( github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 // indirect github.com/eapache/go-resiliency v1.4.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect @@ -197,7 +196,6 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.91.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.91.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.91.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.91.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.91.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.91.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.91.0 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index 521b8c2b9..c746e2a2e 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -267,8 +267,6 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0 h1:wHGPJSXvwKQVf/XfhjUPyrhpcPKWNy8F3ikH+eiwoBg= -github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0/go.mod h1:PseHFo8Leko7J4A/TfZ6kkHdkzKBLUta6hRZR/OEbbc= github.com/eapache/go-resiliency v1.4.0 h1:3OK9bWpPk5q6pbFAaYSEwD9CLUSHG8bnZuqX2yMt3B0= github.com/eapache/go-resiliency v1.4.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= @@ -747,8 +745,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporte github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.91.0/go.mod h1:aETj/Uzwkf3RBNiniHl7QygjHfBaW/xjubXCHn/MgT8= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.91.0 h1:SPRKiLoYdV0IIyJhofGdPm+QJ3JEVjAp8h7tdvlRoe4= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.91.0/go.mod h1:PHCePSoXQsHntygLOKieFf5TqPRsrDSK5sd9XdmdG3M= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.91.0 h1:9r68up6NyKMEE4j/BQzSa3Z4EXmaSwaLdluA6w7E2/c= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.91.0/go.mod h1:kWwPBXGJOr5/YwOmWa7L5dqnqx1rUISUxiNL8nXDFyY= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.91.0 h1:p8gP126reF8nK4HvgpQ+6R3+CVxnYohjInD67uKqfDw= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.91.0/go.mod h1:j26btuTJfz02X+urX9Qk73I13BdfuJoyjLm+edN1G94= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.91.0 h1:iU2St2YduQzbuXu68gjFB0CpPoQmo7kvl97IThw4aRE=