[chore] revert temporary copy from influxdb-observability (#19441)

open-telemetry · Mar 10, 2023 · b0f6db7 · b0f6db7
1 parent 3ed0349
commit b0f6db7
Show file tree

Hide file tree

Showing 45 changed files with 51 additions and 3,823 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -100,7 +100,6 @@ extension/storage/filestorage/ @open-telemetry/collect
 
 internal/aws/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia
 internal/docker/ @open-telemetry/collector-contrib-approvers @rmfitzpatrick @jamesmoessis
-internal/influx/ @open-telemetry/collector-contrib-approvers @jacobmarble @dmitryax
 internal/k8sconfig/ @open-telemetry/collector-contrib-approvers @dmitryax
 internal/kubelet/ @open-telemetry/collector-contrib-approvers @dmitryax
 internal/metadataproviders/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -94,7 +94,6 @@ body:
  - internal/core
  - internal/docker
  - internal/filter
- - internal/influx
  - internal/k8sconfig
  - internal/kubelet
  - internal/metadataproviders

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -88,7 +88,6 @@ body:
  - internal/core
  - internal/docker
  - internal/filter
- - internal/influx
  - internal/k8sconfig
  - internal/kubelet
  - internal/metadataproviders

diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml
@@ -88,7 +88,6 @@ body:
  - internal/core
  - internal/docker
  - internal/filter
- - internal/influx
  - internal/k8sconfig
  - internal/kubelet
  - internal/metadataproviders

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -447,11 +447,6 @@ updates:
  schedule:
  interval: "weekly"
  day: "wednesday"
- - package-ecosystem: "gomod"
- directory: "/internal/influx"
- schedule:
- interval: "weekly"
- day: "wednesday"
  - package-ecosystem: "gomod"
  directory: "/internal/k8sconfig"
  schedule:
@@ -1102,3 +1097,8 @@ updates:
  schedule:
  interval: "weekly"
  day: "wednesday"
+ - package-ecosystem: "gomod"
+ directory: "/testbed/mockdatasenders/mockdatadogagentexporter"
+ schedule:
+ interval: "weekly"
+ day: "wednesday"
diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod
@@ -74,7 +74,6 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.73.0 // indirect
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.73.0 // indirect
@@ -416,8 +415,9 @@ require (
  github.com/imdario/mergo v0.3.13 // indirect
  github.com/inconshreveable/mousetrap v1.0.1 // indirect
  github.com/influxdata/go-syslog/v3 v3.0.1-0.20210608084020-ac565dc76ba6 // indirect
- github.com/influxdata/influxdb-observability/common v0.3.1 // indirect
- github.com/influxdata/influxdb-observability/influx2otel v0.3.1 // indirect
+ github.com/influxdata/influxdb-observability/common v0.3.2 // indirect
+ github.com/influxdata/influxdb-observability/influx2otel v0.3.2 // indirect
+ github.com/influxdata/influxdb-observability/otel2influx v0.3.2 // indirect
  github.com/influxdata/line-protocol/v2 v2.2.1 // indirect
  github.com/ionos-cloud/sdk-go/v6 v6.1.3 // indirect
  github.com/jackc/chunkreader/v2 v2.0.1 // indirect
@@ -1046,5 +1046,3 @@ replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api
 
 // It appears that the v0.2.0 tag was modified. Replacing with v0.2.1
 replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1
-
-replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx => ../../internal/influx
diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum
diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml
@@ -339,7 +339,6 @@ replaces:
  - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver => ../../receiver/googlecloudspannerreceiver
  - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => ../../receiver/prometheusreceiver
  - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter => ../../exporter/sapmexporter
- - github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx => ../../internal/influx
  - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => ../../internal/kubelet
  - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver => ../../receiver/sqlserverreceiver
  - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver => ../../receiver/skywalkingreceiver

diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod
@@ -395,8 +395,9 @@ require (
  github.com/imdario/mergo v0.3.12 // indirect
  github.com/inconshreveable/mousetrap v1.0.1 // indirect
  github.com/influxdata/go-syslog/v3 v3.0.1-0.20210608084020-ac565dc76ba6 // indirect
- github.com/influxdata/influxdb-observability/common v0.3.1 // indirect
- github.com/influxdata/influxdb-observability/influx2otel v0.3.1 // indirect
+ github.com/influxdata/influxdb-observability/common v0.3.2 // indirect
+ github.com/influxdata/influxdb-observability/influx2otel v0.3.2 // indirect
+ github.com/influxdata/influxdb-observability/otel2influx v0.3.2 // indirect
  github.com/influxdata/line-protocol/v2 v2.2.1 // indirect
  github.com/ionos-cloud/sdk-go/v6 v6.1.3 // indirect
  github.com/jaegertracing/jaeger v1.41.0 // indirect
@@ -463,7 +464,6 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.73.0 // indirect
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.73.0 // indirect
@@ -956,8 +956,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prome
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter => ../../exporter/sapmexporter
 
-replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx => ../../internal/influx
-
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => ../../internal/kubelet
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver => ../../receiver/sqlserverreceiver

diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum
diff --git a/exporter/influxdbexporter/exporter.go b/exporter/influxdbexporter/exporter.go
@@ -18,16 +18,15 @@ import (
  "context"
  "fmt"
 
+ "github.com/influxdata/influxdb-observability/common"
+ "github.com/influxdata/influxdb-observability/otel2influx"
  "go.opentelemetry.io/collector/component"
  "go.opentelemetry.io/collector/consumer/consumererror"
  "go.opentelemetry.io/collector/exporter"
  "go.opentelemetry.io/collector/pdata/plog"
  "go.opentelemetry.io/collector/pdata/pmetric"
  "go.opentelemetry.io/collector/pdata/ptrace"
  "go.uber.org/multierr"
-
- "github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx/common"
- "github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx/otel2influx"
 )
 
 type tracesExporter struct {

diff --git a/exporter/influxdbexporter/factory.go b/exporter/influxdbexporter/factory.go
@@ -18,13 +18,12 @@ import (
  "context"
  "time"
 
+ "github.com/influxdata/influxdb-observability/common"
  "go.opentelemetry.io/collector/component"
  "go.opentelemetry.io/collector/config/confighttp"
  "go.opentelemetry.io/collector/config/configopaque"
  "go.opentelemetry.io/collector/exporter"
  "go.opentelemetry.io/collector/exporter/exporterhelper"
-
- "github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx/common"
 )
 
 // NewFactory creates a factory for Jaeger Thrift over HTTP exporter.

diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod
@@ -4,8 +4,9 @@ go 1.19
 
 require (
  github.com/cenkalti/backoff/v4 v4.2.0
+ github.com/influxdata/influxdb-observability/common v0.3.2
+ github.com/influxdata/influxdb-observability/otel2influx v0.3.2
  github.com/influxdata/line-protocol/v2 v2.2.1
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx v0.73.0
  github.com/stretchr/testify v1.8.2
  go.opentelemetry.io/collector v0.73.0
  go.opentelemetry.io/collector/component v0.73.0
@@ -60,5 +61,3 @@ require (
 )
 
 retract v0.65.0
-
-replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx => ../../internal/influx
diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum
diff --git a/exporter/influxdbexporter/logger.go b/exporter/influxdbexporter/logger.go
@@ -15,9 +15,8 @@
 package influxdbexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter"
 
 import (
+ "github.com/influxdata/influxdb-observability/common"
  "go.uber.org/zap"
-
- "github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx/common"
 )
 
 type zapInfluxLogger struct {

diff --git a/exporter/influxdbexporter/writer.go b/exporter/influxdbexporter/writer.go
@@ -26,14 +26,13 @@ import (
  "sync"
  "time"
 
+ "github.com/influxdata/influxdb-observability/common"
+ "github.com/influxdata/influxdb-observability/otel2influx"
  "github.com/influxdata/line-protocol/v2/lineprotocol"
  "go.opentelemetry.io/collector/component"
  "go.opentelemetry.io/collector/config/confighttp"
  "go.opentelemetry.io/collector/config/configopaque"
  "go.opentelemetry.io/collector/consumer/consumererror"
-
- "github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx/common"
- "github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx/otel2influx"
 )
 
 type influxHTTPWriter struct {

diff --git a/go.mod b/go.mod
@@ -404,8 +404,9 @@ require (
  github.com/imdario/mergo v0.3.13 // indirect
  github.com/inconshreveable/mousetrap v1.0.1 // indirect
  github.com/influxdata/go-syslog/v3 v3.0.1-0.20210608084020-ac565dc76ba6 // indirect
- github.com/influxdata/influxdb-observability/common v0.3.1 // indirect
- github.com/influxdata/influxdb-observability/influx2otel v0.3.1 // indirect
+ github.com/influxdata/influxdb-observability/common v0.3.2 // indirect
+ github.com/influxdata/influxdb-observability/influx2otel v0.3.2 // indirect
+ github.com/influxdata/influxdb-observability/otel2influx v0.3.2 // indirect
  github.com/influxdata/line-protocol/v2 v2.2.1 // indirect
  github.com/ionos-cloud/sdk-go/v6 v6.1.3 // indirect
  github.com/jackc/chunkreader/v2 v2.0.1 // indirect
@@ -480,7 +481,6 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.73.0 // indirect
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.73.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.73.0 // indirect
@@ -1052,5 +1052,3 @@ replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api
 
 // It appears that the v0.2.0 tag was modified. Replacing with v0.2.1
 replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1
-
-replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/influx => ./internal/influx
diff --git a/go.sum b/go.sum
diff --git a/internal/influx/Makefile b/internal/influx/Makefile