Remove deprecated packages (#302)

* Remove deprecated packages * Add change to changelog * Update kind workflow * Update dependabot * Update versions.yaml * Update offsets output file * Update offset_results.json
open-telemetry · Sep 15, 2023 · 251589f · 251589f
1 parent f5a2e96
commit 251589f
Show file tree

Hide file tree

Showing 107 changed files with 35 additions and 9,934 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -64,51 +64,6 @@ updates:
     schedule:
       interval: weekly
       day: sunday
-  - package-ecosystem: docker
-    directory: /offsets-tracker
-    labels:
-      - dependencies
-      - docker
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
-  - package-ecosystem: docker
-    directory: /test/e2e/databasesql
-    labels:
-      - dependencies
-      - docker
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
-  - package-ecosystem: docker
-    directory: /test/e2e/gin
-    labels:
-      - dependencies
-      - docker
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
-  - package-ecosystem: docker
-    directory: /test/e2e/gorillamux
-    labels:
-      - dependencies
-      - docker
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
-  - package-ecosystem: docker
-    directory: /test/e2e/nethttp
-    labels:
-      - dependencies
-      - docker
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
   - package-ecosystem: gomod
     directory: /
     labels:
@@ -172,48 +127,3 @@ updates:
     schedule:
       interval: weekly
       day: sunday
-  - package-ecosystem: gomod
-    directory: /offsets-tracker
-    labels:
-      - dependencies
-      - go
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
-  - package-ecosystem: gomod
-    directory: /test/e2e/databasesql
-    labels:
-      - dependencies
-      - go
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
-  - package-ecosystem: gomod
-    directory: /test/e2e/gin
-    labels:
-      - dependencies
-      - go
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
-  - package-ecosystem: gomod
-    directory: /test/e2e/gorillamux
-    labels:
-      - dependencies
-      - go
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
-  - package-ecosystem: gomod
-    directory: /test/e2e/nethttp
-    labels:
-      - dependencies
-      - go
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
diff --git a/.github/workflows/kind.yml b/.github/workflows/kind.yml
@@ -30,7 +30,7 @@ jobs:
           IMG=otel-go-instrumentation:latest make docker-build
       - name: Build sample app
         run: |
-          cd test/e2e/${{ matrix.library }}
+          cd internal/test/e2e/${{ matrix.library }}
           docker build -t sample-app:latest .
       - name: Set up Helm
         uses: azure/setup-helm@v3.5
@@ -71,8 +71,8 @@ jobs:
           kubectl wait --for=condition=Complete --timeout=60s job/sample-job
       - name: copy telemetry trace output
         run: |
-          kubectl cp -c filecp default/test-opentelemetry-collector-0:tmp/trace.json ./test/e2e/${{ matrix.library }}/traces-orig.json
-          rm -f ./test/e2e/${{ matrix.library }}/traces.json
+          kubectl cp -c filecp default/test-opentelemetry-collector-0:tmp/trace.json ./internal/test/e2e/${{ matrix.library }}/traces-orig.json
+          rm -f ./internal/test/e2e/${{ matrix.library }}/traces.json
       - name: verify output and redact to traces.json
         run: |
-          bats ./test/e2e/${{ matrix.library }}/verify.bats
+          bats ./internal/test/e2e/${{ matrix.library }}/verify.bats
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,30 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http
 
 ### Removed
 
+- The deprecated `go.opentelemetry.io/auto/offsets-tracker` module is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/github.com/gorilla/mux` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/test/e2e/gorillamux` module is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/inject` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/errors` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/process` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/process/ptrace` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/opentelemetry` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/net/http/client` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/net/http/server` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/github.com/gin-gonic/gin` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/github.com/gorilla/mux` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/google/golang/org/grpc` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/google/golang/org/grpc/server` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/utils` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/context` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/allocator` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpffs` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/events` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/pkg/log` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/test/e2e/gin` module is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/test/e2e/gorillamux` module is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
+- The deprecated `go.opentelemetry.io/auto/test/e2e/nethttp` module is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
 - The deprecated instrumentation support for `github.com/gorilla/mux` is removed. ([#303](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/303))
 
 ## [v0.3.0-alpha] - 2023-09-12

diff --git a/Makefile b/Makefile
@@ -89,7 +89,7 @@ docker-build:
 
 .PHONY: offsets
 offsets: | $(OFFSETS)
-	OFFSETS_OUTPUT_FILE="$(REPODIR)/pkg/inject/offset_results.json" $(OFFSETS)
+	OFFSETS_OUTPUT_FILE="$(REPODIR)/internal/pkg/inject/offset_results.json" $(OFFSETS)
 
 .PHONY: docker-offsets
 docker-offsets:

diff --git a/internal/pkg/inject/offset_results.json b/internal/pkg/inject/offset_results.json
@@ -172,7 +172,7 @@
       "Header": {
         "versions": {
           "oldest": "1.12.0",
-          "newest": "1.21.0"
+          "newest": "1.21.1"
         },
         "offsets": [
           {
@@ -184,7 +184,7 @@
       "Method": {
         "versions": {
           "oldest": "1.12.0",
-          "newest": "1.21.0"
+          "newest": "1.21.1"
         },
         "offsets": [
           {
@@ -196,7 +196,7 @@
       "RemoteAddr": {
         "versions": {
           "oldest": "1.12.0",
-          "newest": "1.21.0"
+          "newest": "1.21.1"
         },
         "offsets": [
           {
@@ -208,7 +208,7 @@
       "URL": {
         "versions": {
           "oldest": "1.12.0",
-          "newest": "1.21.0"
+          "newest": "1.21.1"
         },
         "offsets": [
           {
@@ -220,7 +220,7 @@
       "ctx": {
         "versions": {
           "oldest": "1.12.0",
-          "newest": "1.21.0"
+          "newest": "1.21.1"
         },
         "offsets": [
           {
@@ -248,7 +248,7 @@
       "goid": {
         "versions": {
           "oldest": "1.12.0",
-          "newest": "1.21.0"
+          "newest": "1.21.1"
         },
         "offsets": [
           {

diff --git a/offsets-tracker/.gitignore b/offsets-tracker/.gitignore
diff --git a/offsets-tracker/Dockerfile b/offsets-tracker/Dockerfile