Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into romain.marcadier/cont…
Browse files Browse the repository at this point in the history
…ext-less-dd-span

# Conflicts:
#	_integration-tests/go.mod
#	_integration-tests/go.sum
#	go.mod
#	go.sum
#	internal/injector/builtin/generated.go
#	internal/injector/builtin/testdata/client/http.go.snap
#	internal/injector/builtin/testdata/server/other_handlers.go.snap
#	internal/injector/builtin/yaml/directive/orchestrion-enabled.yml
#	internal/injector/builtin/yaml/stdlib/runtime.yml
#	samples/go.mod
#	samples/go.sum
  • Loading branch information
RomainMuller committed Aug 26, 2024
2 parents 581b8cb + afc28d1 commit f09a2c5
Show file tree
Hide file tree
Showing 113 changed files with 2,760 additions and 756 deletions.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@ updates:
directory: /
schedule:
interval: daily

- package-ecosystem: pip
directory: /_integration-tests/utils/agent
schedule:
interval: daily
29 changes: 0 additions & 29 deletions .github/pull_request_template.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/deps-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
with:
go-version: stable # Minimum supported go release
cache-dependency-path: '**/*.sum'
cache-dependency-path: '**/go.mod'

# Select the latest available version of gopkg.in/DataDog/dd-trace-go.v1, while ignoring all
# the `v1.999.*` versions, which are experimental pre-releases.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docsite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
with:
cache-dependency-path: '**/*.sum'
cache-dependency-path: '**/go.mod'
- name: Run go generate (builtin)
run: go generate ./internal/injector/builtin
- name: Build Site
Expand Down
107 changes: 0 additions & 107 deletions .github/workflows/generate.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ossf-scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3
uses: github/codeql-action/upload-sarif@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # v3
with:
sarif_file: results.sarif
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ jobs:
- name: Setup go
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
with:
cache-dependency-path: '**/*.sum'
go-version: stable
cache-dependency-path: '**/go.mod'

# Obtains the current configured version tag from source, and verifies it is a valid tag name.
# Also checks whether the tag already exists.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3
uses: github/codeql-action/init@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # v3
with:
languages: go
build-mode: autobuild

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3
uses: github/codeql-action/analyze@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # v3
with:
category: "/language:go"
180 changes: 0 additions & 180 deletions .github/workflows/tests.yml

This file was deleted.

Loading

0 comments on commit f09a2c5

Please sign in to comment.