chore: Rebrand rebase cleanup

exporter/googlecloudexporter/config.go

@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 
 	"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector"
-	"github.com/observiq/bindplane-agent/internal/version"
+	"github.com/observiq/bindplane-otel-collector/internal/version"
 	gcp "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/processor/batchprocessor"

exporter/googlecloudexporter/config_test.go

@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector"
-	"github.com/observiq/bindplane-agent/internal/version"
+	"github.com/observiq/bindplane-otel-collector/internal/version"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/api/option"

exporter/googlecloudexporter/go.mod

@@ -4,7 +4,7 @@ go 1.22.7
 
 require (
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.49.0
-	github.com/observiq/bindplane-agent/internal/version v1.66.0
+	github.com/observiq/bindplane-otel-collector/internal/version v1.66.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.114.0
 	github.com/stretchr/testify v1.10.0
 	go.opentelemetry.io/collector/component v0.114.0
@@ -100,4 +100,4 @@ require (
 )
 
 // Needed until 'version' package changes are included in a release
-replace github.com/observiq/bindplane-agent/internal/version => ../../internal/version
+replace github.com/observiq/bindplane-otel-collector/internal/version => ../../internal/version

exporter/googlemanagedprometheusexporter/config.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/observiq/bindplane-agent/internal/version"
+	"github.com/observiq/bindplane-otel-collector/internal/version"
 	gmp "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter"
 	"go.opentelemetry.io/collector/component"
 	"google.golang.org/api/option"

exporter/googlemanagedprometheusexporter/config_test.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/observiq/bindplane-agent/internal/version"
+	"github.com/observiq/bindplane-otel-collector/internal/version"
 	gmp "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/api/option"

exporter/googlemanagedprometheusexporter/go.mod

@@ -3,7 +3,7 @@ module github.com/observiq/bindplane-otel-collector/exporter/googlemanagedpromet
 go 1.22.7
 
 require (
-	github.com/observiq/bindplane-agent/internal/version v1.66.0
+	github.com/observiq/bindplane-otel-collector/internal/version v1.66.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.114.0
 	github.com/stretchr/testify v1.10.0
 	go.opentelemetry.io/collector/component v0.114.0
@@ -99,4 +99,4 @@ require (
 )
 
 // Needed until 'version' package changes are included in a release
-replace github.com/observiq/bindplane-agent/internal/version => ../../internal/version
+replace github.com/observiq/bindplane-otel-collector/internal/version => ../../internal/version

exporter/qradar/config.go

@@ -18,7 +18,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/observiq/bindplane-otel-collector/expr"
+	"github.com/observiq/bindplane-otel-collector/internal/expr"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/config/configretry"

exporter/qradar/go.mod

@@ -3,7 +3,7 @@ module github.com/observiq/bindplane-otel-collector/exporter/qradar
 go 1.22.7
 
 require (
-	github.com/observiq/bindplane-otel-collector/expr v1.66.0
+	github.com/observiq/bindplane-otel-collector/internal/expr v1.66.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.114.0
 	github.com/stretchr/testify v1.10.0
 	go.opentelemetry.io/collector/component v0.114.0

exporter/qradar/go.sum

@@ -72,8 +72,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/observiq/bindplane-agent/expr v1.66.0 h1:DMybnCUpwC4x54TPAxcICi4OGkOaT7leMDkqW54cQXQ=
-github.com/observiq/bindplane-agent/expr v1.66.0/go.mod h1:uJOZkyClcwHqUzMt+TEcuE1wvoUE0XN1sGfM2RxHj/I=
 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.114.0 h1:d2wCLlENxH4I2axQWaogivx/5ZIjDYgn9MIf6sFxlJ4=
 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.114.0/go.mod h1:Psyligv8GKL9WI3TraW3BLwkOX4TRxaaa1BBQQyICzA=
 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.114.0 h1:G6U2eHR2CGSYb2btot6l05o+mdqsC0ZN7dH8QssXSdk=

exporter/qradar/marshal.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/observiq/bindplane-otel-collector/expr"
+	"github.com/observiq/bindplane-otel-collector/internal/expr"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/contexts/ottllog"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/pdata/pcommon"

internal/version/go.mod

@@ -1,4 +1,4 @@
-module github.com/observiq/bindplane-agent/internal/version
+module github.com/observiq/bindplane-otel-collector/internal/version
 
 go 1.21.9
 

manifests/minimal/manifest.yaml

@@ -1,5 +1,5 @@
 dist:
-  module: github.com/observiq/bindplane-agent-ocb
+  module: github.com/observiq/bindplane-otel-collector-ocb
   name: observiq-distro
   description: ObservIQ's minimal distro for OpenTelemetry Collector
   version: "v0.0.1"
@@ -9,15 +9,15 @@ conf_resolver:
 extensions:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.114.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampextension v0.114.0
-  - gomod: github.com/observiq/bindplane-agent/extension/bindplaneextension v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/extension/bindplaneextension v1.66.0
     path: "./extension/bindplaneextension"
 exporters:
   - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.114.0
   - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.114.0
 processors:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.114.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.114.0
-  - gomod: github.com/observiq/bindplane-agent/processor/snapshotprocessor v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/processor/snapshotprocessor v1.66.0
     path: "./processor/snapshotprocessor"
 receivers:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.114.0

manifests/observIQ/manifest.yaml

@@ -1,7 +1,7 @@
 # This manifest is a combination of the upstream opentelemetry-collector-contrib manifest & components unique to observIQ's distribution.
 # https://github.com/open-telemetry/opentelemetry-collector-releases/blob/main/distributions/otelcol-contrib/manifest.yaml
 dist:
-  module: github.com/observiq/bindplane-agent
+  module: github.com/observiq/bindplane-otel-collector
   name: observiq-otel-collector
   description: ObservIQ's custom distro for OpenTelemetry Collector
   version: "v2.0.0"
@@ -34,7 +34,7 @@ extensions:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.114.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.114.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage v0.114.0
-  - gomod: github.com/observiq/bindplane-agent/extension/bindplaneextension v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/extension/bindplaneextension v1.66.0
     path: "./extension/bindplaneextension"
 exporters:
   - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.114.0
@@ -78,17 +78,17 @@ exporters:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.114.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.114.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.114.0
-  - gomod: github.com/observiq/bindplane-agent/exporter/azureblobexporter v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/exporter/azureblobexporter v1.66.0
     path: "./exporter/azureblobexporter"
-  - gomod: github.com/observiq/bindplane-agent/exporter/chronicleexporter v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/exporter/chronicleexporter v1.66.0
     path: "./exporter/chronicleexporter"
-  - gomod: github.com/observiq/bindplane-agent/exporter/chronicleforwarderexporter v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/exporter/chronicleforwarderexporter v1.66.0
     path: "./exporter/chronicleforwarderexporter"
-  - gomod: github.com/observiq/bindplane-agent/exporter/googlecloudexporter v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/exporter/googlecloudexporter v1.66.0
     path: "./exporter/googlecloudexporter"
-  - gomod: github.com/observiq/bindplane-agent/exporter/googlemanagedprometheusexporter v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/exporter/googlemanagedprometheusexporter v1.66.0
     path: "./exporter/googlemanagedprometheusexporter"
-  - gomod: github.com/observiq/bindplane-agent/exporter/snowflakeexporter v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/exporter/snowflakeexporter v1.66.0
     path: "./exporter/snowflakeexporter"
 processors:
   - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.114.0
@@ -113,29 +113,29 @@ processors:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.114.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.114.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.114.0
-  - gomod: github.com/observiq/bindplane-agent/processor/datapointcountprocessor v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/processor/datapointcountprocessor v1.66.0
     path: "./processor/datapointcountprocessor"
-  - gomod: github.com/observiq/bindplane-agent/processor/logcountprocessor v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/processor/logcountprocessor v1.66.0
     path: "./processor/logcountprocessor"
-  - gomod: github.com/observiq/bindplane-agent/processor/lookupprocessor v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/processor/lookupprocessor v1.66.0
     path: "./processor/lookupprocessor"
-  - gomod: github.com/observiq/bindplane-agent/processor/maskprocessor v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/processor/maskprocessor v1.66.0
     path: "./processor/maskprocessor"
-  - gomod: github.com/observiq/bindplane-agent/processor/metricextractprocessor v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/processor/metricextractprocessor v1.66.0
     path: "./processor/metricextractprocessor"
-  - gomod: github.com/observiq/bindplane-agent/processor/metricstatsprocessor v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/processor/metricstatsprocessor v1.66.0
     path: "./processor/metricstatsprocessor"
-  - gomod: github.com/observiq/bindplane-agent/processor/removeemptyvaluesprocessor v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/processor/removeemptyvaluesprocessor v1.66.0
     path: "./processor/removeemptyvaluesprocessor"
-  - gomod: github.com/observiq/bindplane-agent/processor/resourceattributetransposerprocessor v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/processor/resourceattributetransposerprocessor v1.66.0
     path: "./processor/resourceattributetransposerprocessor"
-  - gomod: github.com/observiq/bindplane-agent/processor/samplingprocessor v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/processor/samplingprocessor v1.66.0
     path: "./processor/samplingprocessor"
-  - gomod: github.com/observiq/bindplane-agent/processor/snapshotprocessor v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/processor/snapshotprocessor v1.66.0
     path: "./processor/snapshotprocessor"
-  - gomod: github.com/observiq/bindplane-agent/processor/spancountprocessor v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/processor/spancountprocessor v1.66.0
     path: "./processor/spancountprocessor"
-  - gomod: github.com/observiq/bindplane-agent/processor/throughputmeasurementprocessor v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/processor/throughputmeasurementprocessor v1.66.0
     path: "./processor/throughputmeasurementprocessor"
 receivers:
   - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.114.0
@@ -227,21 +227,21 @@ receivers:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.114.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.114.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.114.0
-  - gomod: github.com/observiq/bindplane-agent/receiver/awss3rehydrationreceiver v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/receiver/awss3rehydrationreceiver v1.66.0
     path: "./receiver/awss3rehydrationreceiver"
-  - gomod: github.com/observiq/bindplane-agent/receiver/azureblobrehydrationreceiver v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/receiver/azureblobrehydrationreceiver v1.66.0
     path: "./receiver/azureblobrehydrationreceiver"
-  - gomod: github.com/observiq/bindplane-agent/receiver/httpreceiver v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/receiver/httpreceiver v1.66.0
     path: "./receiver/httpreceiver"
-  - gomod: github.com/observiq/bindplane-agent/receiver/m365receiver v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/receiver/m365receiver v1.66.0
     path: "./receiver/m365receiver"
-  - gomod: github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/receiver/pluginreceiver v1.66.0
     path: "./receiver/pluginreceiver"
-  - gomod: github.com/observiq/bindplane-agent/receiver/routereceiver v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/receiver/routereceiver v1.66.0
     path: "./receiver/routereceiver"
-  - gomod: github.com/observiq/bindplane-agent/receiver/sapnetweaverreceiver v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/receiver/sapnetweaverreceiver v1.66.0
     path: "./receiver/sapnetweaverreceiver"
-  - gomod: github.com/observiq/bindplane-agent/receiver/telemetrygeneratorreceiver v1.66.0
+  - gomod: github.com/observiq/bindplane-otel-collector/receiver/telemetrygeneratorreceiver v1.66.0
     path: "./receiver/telemetrygeneratorreceiver"
 connectors:
   - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.114.0
@@ -270,11 +270,12 @@ replaces:
   # see https://github.com/openshift/api/pull/1515
   - github.com/openshift/api => github.com/openshift/api v0.0.0-20230726162818-81f778f3b3ec
   # replace for datapointcountprocessor
-  - github.com/observiq/bindplane-agent/receiver/routereceiver => ../receiver/routereceiver
+  - github.com/observiq/bindplane-otel-collector/receiver/routereceiver => ../receiver/routereceiver
   # replace statements for internal imports
-  - github.com/observiq/bindplane-agent/internal/expr => ../internal/expr
-  - github.com/observiq/bindplane-agent/internal/counter => ../internal/counter
-  - github.com/observiq/bindplane-agent/internal/report => ../internal/report
-  - github.com/observiq/bindplane-agent/internal/testutils => ../internal/testutils
-  - github.com/observiq/bindplane-agent/internal/rehydration => ../internal/rehydration
-  - github.com/observiq/bindplane-agent/internal/version => ../internal/version
+  - github.com/observiq/bindplane-otel-collector/internal/expr => ../internal/expr
+  - github.com/observiq/bindplane-otel-collector/internal/counter => ../internal/counter
+  - github.com/observiq/bindplane-otel-collector/internal/report => ../internal/report
+  - github.com/observiq/bindplane-otel-collector/internal/testutils => ../internal/testutils
+  - github.com/observiq/bindplane-otel-collector/internal/rehydration => ../internal/rehydration
+  - github.com/observiq/bindplane-otel-collector/internal/version => ../internal/version
+  - github.com/observiq/bindplane-otel-collector/internal/measurements => ../internal/measurements

processor/samplingprocessor/factory.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/observiq/bindplane-otel-collector/expr"
+	"github.com/observiq/bindplane-otel-collector/internal/expr"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/processor"

processor/samplingprocessor/go.sum

@@ -57,8 +57,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/observiq/bindplane-agent/expr v1.66.0 h1:DMybnCUpwC4x54TPAxcICi4OGkOaT7leMDkqW54cQXQ=
-github.com/observiq/bindplane-agent/expr v1.66.0/go.mod h1:uJOZkyClcwHqUzMt+TEcuE1wvoUE0XN1sGfM2RxHj/I=
 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.114.0 h1:d2wCLlENxH4I2axQWaogivx/5ZIjDYgn9MIf6sFxlJ4=
 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.114.0/go.mod h1:Psyligv8GKL9WI3TraW3BLwkOX4TRxaaa1BBQQyICzA=
 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.114.0 h1:SXi6JSSs2cWROnC1U2v3XysG3t58ilGUwoLqxpGuwFU=

processor/samplingprocessor/processor.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"math/rand"
 
-	"github.com/observiq/bindplane-otel-collector/expr"
+	"github.com/observiq/bindplane-otel-collector/internal/expr"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/contexts/ottllog"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/contexts/ottlmetric"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/contexts/ottlspan"

processor/samplingprocessor/processor_test.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/observiq/bindplane-otel-collector/expr"
+	"github.com/observiq/bindplane-otel-collector/internal/expr"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/ptracetest"

scripts/update-manifest-versions.sh

@@ -43,7 +43,7 @@ find manifests -type f -name "manifest.yaml" | while read -r file; do
     # Use sed to update the version for matching lines
     sed -i '' -E "s|(github.com/open-telemetry/opentelemetry-collector-contrib[^ ]*) v[0-9]+\.[0-9]+\.[0-9]+|\1 $new_version_opentelemetry_contrib|g" "$file"
     sed -i '' -E "s|(go.opentelemetry.io/collector[^ ]*) v[0-9]+\.[0-9]+\.[0-9]+|\1 $new_version_opentelemetry_collector|g" "$file"
-    sed -i '' -E "s|(github.com/observiq/bindplane-agent[^ ]*) v[0-9]+\.[0-9]+\.[0-9]+|\1 $new_version_bindplane_agent|g" "$file"
+    sed -i '' -E "s|(github.com/observiq/bindplane-otel-collector[^ ]*) v[0-9]+\.[0-9]+\.[0-9]+|\1 $new_version_bindplane_agent|g" "$file"
 
     echo "Versions updated successfully in $file."
 done