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

Commit 4b3df76

Browse files
author
Julio Guerra
committed
v1.0.2
Fixes: - Configuration: Use the configuration key `proxy` both as an HTTP and HTTPS proxy setting. - `sdk/sqreen-instrumentation-tool`: Fix filepath generation on Windows.
2 parents 51b3652 + 621877c commit 4b3df76

File tree

6 files changed

+18
-8
lines changed

6 files changed

+18
-8
lines changed

.github/workflows/agent-tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
runs-on: [ macos-latest, ubuntu-latest, windows-latest ]
11-
go-version: [ 1, 1.15, 1.14, 1.13, 1.12 ]
11+
go-version: [ 1, 1.16, 1.15, 1.14, 1.13, 1.12 ]
1212
go-test-options:
1313
- ""
1414
- "-tags sqassert -race"
@@ -27,7 +27,7 @@ jobs:
2727
golang-linux-container:
2828
strategy:
2929
matrix:
30-
go-version: [ 1, 1.15, 1.14, 1.13, 1.12 ]
30+
go-version: [ 1, 1.16, 1.15, 1.14, 1.13, 1.12 ]
3131
distribution: [ alpine, buster ]
3232
fail-fast: false
3333
runs-on: ubuntu-latest

.github/workflows/example-apps.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
matrix:
1111
example: [ alpine, debian, scratch ]
12-
go-version: [ rc, 1.14, 1.13, 1.12 ]
12+
go-version: [ rc, 1.16, 1.15, 1.14, 1.13, 1.12 ]
1313
do-vendoring: [ true, false ]
1414
runs-on: ubuntu-latest
1515
steps:

CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# v1.0.2 - 17 February 2021
2+
3+
## Fix
4+
5+
- Configuration:
6+
Use the configuration key `proxy` both as an HTTP and HTTPS proxy setting.
7+
8+
- `sdk/sqreen-instrumentation-tool`:
9+
Fix filepath generation on Windows.
10+
111
# v1.0.1 - 16 February 2021
212

313
## Fix

internal/backend/client.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ func NewClient(baseURL string, proxy string, logger plog.DebugLevelLogger) (*Cli
5050
transport = (http.DefaultTransport).(*http.Transport)
5151
} else {
5252
// Use the settings.
53-
logger.Infof("client: using configured https proxy `%s`", proxy)
53+
logger.Infof("client: using configured https and http proxy `%s`", proxy)
5454
proxyCfg := httpproxy.Config{
5555
HTTPSProxy: proxy,
56+
HTTPProxy: proxy,
5657
}
5758
proxyURL := proxyCfg.ProxyFunc()
5859
proxy := func(req *http.Request) (*url.URL, error) {

internal/version/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
package version
66

7-
const version = "1.0.1"
7+
const version = "1.0.2"
88

99
func Version() string { return version }

sdk/sqreen-instrumentation-tool/instrumentation.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"io/ioutil"
1313
"log"
1414
"os"
15-
"path"
1615
"path/filepath"
1716
"strings"
1817

@@ -157,7 +156,7 @@ type defaultPackageInstrumentation struct {
157156
}
158157

159158
func newDefaultPackageInstrumentation(pkgPath string, fullInstrumentation bool, packageBuildDir string) *defaultPackageInstrumentation {
160-
projectBuildDir := path.Join(packageBuildDir, "..")
159+
projectBuildDir := filepath.Join(packageBuildDir, "..")
161160
hookListFilepath := getHookListFilepath(projectBuildDir)
162161

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

0 commit comments

Comments
 (0)