Skip to content
This repository has been archived by the owner on Nov 2, 2023. It is now read-only.

Commit

Permalink
v1.0.2
Browse files Browse the repository at this point in the history
Fixes:

- Configuration:
  Use the configuration key `proxy` both as an HTTP and HTTPS proxy setting.

- `sdk/sqreen-instrumentation-tool`:
  Fix filepath generation on Windows.
  • Loading branch information
Julio Guerra committed Feb 17, 2021
2 parents 51b3652 + 621877c commit 4b3df76
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/agent-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
runs-on: [ macos-latest, ubuntu-latest, windows-latest ]
go-version: [ 1, 1.15, 1.14, 1.13, 1.12 ]
go-version: [ 1, 1.16, 1.15, 1.14, 1.13, 1.12 ]
go-test-options:
- ""
- "-tags sqassert -race"
Expand All @@ -27,7 +27,7 @@ jobs:
golang-linux-container:
strategy:
matrix:
go-version: [ 1, 1.15, 1.14, 1.13, 1.12 ]
go-version: [ 1, 1.16, 1.15, 1.14, 1.13, 1.12 ]
distribution: [ alpine, buster ]
fail-fast: false
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/example-apps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
example: [ alpine, debian, scratch ]
go-version: [ rc, 1.14, 1.13, 1.12 ]
go-version: [ rc, 1.16, 1.15, 1.14, 1.13, 1.12 ]
do-vendoring: [ true, false ]
runs-on: ubuntu-latest
steps:
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# v1.0.2 - 17 February 2021

## Fix

- Configuration:
Use the configuration key `proxy` both as an HTTP and HTTPS proxy setting.

- `sdk/sqreen-instrumentation-tool`:
Fix filepath generation on Windows.

# v1.0.1 - 16 February 2021

## Fix
Expand Down
3 changes: 2 additions & 1 deletion internal/backend/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ func NewClient(baseURL string, proxy string, logger plog.DebugLevelLogger) (*Cli
transport = (http.DefaultTransport).(*http.Transport)
} else {
// Use the settings.
logger.Infof("client: using configured https proxy `%s`", proxy)
logger.Infof("client: using configured https and http proxy `%s`", proxy)
proxyCfg := httpproxy.Config{
HTTPSProxy: proxy,
HTTPProxy: proxy,
}
proxyURL := proxyCfg.ProxyFunc()
proxy := func(req *http.Request) (*url.URL, error) {
Expand Down
2 changes: 1 addition & 1 deletion internal/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

package version

const version = "1.0.1"
const version = "1.0.2"

func Version() string { return version }
5 changes: 2 additions & 3 deletions sdk/sqreen-instrumentation-tool/instrumentation.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"io/ioutil"
"log"
"os"
"path"
"path/filepath"
"strings"

Expand Down Expand Up @@ -157,7 +156,7 @@ type defaultPackageInstrumentation struct {
}

func newDefaultPackageInstrumentation(pkgPath string, fullInstrumentation bool, packageBuildDir string) *defaultPackageInstrumentation {
projectBuildDir := path.Join(packageBuildDir, "..")
projectBuildDir := filepath.Join(packageBuildDir, "..")
hookListFilepath := getHookListFilepath(projectBuildDir)

return &defaultPackageInstrumentation{
Expand Down Expand Up @@ -364,7 +363,7 @@ func (m *mainPackageInstrumentation) writeHookTable() (string, error) {
return "", err
}
defer hookTableFile.Close()
log.Printf("creating the hook table for %d hooks into `%s`", len(hooks), hookTableFile.Name())
log.Printf("creating the hook table for %d hooks from `%s` into `%s`", len(hooks), m.hookListFilepath, hookTableFile.Name())
if err := writeHookTable(hookTableFile, hooks); err != nil {
return "", err
}
Expand Down

0 comments on commit 4b3df76

Please sign in to comment.